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 branch 'master' into frankenstein

Browse Source 
* master:
  changed: drop usage of python based comparison script in spe integration tests
  changed: drop usage of python based comparison script in polymer integration test
  Remove weak enum Opm::Phase
This commit is contained in:
Andreas Lauser 2016-11-03 13:33:45 +01:00
commit bc4c43a56a
4 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jenkins/run-polymer.sh
View File

@ -10,7 +10,14 @@ test $? -eq 0 || exit 1
cd ../..
# Compare OPM with eclipse reference
PYTHONPATH=$WORKSPACE/$configuration/install/lib/python2.7/dist-packages/ python output_comparator/src/compare_eclipse.py polymer_test_suite/simple2D/eclipse-simulation/ polymer_test_suite/simple2D/opm-simulation/ 2D_THREEPHASE_POLY_HETER 0.0006 0.004
compareECL=$WORKSPACE/$configuration/install/bin/compareECL
reffile=polymer_test_suite/simple2D/eclipse-simulation/2D_THREEPHASE_POLY_HETER
opmfile=polymer_test_suite/simple2D/opm-simulation/2D_THREEPHASE_POLY_HETER
$compareECL $reffile $opmfile 1.0 0.004 -k SGAS
test $? -eq 0 || exit 1
$compareECL $reffile $opmfile 1.0 0.004 -k SWAT
test $? -eq 0 || exit 1
$compareECL $reffile $opmfile 0.0006 1.0 -k PRESSURE
test $? -eq 0 || exit 1
popd

40
jenkins/run-spe.sh
View File

@ -1,5 +1,14 @@
#!/bin/bash
function dotest {
$compareECL $reffile $opmfile 1.0 $1 -k SGAS
test $? -eq 0 || exit 1
$compareECL $reffile $opmfile $2 1.0 -k SWAT
test $? -eq 0 || exit 1
$compareECL $reffile $opmfile $2 1.0 -k PRESSURE
test $? -eq 0 || exit 1
}
pushd .
cd deps/opm-data
@ -17,20 +26,39 @@ $WORKSPACE/$configuration/build-opm-simulators/bin/flow max_iter=50 deck_filenam
test $? -eq 0 || exit 1
cd ..
compareECL=$WORKSPACE/$configuration/install/bin/compareECL
# Compare OPM with eclipse reference
PYTHONPATH=$WORKSPACE/$configuration/install/lib/python2.7/dist-packages/ python output_comparator/src/compare_eclipse.py spe1/eclipse-simulation/ spe1/ SPE1CASE2 0.01 0.01
reffile=spe1/eclipse-simulation/SPE1CASE2
opmfile=spe1/SPE1CASE2
dotest 0.01 0.01
refffile=spe1/opm-simulation-reference/SPE1CASE2
test $? -eq 0 || exit 1
PYTHONPATH=$WORKSPACE/$configuration/install/lib/python2.7/dist-packages/ python output_comparator/src/compare_eclipse.py spe3/eclipse-simulation/ spe3/ SPE3CASE1 0.02 0.02
reffile=spe3/eclipse-simulation/SPE3CASE1
opmfile=spe3/SPE3CASE1
dotest 0.02 0.02
test $? -eq 0 || exit 1
PYTHONPATH=$WORKSPACE/$configuration/install/lib/python2.7/dist-packages/ python output_comparator/src/compare_eclipse.py spe9/eclipse-simulation/ spe9/ SPE9_CP 0.002 0.001
reffile=spe9/eclipse-simulation/SPE9_CP
opmfile=spe9/SPE9_CP
dotest 0.002 0.001
test $? -eq 0 || exit 1
# Compare OPM with OPM reference
PYTHONPATH=$WORKSPACE/$configuration/install/lib/python2.7/dist-packages/ python output_comparator/src/compare_eclipse.py spe1/opm-simulation-reference/ spe1/ SPE1CASE2 0.001 0.001
reffile=spe1/opm-simulation-reference/SPE1CASE2
opmfile=spe1/SPE1CASE2
dotest 0.001 0.001
test $? -eq 0 || exit 1
PYTHONPATH=$WORKSPACE/$configuration/install/lib/python2.7/dist-packages/ python output_comparator/src/compare_eclipse.py spe3/opm-simulation-reference/ spe3/ SPE3CASE1 0.001 0.001
reffile=spe3/opm-simulation-reference/SPE3CASE1
opmfile=spe3/SPE3CASE1
dotest 0.001 0.001
test $? -eq 0 || exit 1
PYTHONPATH=$WORKSPACE/$configuration/install/lib/python2.7/dist-packages/ python output_comparator/src/compare_eclipse.py spe9/opm-simulation-reference/ spe9/ SPE9_CP 0.002 0.007
reffile=spe9/opm-simulation-reference/SPE9_CP
opmfile=spe9/SPE9_CP
dotest 0.002 0.007
test $? -eq 0 || exit 1
popd

6
opm/autodiff/BlackoilModelBase.hpp
View File

@ -94,9 +94,9 @@ namespace Opm {
SimulatorData(int num_phases);
enum FipId {
FIP_AQUA = Opm::Phases::Water,
FIP_LIQUID = Opm::Phases::Oil,
FIP_VAPOUR = Opm::Phases::Gas,
FIP_AQUA = Opm::Water,
FIP_LIQUID = Opm::Oil,
FIP_VAPOUR = Opm::Gas,
FIP_DISSOLVED_GAS = 3,
FIP_VAPORIZED_OIL = 4,
FIP_PV = 5, //< Pore volume

10
opm/autodiff/BlackoilModelEnums.hpp
View File

@ -26,12 +26,10 @@
namespace Opm
{
enum Phases {
Water = BlackoilPropsAdInterface::Water,
Oil = BlackoilPropsAdInterface::Oil ,
Gas = BlackoilPropsAdInterface::Gas ,
MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases
};
constexpr const auto Water = BlackoilPropsAdInterface::Water;
constexpr const auto Oil = BlackoilPropsAdInterface::Oil;
constexpr const auto Gas = BlackoilPropsAdInterface::Gas;
constexpr const auto MaxNumPhases = BlackoilPropsAdInterface::MaxNumPhases;
enum PrimalVariables {
Sg = 0,