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 #1096 from andlaus/use-flow_legacy-for-unit-tests

Browse Source 
make the unit tests to explicitly use flow_legacy instead of flow
This commit is contained in:
Arne Morten Kvarving 2017-04-04 11:09:36 +02:00 committed by GitHub
commit 32d50eab4a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compareECLFiles.cmake
View File

@ -93,10 +93,10 @@ opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-regressionTest.sh "")
set(abs_tol 2e-2) set(abs_tol 2e-2)
set(rel_tol 1e-5) set(rel_tol 1e-5)
add_test_compareECLFiles(spe1 SPE1CASE2 flow ${abs_tol} ${rel_tol} compareECLFiles "") add_test_compareECLFiles(spe1 SPE1CASE2 flow_legacy ${abs_tol} ${rel_tol} compareECLFiles "")
add_test_compareECLFiles(spe1 SPE1CASE1 flow_sequential ${abs_tol} ${rel_tol} compareECLFiles "") add_test_compareECLFiles(spe1 SPE1CASE1 flow_sequential ${abs_tol} ${rel_tol} compareECLFiles "")
add_test_compareECLFiles(spe3 SPE3CASE1 flow ${abs_tol} ${rel_tol} compareECLFiles "") add_test_compareECLFiles(spe3 SPE3CASE1 flow_legacy ${abs_tol} ${rel_tol} compareECLFiles "")
add_test_compareECLFiles(spe9 SPE9_CP_SHORT flow ${abs_tol} ${rel_tol} compareECLFiles "") add_test_compareECLFiles(spe9 SPE9_CP_SHORT flow_legacy ${abs_tol} ${rel_tol} compareECLFiles "")
add_test_compareECLFiles(msw_2d_h 2D_H__ flow_multisegment ${abs_tol} ${rel_tol} compareECLFiles "") add_test_compareECLFiles(msw_2d_h 2D_H__ flow_multisegment ${abs_tol} ${rel_tol} compareECLFiles "")
# Restart tests # Restart tests
@ -113,7 +113,7 @@ endforeach()
# Init tests # Init tests
opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-init-regressionTest.sh "") opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-init-regressionTest.sh "")
foreach(sim flow flow_ebos) foreach(sim flow_legacy flow_ebos)
add_test_compareECLFiles(norne NORNE_ATW2013 ${sim} ${abs_tol} ${rel_tol} compareECLInitFiles /init) add_test_compareECLFiles(norne NORNE_ATW2013 ${sim} ${abs_tol} ${rel_tol} compareECLInitFiles /init)
endforeach() endforeach()

2
jenkins/run-norne.sh
View File

@ -2,7 +2,7 @@
pushd . pushd .
cd deps/opm-data cd deps/opm-data
test -z $SIM && SIM=flow test -z $SIM && SIM=flow_legacy
# Run the norne case # Run the norne case
cd norne cd norne

6
jenkins/run-spe.sh
View File

@ -14,15 +14,15 @@ cd deps/opm-data
# Run the SPE1/3/9 cases # Run the SPE1/3/9 cases
cd spe1 cd spe1
$WORKSPACE/$configuration/build-opm-simulators/bin/flow deck_filename=SPE1CASE2.DATA $WORKSPACE/$configuration/build-opm-simulators/bin/flow_legacy deck_filename=SPE1CASE2.DATA
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
cd .. cd ..
cd spe3 cd spe3
$WORKSPACE/$configuration/build-opm-simulators/bin/flow max_iter=50 deck_filename=SPE3CASE1.DATA $WORKSPACE/$configuration/build-opm-simulators/bin/flow_legacy max_iter=50 deck_filename=SPE3CASE1.DATA
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
cd .. cd ..
cd spe9 cd spe9
$WORKSPACE/$configuration/build-opm-simulators/bin/flow max_iter=50 deck_filename=SPE9_CP.DATA $WORKSPACE/$configuration/build-opm-simulators/bin/flow_legacy max_iter=50 deck_filename=SPE9_CP.DATA
test $? -eq 0 || exit 1 test $? -eq 0 || exit 1
cd .. cd ..

2
opm/autodiff/FlowMain.hpp
View File

@ -311,7 +311,7 @@ namespace Opm
const std::string version = moduleVersionName(); const std::string version = moduleVersionName();
std::cout << "**********************************************************************\n"; std::cout << "**********************************************************************\n";
std::cout << "* *\n"; std::cout << "* *\n";
std::cout << "* This is Flow (version " << version << ")" std::cout << "* This is flow_legacy (version " << version << ")"
<< std::string(26 - version.size(), ' ') << "*\n"; << std::string(26 - version.size(), ' ') << "*\n";
std::cout << "* *\n"; std::cout << "* *\n";
std::cout << "* Flow is a simulator for fully implicit three-phase black-oil flow, *\n"; std::cout << "* Flow is a simulator for fully implicit three-phase black-oil flow, *\n";