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 #3990 from bska/fix-nonhc-fpr

Browse Source 
Fix Averaged Quantities for Non-HC Simulations
This commit is contained in:
Arne Morten Kvarving
2022-08-12 11:54:26 +02:00
committed by GitHub
parent b9e170fdbe 2f4020a72f
commit 88b944f60d
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compareECLFiles.cmake
View File

@@ -1191,6 +1191,13 @@ add_test_compareECLFiles(CASENAME bo_diffusion
REL_TOL ${rel_tol}
DIR diffusion )
add_test_compareECLFiles(CASENAME fpr_nonhc
FILENAME WATER2F
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
DIR water-1ph)
# Restart tests
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-restart-regressionTest.sh "")
# Cruder tolerances for the restarted tests

12
ebos/eclgenericoutputblackoilmodule.cc
View File

@@ -1544,7 +1544,7 @@ outputFipLogImpl(const Inplace& inplace) const
Scalar fieldHydroCarbonPoreVolumeAveragedPressure = pressureAverage_(inplace.get(Inplace::Phase::PressureHydroCarbonPV),
inplace.get(Inplace::Phase::HydroCarbonPV),
inplace.get(Inplace::Phase::PressurePV),
inplace.get(Inplace::Phase::PoreVolume),
inplace.get(Inplace::Phase::DynamicPoreVolume),
true);
std::unordered_map<Inplace::Phase, Scalar> initial_values;
@@ -1586,7 +1586,7 @@ outputFipLogImpl(const Inplace& inplace) const
= pressureAverage_(inplace.get("FIPNUM", Inplace::Phase::PressureHydroCarbonPV, reg),
inplace.get("FIPNUM", Inplace::Phase::HydroCarbonPV, reg),
inplace.get("FIPNUM", Inplace::Phase::PressurePV, reg),
inplace.get("FIPNUM", Inplace::Phase::PoreVolume, reg),
inplace.get("FIPNUM", Inplace::Phase::DynamicPoreVolume, reg),
true);
pressureUnitConvert_(regHydroCarbonPoreVolumeAveragedPressure);
outputRegionFluidInPlace_(std::move(initial_values),
@@ -1744,7 +1744,7 @@ updateSummaryRegionValues(const Inplace& inplace,
pressureAverage_(inplace.get(Inplace::Phase::PressureHydroCarbonPV),
inplace.get(Inplace::Phase::HydroCarbonPV),
inplace.get(Inplace::Phase::PressurePV),
inplace.get(Inplace::Phase::PoreVolume),
inplace.get(Inplace::Phase::DynamicPoreVolume),
true);
}
@@ -1753,7 +1753,7 @@ updateSummaryRegionValues(const Inplace& inplace,
pressureAverage_(inplace.get(Inplace::Phase::PressureHydroCarbonPV),
inplace.get(Inplace::Phase::HydroCarbonPV),
inplace.get(Inplace::Phase::PressurePV),
inplace.get(Inplace::Phase::PoreVolume),
inplace.get(Inplace::Phase::DynamicPoreVolume),
false);
}
@@ -1779,7 +1779,7 @@ updateSummaryRegionValues(const Inplace& inplace,
pressureAverage_(get_vector(node, Inplace::Phase::PressureHydroCarbonPV),
get_vector(node, Inplace::Phase::HydroCarbonPV),
get_vector(node, Inplace::Phase::PressurePV),
get_vector(node, Inplace::Phase::PoreVolume),
get_vector(node, Inplace::Phase::DynamicPoreVolume),
true);
}
@@ -1788,7 +1788,7 @@ updateSummaryRegionValues(const Inplace& inplace,
pressureAverage_(get_vector(node, Inplace::Phase::PressureHydroCarbonPV),
get_vector(node, Inplace::Phase::HydroCarbonPV),
get_vector(node, Inplace::Phase::PressurePV),
get_vector(node, Inplace::Phase::PoreVolume),
get_vector(node, Inplace::Phase::DynamicPoreVolume),
false);
}
}

1
tests/update_reference_data.sh
View File

@@ -190,6 +190,7 @@ tests[max_watercut_4]="flow wtest/wecon_wct_max MAX_WATERCUT_4"
tests[max_wgr_1]="flow wtest/wecon_wgr_max MAX_WGR_1"
tests[rxft_smry]="flow rxft_smry TEST_RXFT"
tests[bo_diffusion]="flow diffusion BO_DIFFUSE_CASE1"
tests[fpr_nonhc]="flow water-1ph WATER2F"
changed_tests=""