Commit Graph

392 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
020f452a28 Added parameters for controlling use of multidim upwinding.
For now, you will simply get SPU even with use_multidim_upwind=true.
2012-10-29 17:23:17 +01:00
Atgeirr Flø Rasmussen
20c1567eca Increased number of digits in output. 2012-10-29 08:27:59 +01:00
Atgeirr Flø Rasmussen
9152d78405 Added new tof computation utility.
This program assumes that grid, porosity, flux field and sources are
available to read from files. It does not compute any flux field itself.
2012-10-25 14:47:26 +02:00
Bård Skaflestad
f8a11ef7e1 Staticise a file-local function.
It is not needed outside this function.  We should, arguably, be using
an anonymous namespace in this case.
2012-10-23 14:36:13 +02:00
Bård Skaflestad
b334dbcdd8 Remove a shadowed variable.
This variable (ecl_kw) was only needed in an inner scope and re-declared
there.
2012-10-23 14:33:30 +02:00
Joakim Hove
0c0ee4b4a8 Added some comments + error checking 2012-10-23 13:02:48 +02:00
Joakim Hove
cab0872048 Added HAVE_ERT compile guard in examples/Makefile.am 2012-10-23 09:43:02 +02:00
Joakim Hove
9db7ce3647 examples/import_rewrite now recursively follows INCLUDE files 2012-10-23 09:42:28 +02:00
Joakim Hove
ac48c44712 Fixed name in examples/Makefile.am 2012-10-22 17:31:32 +02:00
Joakim Hove
00dc06f074 Added example/import_rewrite 2012-10-22 17:17:16 +02:00
Atgeirr Flø Rasmussen
7cf412340b Use new velocity interpolation interface.
The class TransportModelTracerTofDiscGal now uses
VelocityInterpolationInterface, and acts as a factory
internally, choosing an interpolation method depending on
the parameter 'use_cvi'.
2012-10-16 11:11:33 +02:00
Bård Skaflestad
31174cf727 Merge remote-tracking branch 'upstream/master' into ert
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.
2012-10-12 00:43:51 +02:00
Roland Kaufmann
45c21f4fe0 Remove superfluous dependencies to SuperLU and BLAS 2012-10-11 13:25:10 +02:00
Roland Kaufmann
12f9bc5dbd Link compute_tof example to boost::filesystem 2012-10-10 23:57:36 +02:00
Atgeirr Flø Rasmussen
22cb94415c Fix comment. 2012-10-09 10:02:47 +02:00
Atgeirr Flø Rasmussen
43335dfce3 Merge branch 'master' into reorder_tof 2012-10-08 13:52:59 +02:00
Markus Blatt
4529673c76 Adapted my changes to the changes Bard made, to make opm-core link on Debian. 2012-10-05 15:01:30 +02:00
Markus Blatt
35c657d9a0 Merge remote-tracking branch 'bard/link-boost-explicitly-where-needed' into superlu-support
This fixes the errors on Debian when linking the examples.
2012-10-05 14:14:52 +02:00
Markus Blatt
9d0f385e02 Make opm-core compile with boost on my Debian system 2012-10-05 12:28:13 +02:00
Bård Skaflestad
5e8f87d4fa Link Boost.Filesystem explicitly where needed.
While libopmcore, following commit 37e14f, depends on (and references)
Boost.Filesystem (through the $(BOOST_FILESYSTEM_LIB) macro) this
indirect dependency is not sufficient to satisfy the requirements of
targets that use the indirect libraries directly.

Additional details at
   https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
