Joakim Hove
b42700c6a8
Replaced SimulatorState -> SimulationDatacontainer
...
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2016-03-29 10:44:49 +02:00
Joakim Hove
a256dc0e5d
Replaced SimulatorState -> SimulationDatacontainer
...
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2016-03-29 10:44:49 +02:00
chflo
e63bf7aead
Changed includes due to OpmLog moved from parser to common
2016-03-17 16:19:07 +01:00
Kjell W. Kongsvik
ea9e572a65
Refactored to use OutputWriter from opm-output
...
As OutputWriter has been deleted from opm-core
Only changes in includes
2016-03-17 14:45:30 +01:00
Liu Ming
17e5eb2dee
rename ParseMode as ParseContext.
2016-03-17 10:02:50 +08:00
Liu Ming
8cd08728f7
rename ParseMode as ParseContext.
2016-03-17 09:57:59 +08:00
Liu Ming
91a4346a27
rename ParseMode in examples folder.
2016-03-17 09:46:12 +08:00
Liu Ming
b4a9529aed
rename ParseMode in examples folder.
2016-03-17 09:46:12 +08:00
Liu Ming
355f349470
make grid as template parameter.
2016-03-04 09:09:38 +08:00
Liu Ming
215a3f24d4
change .LOG to .SATFUNCLOG.
2016-03-02 14:58:37 +08:00
Andreas Lauser
099c958137
fix the deprecation warnings caused by OPM/opm-parser#687
2016-02-21 17:45:56 +01:00
Jørgen Kvalsvik
19e41bd246
Change Deck access methods/types to references
...
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.
https://github.com/OPM/opm-parser/pull/677
2016-02-19 11:55:19 +01:00
Liu Ming
d4ac98fb61
use standard filename for output log file.
2016-02-19 09:35:15 +08:00
Liu Ming
dbabffb91a
Add more parser mode options.
2016-01-25 11:13:19 +08:00
Jørgen Kvalsvik
50c1bbdc85
Fixes includes wrt opm-parser PR-656
...
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2016-01-21 09:42:51 +01:00
Joakim Hove
833f5d053f
Avoid using Deck.
...
Removed incorrect use of Deck for polymer and solvent properties.
2016-01-08 13:57:37 +01:00
Atgeirr Flø Rasmussen
bfcbd09488
Create and use FlowMainPolymer class.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
b156ce0b55
Create and use FlowMainSolvent class.
2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen
e3ceac44a6
Renamed flowMain.hpp -> FlowMain.hpp.
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
abf5443f33
Replace flowMain() function with FlowMain class.
2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen
29d18261c6
Make multisegment flow variants use flowMain().
2015-12-14 16:11:35 +01:00
Atgeirr Flø Rasmussen
460f0cb451
Use the new flowMain() function.
...
Also add it to the CMake file list.
2015-12-14 16:11:06 +01:00
Atgeirr Flø Rasmussen
be9b6a3cd2
Unconditionally instantiate the (possibly fake) MPI helper.
...
This reduces the difference between flow and flow_mpi. For builds
without MPI, the fake helper from Dune is instantiated, which has
the same interface.
2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen
7c5256031c
Use GridInit in flow.cpp.
2015-12-14 16:07:47 +01:00
Tor Harald Sandve
e3393c5ee9
Handle combination of threshold_pressure and nnc
...
The nncs threshold pressures are calculated and appended to the face
threshold pressures
2015-12-08 11:03:05 +01:00
Liu Ming
5ba0742bc9
remove unused object.
2015-12-08 16:02:36 +08:00
Atgeirr Flø Rasmussen
ef07b8daef
Update run() calls in polymer fully implicit sims.
2015-12-07 13:45:07 +01:00
Atgeirr Flø Rasmussen
ffc91bc35e
Remove unnecessary EclipseState argument from run().
2015-12-07 13:40:06 +01:00
Arne Morten Kvarving
3ce3b0aac1
move polymer test to tests directory
2015-12-07 10:46:20 +01:00
Arne Morten Kvarving
8808642708
Import examples/ and opm/ from opm-polymer w/ history
2015-12-07 10:45:34 +01:00
Liu Ming
35dff82700
Use OpmLog to output messages.
...
return messages and opmLog.
2015-12-02 10:58:06 +08:00
Liu Ming
2fc6a037b8
rename variables and remove some unnecessary check and comments.
2015-12-01 13:49:49 +08:00
Kai Bao
38a9dbd9ff
parallel running for flow_mutlisegment
...
SPE9 can be run in parallel now.
2015-12-01 00:06:46 +01:00
Atgeirr Flø Rasmussen
fe4f99a94e
Minimise differences between flow.cpp and flow_multisegment.cpp.
2015-12-01 00:06:46 +01:00
Kai Bao
a684c390f5
cleaning up SimulatorFullyImplicitBlackoilMultiSegment_impl
2015-12-01 00:06:46 +01:00
Atgeirr Flø Rasmussen
b9e80c1950
Update flow_multisegment to match thresholdPressure() API change.
2015-12-01 00:06:45 +01:00
Kai Bao
c3b4088448
recovering the compilation after updating opm-parser.
2015-12-01 00:06:45 +01:00
Atgeirr Flø Rasmussen
ae512d5c83
Update location of ErrorMacros.hpp header in includes.
2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen
15fd5dad47
Suppress warnings in the multisegment well code.
2015-12-01 00:06:44 +01:00
Kai Bao
d93b27cedd
fixing the compilation due to function interface change.
...
outputWriter function introduced extra arguments.
2015-12-01 00:06:43 +01:00
Kai Bao
ac0fdda48b
A WIP version BlackoilMultiSegmentModel
...
and also a Simulator Class and example for multisegment wells.
2015-12-01 00:06:42 +01:00
Liu Ming
b4b23bfab0
1. Move implemtation to .cpp file.
...
2. Delete constructors.
3. Add config.h
2015-11-30 10:11:43 +08:00
Andreas Lauser
976d38bf37
implement abililty to change the geology during the simulation run
...
i.e. it now supports stuff like MULTFLT in the schedule
section. Possibly, the MPI-parallel code paths need some fixes. (but
if the geology is not changed during the simulation, the parallel code
will do the same as before.)
the most fundamental change of this patch is that the
reference/pointer to the DerivedGeology object is made
non-constant. IMO that's okay, though, becase the geology can no
longer assumed to be constant over the whole simulation run.
2015-11-26 13:35:33 +01:00
Andreas Lauser
e0a1abba09
adapt to the "mutable geology" changes from opm-autodiff
2015-11-26 12:20:15 +01:00
Liu Ming
7fa569bc91
add endpoints scaling consistency check.
2015-11-26 15:22:51 +08:00
Liu Ming
bb92612fec
use commandline instead of paramGroup.
2015-11-19 16:08:26 +08:00
Liu Ming
bec412793d
use more relax ParseMode.
2015-11-19 13:31:19 +08:00
Liu Ming
d9a2fa6f42
initial RelpermDiagnostics.
2015-11-19 09:21:00 +08:00
Liu Ming
356a35600f
use more non-strict ParseMode.
2015-11-18 15:23:12 +08:00
Atgeirr Flø Rasmussen
324cd80cb7
Merge pull request #151 from andlaus/thpress_from_initial
...
adapt to the threshold pressure related API changes
2015-11-17 09:03:12 +01:00