Commit Graph

1066 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
8a6f3e6921 Removed unused variable. 2011-12-07 15:33:27 +01:00
Atgeirr Flø Rasmussen
7bbf1c7684 Removed unused code (libxml2-using). 2011-12-07 14:24:22 +01:00
Atgeirr Flø Rasmussen
1e7d06efb4 Parameter subsystem now uses tinyxml instead of libxml2. 2011-12-07 14:16:21 +01:00
Atgeirr Flø Rasmussen
3be4d52b95 Now also testing xml input. 2011-12-07 14:14:01 +01:00
Bård Skaflestad
fbb1046086 Merge from upstream. 2011-12-05 21:31:40 +01:00
Bård Skaflestad
e66dc789f3 Merge from upstream. 2011-12-05 19:30:30 +01:00
Bård Skaflestad
95ebbb3899 changeset: 451:4120bd6d7e8f
tag: tip
user: Andreas Lauser <andreas.lauser@iws.uni-stuttgart.de>
date: Mon Dec 05 19:07:44 2011 +0100
summary: fix compile
2011-12-05 19:22:20 +01:00
Bård Skaflestad
ed0da5d7c5 changeset: 946:cc39eedcd753
tag: tip
user: Andreas Lauser <andreas.lauser@iws.uni-stuttgart.de>
date: Mon Dec 05 19:14:25 2011 +0100
summary: dune-cornerpoint: fix compilation with newish compilers
2011-12-05 19:20:31 +01:00
Bård Skaflestad
15f3989dbf Acknowledge original author.
While here, remove two functions that are no longer needed.
2011-12-04 16:21:24 +01:00
Bård Skaflestad
460415766a Merge from upstream. 2011-12-02 23:43:31 +01:00
Bård Skaflestad
9d176f1379 Fix warnings. 2011-12-02 23:29:17 +01:00
Bård Skaflestad
697390d3a6 Staticise the 'read_grid()' function to avoid warning about missing prototype. 2011-12-02 23:27:52 +01:00
Bård Skaflestad
e2ac7a4108 Ignore 'scaneclipsedeck' executable. 2011-12-02 19:57:19 +01:00
Bård Skaflestad
27895976cc Catch up to read_vector_from_file accepting a std::string
See cset ee6246088300 for additional details.

While here, split grid-reading out to separate function accepting a
directory name.
2011-12-02 19:09:56 +01:00
Bård Skaflestad
17228b7078 Use a std::string rather than a char pointer to convey the file name. 2011-12-02 19:07:35 +01:00
Bård Skaflestad
e6638e3892 Merge from upstream. 2011-12-02 15:18:30 +01:00
Bård Skaflestad
e1e4d673d0 Expose 'readvector.hpp' as part of "make install". 2011-12-02 15:17:18 +01:00
Bård Skaflestad
7cf3c62688 Declare explicit overloads for ints and doubles.
Implement in terms of existing function template.
2011-12-02 15:16:35 +01:00
Jostein R. Natvig
0a96ddfcd4 Merge. 2011-12-02 13:57:32 +01:00
Jostein R. Natvig
a6bc2c70d1 Hook scaneclipsedeck up to build system. 2011-12-02 13:56:37 +01:00
Jostein R. Natvig
81d2ac3d8f Add simple code to scan an eclipse deck and write keywords to screen. 2011-12-02 13:56:03 +01:00
Bård Skaflestad
fe2db10049 Distribute "grid.h" lest "make distcheck" fail. 2011-12-02 10:57:14 +01:00
Bård Skaflestad
6c81de8cb7 Merge from upstream. 2011-12-02 10:38:43 +01:00
Bård Skaflestad
2ba4ee9afc Return useful status code from fill_cell_topology(). 2011-12-02 10:38:07 +01:00
Bård Skaflestad
dcfd312a37 Turn into autonomous module by referencing local copy of grid.h 2011-12-02 10:36:29 +01:00
Bård Skaflestad
982e339861 Ignore demonstration executable. 2011-11-30 23:49:58 +01:00
Bård Skaflestad
96d9637fc9 The 'enum face_tag' cannot (portably) hold the result of arithmetic.
Make it an 'int'.

