OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 04:26:55 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,452 Commits 24 Branches 102 Tags 84 MiB
5b5f6e6aa6
Commit Graph

515 Commits

Author SHA1 Message Date
Andreas Lauser
5b5f6e6aa6 Glue in support for the grid property modifier keywords 
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.

with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.

no ctest regressions have been observed with this patch on my machine.
 2016-04-14 11:32:07 +02:00
Andreas Lauser
12ece55907 rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2016-04-14 11:32:07 +02:00
Andreas Lauser
c89e1ed0b6 convert the examples and the tests to opm-parser 2016-04-14 11:32:07 +02:00
Joakim Hove
9f6d658486 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2016-04-14 11:32:07 +02:00
Andreas Lauser
f0e86b98e3 catch all exceptions in all tutorials and examples 2016-04-14 11:32:07 +02:00
Andreas Lauser
e8458e9a23 convert THROW to OPM_THROW 2016-04-14 11:32:07 +02:00
Andreas Lauser
068519bd19 replace boost::scoped_ptr by std::unique_ptr 
thanks to Bård Skaflestad, Atgeirr Rasmusen and Roland Kaufmann for
the hint.
 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen
fbf938ef91 Changed #ifdef HAVE_... to #if HAVE_... 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen
c1e6c7c778 Fixed conditional compilation issues with UMFPACK. 
This should fix the issue reported in #208 introduced in #203.
 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen
3ba94c0a68 Moved ColumnExtract and initState. 
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen
b312dfac6a Renamed newwells.h -> wells.h. 
Also moved implementation file to subdir.
 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen
9aa64340e4 Move GridManager to grid subdir. 
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen
01d376deb6 Removed unneeded simulator class, renamed a simulator. 2016-04-14 11:32:07 +02:00
Pål Grønås Drange
fd9f67ae55 Using API get3DProperties() 2016-04-12 14:47:50 +02:00
Pål Grønås Drange
77fc26475b Using new EclipseState API, made ->s into .s 2016-04-12 14:47:50 +02:00
Arne Morten Kvarving
66333051e7 Import the following files from opm-core 
opm/core/utility/thresholdPressures.hpp
tests/test_thresholdpressure.cpp
opm/core/simulator/SimulatorCompressibleTwophase.hpp
opm/core/simulator/SimulatorCompressibleTwophase.cpp
opm/core/simulator/SimulatorIncompTwophase.hpp
opm/core/simulator/SimulatorIncompTwophase.cpp
examples/sim_2p_comp_reorder.cpp

the files in opm/core has been put in opm/simulators
 2016-04-11 09:59:25 +02:00
Atgeirr Flø Rasmussen
3aa5158842 Merge pull request #619 from kjellkongsvik/Move_OutputWriter_to_opm-output 
Refactored to use OutputWriter from opm-output
 2016-03-31 09:44:09 +02:00
Joakim Hove
18c07d5d66 Replaced SimulatorState -> SimulationDataContainer 2016-03-29 10:48:36 +02:00
Joakim Hove
38628de09e 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
91a4346a27 rename ParseMode in examples folder. 2016-03-17 09:46:12 +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
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
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
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
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