OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
740 Commits 24 Branches 102 Tags
b279a174db8d0f65ff5da3a3527cf31dfdbbb923
Commit Graph

740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9598a990df Activate paralle istl solvers if there is more than one process computing. 2014-03-27 11:31:17 +01:00
Atgeirr Flø Rasmussen
d4f1a89370 Merge pull request #111 from andlaus/FullyImplicitBlackoilSolver_throw_exception_uppon_non-finite_residual 
FullyImplicitBlackoilSolver: Throw an exception uppon encountering a non-finite residual
 2014-03-26 15:29:34 +01:00
Andreas Lauser
8cd93bf70a FullyImplicitBlackoilSolver: cleanup the residualNorm() method 2014-03-26 15:16:43 +01:00
Atgeirr Flø Rasmussen
2db726268b Merge pull request #108 from andlaus/FullyImplicitBlackoilSolver_unify_state_conversion 
FullyImplicitBlackoilSolver: unify the state conversion routines
 2014-03-26 14:29:08 +01:00
Andreas Lauser
2f84156b91 FullyImplicitBlackoilSolver: Throw an exception uppon encountering a non-finite residual 2014-03-26 12:54:46 +01:00
Atgeirr Flø Rasmussen
4845fc3073 Merge pull request #109 from joakim-hove/remove-old-WellsManager 
Removed calls to deprecated WellsManager() constructor
 2014-03-25 23:28:26 +01:00
Joakim Hove
2f23e72bea Removed calls to WellsManager() constructor which uses old EclipseGridParser. 2014-03-25 19:36:42 +01:00
Atgeirr Flø Rasmussen
a2e3ee0a81 Merge pull request #106 from andlaus/sim_fibo_ad_remove_outputwriter_from_simulator 
don't pass the eclipsewriter to the simulator anymore
 2014-03-25 19:01:28 +01:00
Andreas Lauser
168b4379d5 don't pass the eclipsewriter to the simulator anymore 
i.e., the simulator does not deal with any output operations
anymore. This makes sense because report steps are handled by
Opm::TimeMap and the constructor for the simulator already needs more
arguments than appropriate even without this...
 2014-03-25 13:17:30 +01:00
Andreas Lauser
9237aa2443 FullyImplicitBlackoilSolver: make constantState() and variableState() consistent 
With this, constantState() just calls variableState() and throws away
the derivatives. This might be a bit slower than necessary, but it
makes these two methods automatically consistent and constantState()
is only called once per timestep anyway...

thanks to @atgeirr for the suggestion!
 2014-03-25 11:55:13 +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
Atgeirr Flø Rasmussen
cdeac8eed8 Merge pull request #105 from andlaus/sim_fibo_ad_dont_instantiate_old_parser 
sim_fibo_ad: don't instantiate an old parser object if USE_NEW_PARSER is set anymore
 2014-03-21 09:03:20 +01:00
Atgeirr Flø Rasmussen
ee28454b84 Merge pull request #104 from andlaus/sim_fibo_ad_print_reportstep 
sim_fibo_ad: re-add ouputting of the current report step when using opm-parser
 2014-03-21 09:01:29 +01:00
Andreas Lauser
79c93953f8 sim_fibo_ad: don't instantiate an old parser object if USE_NEW_PARSER is set anymore 
I thought I included this in a previous PR. Seems like I was wrong...
 2014-03-20 15:44:53 +01:00
Andreas Lauser
dee6f683cb sim_fibo_ad: re-add ouputting of the current report step when using opm-parser 
in the old parser, this was called 'epoch'...
 2014-03-20 13:14:34 +01:00
Atgeirr Flø Rasmussen
f99b9b90a4 Merge pull request #101 from andlaus/sim_fibo_ad_use_new_wellmanager 
sim_fibo_ad: convert to the new-style wells manager
 2014-03-20 09:07:03 +01:00
Atgeirr Flø Rasmussen
d21e310d01 Merge pull request #98 from andlaus/reverse_increment_write_order_again 
go back to incrementing the current simulation time first, then calling EclipseWriter::writeSolution()
 2014-03-20 09:04:10 +01:00
Andreas Lauser
49a5b67137 sim_fibo_ad: fix writing 
the initial condition was written multiple times. We now fix this by
not writing anything in the simulator and moving this logic to the
main loop..
 2014-03-19 17:40:51 +01:00
Andreas Lauser
66d73083b2 sim_fibo_ad: convert to the new-style wells manager 
i.e. it now uses Opm::EclipseState. This change required to re-add the
the epoch concept in some sense, but the loop variables now call it
"episode" which sounds less ethernal IMO.
 2014-03-19 17:40:38 +01:00
Atgeirr Flø Rasmussen
a9601cb1dd Merge pull request #102 from atgeirr/separate-wellstate 
Specialized well state class for the fully implicit blackoil solver.
 2014-03-18 15:51:54 +01:00
Atgeirr Flø Rasmussen
295677c8c1 Use WellStateFullyImplicitBlackoil class instead of WellState. 2014-03-18 11:27:40 +01:00
Atgeirr Flø Rasmussen
e7f4637461 Add WellStateFullyImplicitBlackoil class. 
This is intended to be used instead of the WellState class in the fully
implicit blackoil simulator. It contains a WellState to reuse the init()
method and to enable users to call functions requiring a WellState.
This is done with containment and an access member function,
basicWellState(), instead of with inheritance to minimize surprises.
 2014-03-18 11:23:05 +01:00