Blame: Bard.Skaflestad@sintef.no
2011-11-30 23:48:16 +01:00
Bård Skaflestad
59c8f662a8 Hook demonstration up to build as separate (non-installable) executable.
Circumvent build issue by importing OPMPressure's "grid.h" wholesale.
2011-11-30 14:20:09 +01:00
Bård Skaflestad
3aecf50817 Add example to demonstrate basic workflow for corner-point grids. 2011-11-30 14:01:38 +01:00
Bård Skaflestad
56013a3463 Hook 'readvector' support up to build. 2011-11-30 13:57:54 +01:00
Bård Skaflestad
de2b4df2b2 Add header for 'read_vector_from_file'. 2011-11-30 13:56:21 +01:00
Bård Skaflestad
e6bbd8487b Promote 'readvector.cpp' to top-level feature. 2011-11-30 13:55:02 +01:00
Bård Skaflestad
5d17b10678 Remove unfinished feature that was imported in error. 2011-11-30 13:54:35 +01:00
Bård Skaflestad
070da67034 Slight cleanup.
Remove a build error (too many initialisers for struct ParserState).
Explicit instantiation of read_vector_from_file() for 'int's and
'double's .  Suppress various warnings.
2011-11-30 13:44:27 +01:00
Bård Skaflestad
3f903d67f1 Merge from upstream. 2011-11-30 10:35:54 +01:00
Bård Skaflestad
e2d069836e Name 'grid_t' structure.
Preserve backwards compatibility typedef.
2011-11-30 10:34:41 +01:00
Jostein R. Natvig
a2aaf9c590 Add
* routines to read string records, and interpret as welldate. (unfinished)
 * Routine to read chunks of data from file, with '--' as comment mark,
   '3*3.1415' for repeated values and '/' for termination of read.
2011-11-29 16:24:53 +01:00
Bård Skaflestad
a401f72ca7 Add tag for cardinal directions for all faces per cell. 2011-11-30 13:36:31 +01:00
Bård Skaflestad
dac3142d16 Import geometry calculation from the MATLAB Reservoir Simulation Toolbox.
Author: Jostein R. Natvig

Hook up to build.
2011-11-30 12:41:29 +01:00
Bård Skaflestad
e80ecf1077 Add GRDECL -> UnstructuredGrid transformation. 2011-11-30 11:08:32 +01:00
Bård Skaflestad
b6b455642e Rename newinterface -> cgridinterface 2011-11-30 10:16:23 +01:00
Halvor M. Nilsen
7d654de2f6 changed default instalation dir 2011-11-29 14:43:04 +01:00
Bård Skaflestad
5f0bacf6e4 Merge integer overflow fix from SVN edition. 2011-11-29 11:33:05 +01:00
Bård Skaflestad
80faeb63c7 Don't include an unused header. 2011-11-25 19:19:10 +01:00
Bård Skaflestad
ca041be109 Parametrise vector assignment to support line search on ::std::vector<>'s.
Implement the (_AXPY-like) interface for containers (base-vectors)
that support a begin()/end() iterator pair (e.g., ::std::vector<>).
Finally, update examples accordingly.

This restores independent build of OPMTransport (when used outside Dune).
2011-11-25 19:17:17 +01:00
Bård Skaflestad
17f48c62c8 Introduce macro to control whether or not to initialise NR with prev. soln.
On by default.
2011-11-25 18:15:46 +01:00
Bård Skaflestad
93916418fc Don't import a type that's not actually used. 2011-11-25 17:05:23 +01:00
Bård Skaflestad
aacf2bddd1 Use template parameter names in closer proximity to intended use. 2011-11-25 17:04:12 +01:00
Bård Skaflestad
905076c242 Implement extended interface required by ImplictTransport.
Specifically, implement (trivial) versions of pc(), s_min(), and s_max().
2011-11-25 17:02:34 +01:00
Bård Skaflestad
4235f64e07 Don't reference nonexistent header. 2011-11-25 17:01:13 +01:00