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 #3 from atgeirr/fixes-new-tests

Browse Source 
Fixes new tests
This commit is contained in:
Arne Morten Kvarving 2017-11-13 11:32:11 +01:00 committed by GitHub
commit 618d7cab46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compareECLFiles.cmake
View File

@ -169,7 +169,7 @@ add_test_compareECLFiles(CASENAME msw_2d_h
FILENAME 2D_H__ FILENAME 2D_H__
SIMULATOR flow SIMULATOR flow
ABS_TOL ${abs_tol} ABS_TOL ${abs_tol}
REL_TOL ${rel_tol} REL_TOL ${coarse_rel_tol}
TEST_ARGS use_multisegment_well=true) TEST_ARGS use_multisegment_well=true)
add_test_compareECLFiles(CASENAME msw_3d_hfa add_test_compareECLFiles(CASENAME msw_3d_hfa
@ -184,7 +184,7 @@ foreach(SIM flow flow_polymer)
FILENAME 2D_THREEPHASE_POLY_HETER FILENAME 2D_THREEPHASE_POLY_HETER
SIMULATOR ${SIM} SIMULATOR ${SIM}
ABS_TOL ${abs_tol} ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}) REL_TOL ${coarse_rel_tol})
endforeach() endforeach()
add_test_compareECLFiles(CASENAME spe5 add_test_compareECLFiles(CASENAME spe5
@ -233,6 +233,7 @@ if(MPI_FOUND)
# Different tolerances for these tests # Different tolerances for these tests
set(abs_tol_parallel 0.02) set(abs_tol_parallel 0.02)
set(rel_tol_parallel 1e-5) set(rel_tol_parallel 1e-5)
set(coarse_rel_tol_parallel 1e-2)
add_test_compare_parallel_simulation(CASENAME spe1 add_test_compare_parallel_simulation(CASENAME spe1
FILENAME SPE1CASE2 FILENAME SPE1CASE2
@ -250,5 +251,5 @@ if(MPI_FOUND)
FILENAME SPE3CASE1 FILENAME SPE3CASE1
SIMULATOR flow SIMULATOR flow
ABS_TOL ${abs_tol_parallel} ABS_TOL ${abs_tol_parallel}
REL_TOL ${rel_tol_parallel}) REL_TOL ${coarse_rel_tol_parallel})
endif() endif()

12
opm/autodiff/WellInterface_impl.hpp
View File

@ -298,10 +298,10 @@ namespace Opm
if (injection.injectorType == WellInjector::GAS) { if (injection.injectorType == WellInjector::GAS) {
double solvent_fraction = well_ecl_->getSolventFraction(current_step_); double solvent_fraction = well_ecl_->getSolventFraction(current_step_);
return solvent_fraction; return solvent_fraction;
} else {
// Not a gas injection well => no solvent.
return 0.0;
} }
assert(false);
return 0.0;
} }
@ -323,10 +323,10 @@ namespace Opm
if (injection.injectorType == WellInjector::WATER) { if (injection.injectorType == WellInjector::WATER) {
const double polymer_injection_concentration = polymer.m_polymerConcentration; const double polymer_injection_concentration = polymer.m_polymerConcentration;
return polymer_injection_concentration; return polymer_injection_concentration;
} else {
// Not a water injection well => no polymer.
return 0.0;
} }
assert(false); // TODO: find a more logical way to handle this situation
return 0.0;
} }