Andreas Lauser
8568f9f3f9
add an assert
2014-06-04 11:11:35 +02:00
Andreas Lauser
cbb5910a93
incorperate the review comments/decisions for multi-region PVT
...
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
2014-06-04 11:11:35 +02:00
Andreas Lauser
f96417e81c
rename all "newParserDeck" objects to "deck"
...
The "new" parser is now "the" parser...
2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1
remove EclipseGridParser compatibility methods from all classes
2014-05-21 11:22:43 +02:00
Markus Blatt
3aad1a6cc5
Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support
...
Resolved Conflicts:
opm/core/props/BlackoilPropertiesFromDeck.cpp
opm/core/props/rock/RockFromDeck.hpp
opm/core/props/satfunc/SaturationPropsFromDeck.hpp
opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
2014-02-19 15:22:18 +01:00
Markus Blatt
8da99e11c5
Refactored parts needed for Blackoil in autodiff to get rid of UG dependency.
...
This patch refactors (hopefully) all parts of opm-core that are needed
by the fully implicite black oil solver in opm-autodiff and that inherently
relied on UnstructuredGrid.
We added a new simple grid interface consisting out of free functions
that will allow us to use CpGrid without copying it to an UnstructuredGrid
by the means of the GridAdapter. Using this interface we have add methods that
allow specifying the grid information (global_cell, cartdims, etc.) wherever
possible to prevent introducing grid parameters for the type of the grid.
Unfortunately this was not possible everywhere.
2014-02-17 13:23:01 +01:00
Andreas Lauser
3163865b2e
add back a newline which went MIA
...
this confused the heck out of us during review. thanks to @bska for
stumbling over it...
2014-02-12 15:06:46 +01:00
Andreas Lauser
0addefc311
add variants of all methods which take a deck of the new parser to the BlackOilPropertiesFromDeck
2014-02-12 15:06:46 +01:00
Andreas Lauser
19e5d5cea2
convert THROW to OPM_THROW
2013-09-05 13:04:37 +02:00
Atgeirr Flø Rasmussen
280bf30a26
Add phaseUsage() method to BlackoilPropertiesInterface.
...
Also implement method in derived classes.
2013-05-13 16:20:00 +02:00
Andreas Lauser
884c5ab027
make config.h the first header to be included in any compile unit
...
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen
c23898efa7
Merge remote-tracking branch 'hnil/hnil_class' into combined.
...
Conflicts:
CMakeLists.txt
examples/sim_wateroil.cpp
opm/core/grid/cpgpreprocess/geometry.c
opm/core/transport/reorder/ReorderSolverInterface.hpp
opm/core/transport/reorder/TofDiscGalReorder.cpp
opm/core/transport/reorder/TofDiscGalReorder.hpp
opm/core/transport/reorder/TofReorder.cpp
opm/core/transport/reorder/TofReorder.hpp
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
2013-03-14 16:18:39 +01:00
Atgeirr Flø Rasmussen
34f523339d
Adapt include statements to moved headers.
2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
fa31f17885
Moved fluid -> props and subdirs.
...
This is a non-compiling commit.
2013-03-14 09:56:48 +01:00