Commit Graph

3399 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
729d17785b Merge pull request #246 from rolk/246_bind
Use boost::bind instead of std::bind to compile with C++03
2013-05-23 00:19:34 -07:00
Roland Kaufmann
eefb7a0431 Use boost::bind instead of std::bind to compile with C++03 2013-05-22 21:25:29 +02:00
Roland Kaufmann
d6c2e52d63 Demote consequence of not having C++11 support
This module sets individual flags for each feature; there is not one
"CXX11Features_FOUND" flags which is set. Thus, when putting the
module as REQUIRED, the only consequence is that we cannot disable
searching for it.

Instead, we make it optional, meaning that the flags won't get set if
it isn't included and the dependent modules will adjust accordingly.
2013-05-22 20:50:59 +02:00
totto82
1c904aa451 Add new fluid interface
- in progress
2013-05-22 12:57:18 +02:00
Atgeirr Flø Rasmussen
7ee481a601 Merge pull request #242 from rolk/242_callback
Let external objects observe individual timesteps in a simulation
2013-05-22 03:46:02 -07:00
Atgeirr Flø Rasmussen
221bc7a468 Added wellRates() member. 2013-05-21 23:54:30 +02:00
Atgeirr Flø Rasmussen
cfb4cf459d Merge pull request #243 from rolk/243_single
Try singular name if plural not defined
2013-05-16 05:21:48 -07:00
Roland Kaufmann
56ff7975f0 Include possibility that uppercase is used 2013-05-16 13:26:33 +02:00
Tor Harald Sandve
268a810eb3 Merge branch 'master' of git://github.com/OPM/opm-core 2013-05-16 12:11:02 +02:00
Bård Skaflestad
9401a482d6 Merge pull request #244 from atgeirr/add-phaseusage-to-interface
Add phaseUsage() to BlackoilPropertiesInterface
2013-05-16 02:21:11 -07:00
Roland Kaufmann
26475f448b Try singular name if plural not defined
In CMake "canon" (i.e. tutorial on Kitware's website) it is stated that
the _DIR suffix should be used for the directory of the library alone,
whereas _DIRS are entire list of paths necessary to compile (i.e.
dependencies are included).

Eigen3 only uses the singular form (since it doesn't have any
dependencies); it should really be copied to the plural form, but it may
be advantageous to have the find-module included unchanged, so we put in
an extra effort to find it here.
2013-05-16 10:58:24 +02:00
Roland Kaufmann
5644611dfd Provide template functions in separate header
Template functions must be defined in the header since the library
cannot contain generic code. To keep only the interface in the main
header, all such function bodies are put in a separate _impl file.
2013-05-15 21:32:32 +02:00
Atgeirr Flø Rasmussen
18a3c7fc91 Merge remote-tracking branch 'upstream/master' into add-phaseusage-to-interface 2013-05-15 10:10:18 +02:00
Roland Kaufmann
05636c70c7 Subtract time spend in callbacks from total
Since this is not time spent on the simulation itself, it is "unfair"
that this is accounted on the simulator.
2013-05-14 11:38:09 +02:00
Roland Kaufmann
1ae1405c21 Notify callbacks when a timestep has completed
Client code can do additional processing for the output of each
timestep.
2013-05-14 11:36:13 +02:00
Bård Skaflestad
7add6048cc Merge pull request #240 from atgeirr/tof-improvements
Ensure (average of) tracers sum to one for DG1.
2013-05-14 02:28:21 -07:00
Roland Kaufmann
34acf3ecd0 Make implementation class "package" visible
Since a definition of the class is not in the header, no other
compilation units can safely access the internals of the Impl class
anyway, so it may as well be a regular struct so that the outer class
(SimulatorIncompTwophase) can access it.
2013-05-14 11:11:18 +02:00
Atgeirr Flø Rasmussen
9f927ca6df Merge pull request #241 from bska/double-refpress
Always interpret 'ref_pressure' as a double
2013-05-14 01:40:13 -07:00
Bård Skaflestad
53b082af28 Always interpret 'ref_pressure' as a double
Otherwise, when specifying (e.g.)

   ref_pressure=1.0e-5

(1 Pascal in bars), the value gets reinterpreted as

   ref_pressure=1

which is one bar.
2013-05-14 10:19:12 +02:00
Tor Harald Sandve
80ec30c22f Merge branch 'master' of git://github.com/OPM/opm-core 2013-05-14 08:21:13 +02:00
Atgeirr Flø Rasmussen
6d1b47e419 Merge pull request #238 from rolk/238_dtd
Provide DTD schema to describe parameter file format
2013-05-13 07:21:38 -07:00
Atgeirr Flø Rasmussen
280bf30a26 Add phaseUsage() method to BlackoilPropertiesInterface.
Also implement method in derived classes.
2013-05-13 16:20:00 +02:00
Atgeirr Flø Rasmussen
238bd6b891 Ensure (average of) tracers sum to one for DG1. 2013-05-13 16:17:41 +02:00
Bård Skaflestad
7db46d507f Merge pull request #239 from rolk/239_stlcheck
Probe for library without using STL
2013-05-13 02:44:52 -07:00
Roland Kaufmann
229cf6d134 Probe for library without using STL
If dune-grid has been compiled with _GLIBCXX_DEBUG, linking the test
program will fail since probing doesn't get the flags that are specified
for the main project, and thus configuration halts. Instead, we use a
smaller test program which doesn't need proper STL linkage to compile
and link.
2013-05-13 11:28:37 +02:00
Roland Kaufmann
0fb4f14b28 Provide DTD schema to describe parameter file format
Notice that this definition specifies a superset of the actual format
as the ParameterGroup tag is context-dependent (which cannot be captured
by DTD schemata).
2013-05-13 10:50:22 +02:00
Atgeirr Flø Rasmussen
1d5e210822 Merge pull request #235 from joakim-hove/ert-master
Minor update to build opm-core with current ert master
2013-05-02 13:24:27 -07:00
Joakim Hove
1281d17b60 Changed writeECLDate() to write UNFORMATTED restart files. 2013-05-02 19:06:43 +02:00
Joakim Hove
a6e3bbd610 Updated calls to ecl_util_fmt_file() - result is by reference 2013-05-02 19:04:09 +02:00
Bård Skaflestad
0ed065586a Merge pull request #234 from atgeirr/tof-improvements
New and improved capabilities for time-of-flight and tracer partitioning computations.
2013-04-24 23:24:37 -07:00
Atgeirr Flø Rasmussen
61829dd238 Added limiter for tracer. 2013-04-24 11:27:04 +02:00
Atgeirr Flø Rasmussen
da5ea0ccae Add call to DG tracer computations if user requests.
Used to throw with an 'unimplemented' message.
2013-04-24 10:40:56 +02:00
Atgeirr Flø Rasmussen
1a84b4fe7d Add tracer computations (method solveTofTracer()).
Same interface as in class TofReorder.
2013-04-24 10:39:50 +02:00
Atgeirr Flø Rasmussen
3086d5d815 Update doc, only initialize tracerhead_by_cell_ if needed. 2013-04-24 10:36:52 +02:00
Atgeirr Flø Rasmussen
8552347080 Tracer computations are now fixed and robust.
- Handles noisy source terms.
 - Works with repeated solve calls (multi-cell block solves).
2013-04-23 15:35:47 +02:00
Atgeirr Flø Rasmussen
2fbf3bd7cb Implement solveMultiCell() with Gauss-Seidel. 2013-04-23 13:38:47 +02:00
Atgeirr Flø Rasmussen
fd4ac88334 Minor fix: do not read tracer heads unless compute_tracer is true. 2013-04-23 09:54:52 +02:00
Atgeirr Flø Rasmussen
8b6faffe00 Work in progress on tracers.
- Changed interface.
 - Read tracerheads (tracer start locations) from file in compute_tof_from_files.
 - Initialize tracerheads from wells in compute_tof.
2013-04-22 14:02:45 +02:00
Atgeirr Flø Rasmussen
a2125fee09 Fix typo and minimize formatting changes. 2013-04-22 11:29:59 +02:00
Atgeirr Flø Rasmussen
cf38c91f74 Removed experimental multi-cell solver code.
Since the Gauss-Seidel approach seems to be both simplest and
fastest, all parts dealing with assembling multicell systems
have been removed.
2013-04-22 11:22:23 +02:00
Atgeirr Flø Rasmussen
489c41d60d Optimize multi-cell solve and add new Gauss-Seidel variant. 2013-04-22 11:11:55 +02:00
Atgeirr Flø Rasmussen
7c172fe192 Make multidim upwind more forgiving of bad grids.
Now it will no longer trigger assertation failure when grids are not
edge-conformal (faulted cornerpoint grids processed by our code will
usually not be). Minor algorithm change to handle this.
2013-04-22 11:07:41 +02:00
Atgeirr Flø Rasmussen
3d3173d04f More refined and concise output of block info. 2013-04-17 13:18:22 +02:00
Atgeirr Flø Rasmussen
b7acc70ab7 Implement solveMultiCell() properly.
Interface change: solver now requires a linear solver (for the multi-cell blocks only).

Implementation uses new private method assembleSingleCell(), that is a modified copy
of solveSingleCell(). Should refactor.
2013-04-17 12:58:15 +02:00
Atgeirr Flø Rasmussen
88f4cd894d Bugfix: do not compute MDU terms for noflow faces. 2013-04-17 10:38:08 +02:00
Tor Harald Sandve
62246111db Merge branch 'release/2013.03' of git://github.com/OPM/opm-core 2013-04-17 10:33:29 +02:00
Roland Kaufmann
64e61739e1 Merge pull-request #232 from rolk/232_distrib 2013-04-16 14:13:11 +02:00
Roland Kaufmann
66b6dda219 Merge pull-request #232 from rolk/232_distrib 2013-04-16 14:07:50 +02:00
Roland Kaufmann
49606fc925 Corrected mismatched if-else-endif arguments 2013-04-16 14:02:00 +02:00
Roland Kaufmann
f75090e876 Read /etc/system-release if others not parseable 2013-04-16 12:11:35 +02:00