Andreas Lauser
543d8d75b6
pass the DerivedGeology to the simulators
...
this was decided to be a good idea by [at]bska. (If I interpreted him
correctly, obviously.)
2014-07-24 16:37:38 +02:00
Tor Harald Sandve
8a600747fa
Read DISGAS and VAPOIL from deck and pass them to the simulator
2014-06-13 14:29:52 +02:00
Kai Bao
cd50b54ddf
Finishing the modification for solver class.
2014-05-16 18:02:55 +02:00
Andreas Lauser
ebb1da0662
replace all boost::
smart pointers by their std::
equivalents
...
The std variants are part of c++-2011 and it's 2014 now. (they are
also available in GCC 4.4.)
2014-05-02 16:17:54 +02:00
Atgeirr Flø Rasmussen
9ae24f9380
Merge branch 'master' into cpr-preconditioning-again
...
Conflicts:
CMakeLists_files.cmake
examples/test_implicit_ad.cpp
2014-04-15 11:48:36 +02:00
Markus Blatt
46f3607641
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Resolved conflicts:
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
2014-03-31 11:39:37 +02:00
Markus Blatt
b279a174db
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Conflicts:
examples/sim_fibo_ad.cpp
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
2014-03-27 16:17:44 +01:00
Markus Blatt
8df314e90f
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
...
Manually resolved conficts in the following files
examples/sim_fibo_ad.cpp
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
In additions examples/sim_fibo_ad_cp.cpp was adapted to compile again.
2014-03-25 11:11:08 +01:00
Markus Blatt
f4812c21eb
Add an example program of FIBOS that uses CpGrid.
2014-03-13 16:33:36 +01:00