OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-18 21:02:57 -06:00
Code Issues Packages Projects Releases Wiki Activity
675f730b01
opm-simulators/opm/core
History
Liu Ming 675f730b01 Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics 
Conflicts:
	opm/core/props/satfunc/RelpermDiagnostics.cpp
2016-01-22 13:04:01 +08:00
..
flowdiagnostics use the error macros from opm-common 2015-10-08 11:42:15 +02:00
linalg Return a constant reference to the mask for ParallelISTLInformation::updateOwnerMask 2015-11-02 15:02:32 +01:00
pressure use the error macros from opm-common 2015-10-08 11:42:15 +02:00
props Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics 2016-01-22 13:04:01 +08:00
simulator Fixes includes wrt opm-parser PR-656 2016-01-21 09:42:51 +01:00
transport PVT properties: allow them to be temperature dependent 2014-12-01 20:06:31 +01:00
utility use the error macros from opm-common 2015-10-08 11:42:15 +02:00
wells Fixes includes wrt opm-parser PR-656 2016-01-21 09:42:51 +01:00
well_controls.h Initial integration of VFP 2015-08-19 13:10:48 +02:00
wells.h Avoid using bool in the c code 2015-10-07 12:49:05 +02:00