Pål Grønås Drange
18f6672df0
Using getInputGrid API from Parser
2016-04-19 17:03:41 +02:00
Atgeirr Flø Rasmussen
be67e0f7a5
Update include file locations.
2016-04-14 11:32:08 +02:00
Joakim Hove
6f6f1afb8f
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-04-14 11:32:08 +02:00
Liu Ming
bfb5a49af1
rename ParseMode in examples folder.
2016-04-14 11:32:08 +02:00
Jørgen Kvalsvik
6ec0594f17
Improve includes from opm-parser
...
Adopting to opm-parser PR#661, add previously missing includes.
https://github.com/OPM/opm-parser/pull/661
2016-04-14 11:32:08 +02:00
Atgeirr Flø Rasmussen
6d80b5b03f
In sim_2p_incomp, avoid running everything twice.
...
There were loops (over all timesteps) both in the
main() function and the simulator class.
Note:
This simulator cannot properly handle changing
well configurations, and will now use only the
initial configuration (first report step), instead
of possibly crashing later.
2016-04-14 11:32:08 +02:00
Andreas Lauser
29f4be0f6c
use the error macros from opm-common
2016-04-14 11:32:08 +02:00
Joakim Hove
d23c4e5518
Updated to use ParseMode.
2016-04-14 11:32:08 +02:00
Atgeirr Flø Rasmussen
03a84a3ac4
Use existing TimeMap, instead of creating new.
2016-04-14 11:32:08 +02:00
Atgeirr Flø Rasmussen
9f587fee21
Bugfix: avoid using TimeMap without deck.
...
This made the simulator crash when there is no deck involved.
2016-04-14 11:32:07 +02:00
Andreas Lauser
b27aadc083
adapt the the table related API changes of opm-parser
2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen
e439084f81
Fix: eclipseState no longer shadowed.
2016-04-14 11:32:07 +02:00
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
