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 #4940 from akva2/udt_enable

Browse Source 
Enable (limited) support  for UDT
This commit is contained in:
Bård Skaflestad 2023-11-03 12:16:30 +01:00 committed by GitHub
commit d88f2b701f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/utils/UnsupportedFlowKeywords.cpp
View File

@ -649,8 +649,6 @@ const KeywordValidation::UnsupportedKeywords& unsupportedKeywords()
{"TUNINGL", {false, std::nullopt}}, {"TUNINGL", {false, std::nullopt}},
{"TUNINGS", {false, std::nullopt}}, {"TUNINGS", {false, std::nullopt}},
{"TZONE", {true, std::nullopt}}, {"TZONE", {true, std::nullopt}},
{"UDT", {true, std::nullopt}},
{"UDTDIMS", {true, std::nullopt}},
{"UNCODHMD", {true, std::nullopt}}, {"UNCODHMD", {true, std::nullopt}},
{"UNIFOUTS", {false, std::nullopt}}, {"UNIFOUTS", {false, std::nullopt}},
{"UNIFSAVE", {false, std::nullopt}}, {"UNIFSAVE", {false, std::nullopt}},

19
regressionTests.cmake
View File

@ -498,6 +498,25 @@ foreach(pinch_case ${_pinch_cases})
DIR pinch) DIR pinch)
endforeach() endforeach()
set(_udt_cases
1D-01B
1D-01
1D-02
1D-03
)
foreach(udt_case ${_udt_cases})
string(TOLOWER ${udt_case} udt_test)
add_test_compareECLFiles(CASENAME udt_${udt_test}
FILENAME UDT-${udt_case}
SIMULATOR flow
ABS_TOL ${abs_tol}
REL_TOL ${rel_tol}
TEST_ARGS --enable-tuning=true
DIR udt)
endforeach()
add_test_compareECLFiles(CASENAME udq_uadd add_test_compareECLFiles(CASENAME udq_uadd
FILENAME UDQ_M1 FILENAME UDQ_M1
SIMULATOR flow SIMULATOR flow

9
tests/update_reference_data.sh
View File

@ -63,10 +63,11 @@ do
failed_test=`echo $failed_test | sed -e 's/.*://g' -e 's/\+/./g'` failed_test=`echo $failed_test | sed -e 's/.*://g' -e 's/\+/./g'`
# Extract test properties # Extract test properties
dir=`dirname "$0"` dir=`dirname "$0"`
binary=$(awk -v search="set_tests_properties\\\($failed_test" -v prop="SIMULATOR" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake) binary=$(awk -v search="set_tests_properties\\\($failed_test\$" -v prop="SIMULATOR" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake)
dir_name=$(awk -v search="set_tests_properties\\\($failed_test" -v prop="DIRNAME" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake) dir_name=$(awk -v search="set_tests_properties\\\($failed_test\$" -v prop="DIRNAME" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake)
file_name=$(awk -v search="set_tests_properties\\\($failed_test" -v prop="FILENAME" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake) file_name=$(awk -v search="set_tests_properties\\\($failed_test\$" -v prop="FILENAME" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake)
test_name=$(awk -v search="set_tests_properties\\\($failed_test" -v prop="TESTNAME" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake) test_name=$(awk -v search="set_tests_properties\\\($failed_test\$" -v prop="TESTNAME" -f $dir/getprop.awk $BUILD_DIR/CTestTestfile.cmake)
echo "$failed_test ${binary} ${dirname} ${file_name} ${test_name}"
copyToReferenceDir \ copyToReferenceDir \
$BUILD_DIR/tests/results/$binary+$test_name \ $BUILD_DIR/tests/results/$binary+$test_name \
$OPM_TESTS_ROOT/$dir_name/opm-simulation-reference/$binary \ $OPM_TESTS_ROOT/$dir_name/opm-simulation-reference/$binary \