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

Merge pull request #4528 from svenn-t/h2store

Browse Source 
Enable WSF/GSF for H2STORE
This commit is contained in:
Bård Skaflestad
2023-09-28 16:59:49 +02:00
committed by GitHub
parent 09626f2e3a 20ebf4d70f
commit 1e8441e8a9
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/core/props/satfunc/RelpermDiagnostics.cpp
View File

@@ -154,9 +154,10 @@ namespace Opm {
if (family3) {
const auto& phases = eclState.runspec().phases();
const bool co2store = eclState.runspec().co2Storage();
if ( !(co2store && phases.active(Phase::GAS) && phases.active(Phase::WATER))) {
const bool h2store = eclState.runspec().h2Storage();
if ( !((co2store || h2store) && phases.active(Phase::GAS) && phases.active(Phase::WATER))) {
const std::string msg = "Relative permeability input format: Saturation Family III. \n \
Only valid for CO2STORE case with GAS and WATER.";
Only valid for CO2STORE or H2STORE cases with GAS and WATER.";
OpmLog::info(msg);
}
satFamily_ = SaturationFunctionFamily::FamilyIII;

35
regressionTests.cmake
View File

@@ -610,6 +610,41 @@ add_test_compareECLFiles(CASENAME co2store_energy
REL_TOL ${rel_tol}
DIR co2store)
add_test_compareECLFiles(CASENAME h2store
FILENAME H2STORE
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR h2store)
add_test_compareECLFiles(CASENAME h2store_gw
FILENAME H2STORE_GW
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR h2store)
add_test_compareECLFiles(CASENAME h2store_gaswat
FILENAME H2STORE_GASWAT
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR h2store)
add_test_compareECLFiles(CASENAME h2store_diffusive
FILENAME H2STORE_DIFFUSIVE
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR h2store)
add_test_compareECLFiles(CASENAME h2store_energy
FILENAME H2STORE_ENERGY
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR h2store)
if (opm-common_EMBEDDED_PYTHON)
add_test_compareECLFiles(CASENAME udq_pyaction
FILENAME PYACTION_WCONPROD