Atgeirr Flø Rasmussen
ad2eed05b3 Merge pull request #97 from andlaus/fix_simtimer_rename_fallout 
fix the fallout of the SimulatorTimer::currentTime() -> SimulatorTimer::simulationTimeElapsed() rename
 2014-03-18 08:51:01 +01:00
Markus Blatt
c82778b3a9 Implemented VTK output for CpGrid using DUNE's VTKWriter and activated Matlab for CpGrid. 2014-03-13 16:33:36 +01:00
Markus Blatt
ec32758822 Removed last occurence of the grid adapter in the EclipseOutputWriter. 2014-03-13 16:33:36 +01:00
Markus Blatt
4e39c7dad1 [bugfix] Fixes elementAt of CentroidIterator. 2014-03-13 16:33:36 +01:00
Markus Blatt
340da4cd7f Added function for querying the face area to the helpers. 2014-03-13 16:33:36 +01:00
Markus Blatt
f4812c21eb Add an example program of FIBOS that uses CpGrid. 2014-03-13 16:33:36 +01:00
Markus Blatt
5112b8af26 Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. 
With these changes it will be possible to use CpGrid with FIBOS except for the
output routines.
 2014-03-13 16:33:36 +01:00
Markus Blatt
0a5262b7c3 Added implementation of free function interface grid interface for CpGrid. 
This implements a superset of the interface as proposed in pull request
 opm-core#496 for use with CpGrid.
It also adds some additional functionality needed in opm-autodiff.
 2014-03-13 15:27:45 +01:00
Markus Blatt
e1e9e677a3 [buildsystem] Make dune-cornerpoint a suggestion. 2014-03-13 15:27:45 +01:00
Atgeirr Flø Rasmussen
37d6c7fe12 Merge pull request #99 from bska/099_cmake 
Synchronise build system with OPM-Core
 2014-03-11 21:14:02 +01:00
Kristian Flikka
d4a7bcd8e4 Only look for BOOST´s unit test framework module if not already found. Sync version with rest of system 2014-03-11 20:09:11 +01:00
Bård Skaflestad
1ce36d7c06 Elucidate description string for opm-parser. 
The 'opm-parser' module is (currently) designed to parse ECL-type
simulation models.  Reflect that fact in its description.
 2014-03-11 20:09:10 +01:00
Bård Skaflestad
f482e89e48 Defer searching for opm-parser 
The "opm-parser" module is expected to become dependent upon the ERT
library.  Defer searching for the parser module until we've
established whether or not ERT is availble.

Suggested by: @andlaus
 2014-03-11 20:09:09 +01:00
Andreas Lauser
0ce6093b69 go back to incrementing the current simulation time first, then calling EclipseWriter::writeSolution() 
for this not to trigger an assertation after the last time step, the
changes of OPM/opm-parser#141 are required.
 2014-03-11 16:05:00 +01:00
Andreas Lauser
1383eadf8f fix the fallout of the SimulatorTimer::currentTime() -> SimulatorTimer::simulationTimeElapsed() rename 2014-03-11 16:01:59 +01:00
Bård Skaflestad
6b0f7c493c Merge pull request #96 from joakim-hove/well-controls-open-close 
Using well_controls_well_is_open() function
 2014-03-04 21:57:14 +01:00
Joakim Hove
0c36af631f Using well_controls_well_is_open() function 2014-03-04 14:49:54 +01:00
Bård Skaflestad
b639aefaaf Merge pull request #95 from atgeirr/pure-virtual 
Make BlackoilPropsAdInterface pure virtual again.
 2014-03-04 14:32:36 +01:00
Atgeirr Flø Rasmussen
5bcca58d31 Make BlackoilPropsAdInterface pure virtual again. 
Done by adding (throwing) implementation to BlackoilPropsAd class.
 2014-03-04 13:09:23 +01:00
Atgeirr Flø Rasmussen
3de050b19f Merge pull request #87 from osae/hysteresis 
Hysteresis.
 2014-03-04 10:30:07 +01:00
Bård Skaflestad
2239a494e8 Merge pull request #93 from atgeirr/fix-minor-props-issues 
Fix minor props issues
 2014-03-03 11:19:13 +01:00
Atgeirr Flø Rasmussen
3627d9ec02 Make spline interpolation possible. 
This restores the logic for choosing monotone splines for dead oil/gas pvt
tables, but the option is inactive (samples set to zero at top).
 2014-03-03 10:31:21 +01:00
Atgeirr Flø Rasmussen
2cc5f0b421 Bugfix: PVDCO->PVCDO. 2014-03-03 10:30:39 +01:00
Atgeirr Flø Rasmussen
b4fe41249a Fix error output. Also very minor whitespace issues. 2014-03-03 10:29:13 +01:00
Atgeirr Flø Rasmussen
cbee89158d Merge pull request #92 from bska/092_cmake 
Synchronise build system with OPM-Core
 2014-03-03 08:18:33 +01:00
Bård Skaflestad
e63a396579 Restore C++-11 checks 
While reformatting the parser-prereqs file I accidentally replaced
the feature search 'CXX11Features' with 'CXX10Features'.  This
commit fixes that blunder.
 2014-02-28 22:10:41 +01:00
Bård Skaflestad
9329d652fd Fix mis-merge. 
In propagating the requirements for opm-benchmarks to the other
modules I accidentally removed the 'opm-parser' prerequisite (see
commit 86439d6 for details).  This commit restores that prerequisite.
 2014-02-28 20:05:55 +01:00