2012-10-05 12:07:13 +02:00
Markus Blatt
0db6439b9b Merged latest changes from upstream branch 2012-10-05 10:11:31 +02:00
Atgeirr Flø Rasmussen
5b6dd72cc2 Merge branch 'master' into reorder_tof 2012-10-05 09:20:37 +02:00
Bård Skaflestad
b1ec06293e Obtain Boost libraries from libopmcore.la .
Specifically, commit ff4f709e made the support for transitively
conveying interlibrary dependencies onto clients of OPM-Core more
robust.  As a consequence, we no longer need to explicitly link in the
Boost.System or Boost.Filesystem libraries to use the software contained
therein.
2012-10-05 00:37:38 +02:00
Markus Blatt
ae52de0426 Added test for SuperLU and adapted the Makefile.am to support it 2012-10-04 11:37:28 +02:00
Atgeirr Flø Rasmussen
74b74bca99 Make DG(n) solver an option for test program.
For now, only DG(0,1) is expected to work.
2012-09-26 14:21:16 +02:00
Atgeirr Flø Rasmussen
a473422a82 Add proper support for source terms.
This fixes the problem with infinite tofs at sinks.
2012-09-25 14:00:17 +02:00
Atgeirr Flø Rasmussen
9153c7f87b Merge branch 'master' into ert 2012-09-18 09:18:40 +02:00
Atgeirr Flø Rasmussen
d58314f624 Merge branch 'master' into reorder_tof 2012-09-05 14:21:47 +02:00
Atgeirr Flø Rasmussen
00bbfa06a8 Merge branch 'master' into ert
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
2012-09-05 13:36:19 +02:00
Xavier Raynaud
e1fbe4430d Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Atgeirr Flø Rasmussen
e942b10be3 Merge branch 'master' into reorder_tof 2012-09-05 12:32:38 +02:00
Xavier Raynaud
19c7f516b1 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Atgeirr Flø Rasmussen
a07d894500 Merge branch 'master' into nonuniform_fluid_tables
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
2012-09-04 11:42:31 +02:00
Xavier Raynaud
eef234b59a Removed redundant header file include. 2012-09-03 12:55:10 +02:00
Atgeirr Flø Rasmussen
69cc72eec9 Merge branch 'master' into reorder_tof 2012-08-27 17:02:50 +02:00
Atgeirr Flø Rasmussen
547dc1648c Added class SinglePvtDead, add parameter 'props_use_spline' to simulators.
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
2012-08-27 16:48:21 +02:00
Atgeirr Flø Rasmussen
cd1edde45d Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Atgeirr Flø Rasmussen
dfef531fc8 Program compute_tof added. 2012-08-27 09:34:03 +02:00
Atgeirr Flø Rasmussen
26149c30a2 Fixed solveGravity(): now properly modifies surfacevolume.
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
2012-08-23 14:45:23 +02:00
Atgeirr Flø Rasmussen
2030c6a735 Added compressible 2-phase simulator, to replace sim_wateroil.cpp. 2012-08-23 14:07:11 +02:00
Atgeirr Flø Rasmussen
51d4e04d36 Merge branch 'rock_comp_tpfa' 2012-08-22 11:13:16 +02:00
Xavier Raynaud
6fd14bd76a Update surface volume in transport solver. 2012-08-22 10:11:32 +02:00
Atgeirr Flø Rasmussen
81ca766b86 Fix pressure renormalization conditions. Some formatting fixes.
Checking for both rock compressibility and pressure conditions
is necessary before we renormalize pressure.
2012-08-21 14:52:43 +02:00
Atgeirr Flø Rasmussen
87ce47f70d Merge remote-tracking branch 'upstream/master'
Conflicts:
	examples/sim_2p_incomp_reorder.cpp
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-21 12:47:52 +02:00
Atgeirr Flø Rasmussen
d9444d0dfb Added well constraint checking to SimulatorIncompTwophase.
- Changed Wells constructor arg for SimulatorIncompTwophase to WellsManager.
 - Insert checking code for well constrains (mostly copied from spu_2p.cpp).
Unrelated to the above changes.
 - Added pressure normalization for incompressible case (from spu_2p.cpp)
2012-08-21 10:51:14 +02:00
Halvor Møll Nilsen
29c6be6752 Added writing of timings in param format 2012-08-21 09:57:36 +02:00
Atgeirr Flø Rasmussen
98c8e6a294 Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa 2012-08-20 16:09:20 +02:00
Atgeirr Flø Rasmussen
1678bcad7f Merge branch 'master' into rock_comp_tpfa 2012-08-20 16:08:15 +02:00
Atgeirr Flø Rasmussen
1170727f1e Renamed SimulatorTwophase -> SimulatorIncompTwophase. 2012-08-20 15:45:05 +02:00
Xavier Raynaud
9e480cd997 Fix initialization bug. 2012-08-20 15:18:24 +02:00