JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #171 from michaeltryby/dev

Browse Source 
Migrating to benchmark 2012vs10
This commit is contained in:
Michael Tryby
2018-04-13 15:58:55 -04:00
committed by GitHub
parent 3de23845f5 cfcba154a7
commit 67de368d1e
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/before-test.cmd
View File

@@ -24,8 +24,10 @@ setlocal
set SCRIPT_HOME=%~dp0
set TEST_HOME=%~1
set EXAMPLES_VER=1.0.0
set BENCHMARK_VER=2012
set EXAMPLES_VER=1.0.1
set BENCHMARK_VER=2012vs10
set TESTFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/v%EXAMPLES_VER%.zip
set BENCHFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/v%EXAMPLES_VER%/epanet-benchmark-%BENCHMARK_VER%.zip

4
tools/before-test.sh
View File

@@ -22,8 +22,8 @@
SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
TEST_HOME=$1
EXAMPLES_VER="1.0.0"
BENCHMARK_VER="2012"
EXAMPLES_VER="1.0.1"
BENCHMARK_VER="2012vs10"
TEST_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/v${EXAMPLES_VER}.tar.gz"
BENCH_URL="https://github.com/OpenWaterAnalytics/epanet-example-networks/releases/download/v${EXAMPLES_VER}/epanet-benchmark-${BENCHMARK_VER}.tar.gz"

9
tools/run-nrtest.cmd
View File

@@ -18,14 +18,17 @@ setlocal
set NRTEST_SCRIPT_PATH=%~1
set TEST_SUITE_PATH=%~2
set BENCHMARK_VER=2012vs10
set NRTEST_EXECUTE_CMD=python %NRTEST_SCRIPT_PATH%\nrtest execute
set TEST_APP_PATH=apps\epanet-%3.json
set TESTS=tests\examples tests\exeter tests\large tests\network_one tests\small tests\tanks tests\valves
set TEST_OUTPUT_PATH=benchmark\epanet-%3
set NRTEST_COMPARE_CMD=python %NRTEST_SCRIPT_PATH%\nrtest compare
set REF_OUTPUT_PATH=benchmark\epanet-2012
set RTOL_VALUE=0.1
set REF_OUTPUT_PATH=benchmark\epanet-%BENCHMARK_VER%
set RTOL_VALUE=0.01
set ATOL_VALUE=0.0
:: change current directory to test suite
@@ -44,5 +47,5 @@ set NRTEST_COMMAND=%NRTEST_EXECUTE_CMD% %TEST_APP_PATH% %TESTS% -o %TEST_OUTPUT_
echo.
echo INFO: Comparing test and ref benchmark
set NRTEST_COMMAND=%NRTEST_COMPARE_CMD% %TEST_OUTPUT_PATH% %REF_OUTPUT_PATH% --rtol %RTOL_VALUE% --atol %ATOL_VALUE%
set NRTEST_COMMAND=%NRTEST_COMPARE_CMD% %TEST_OUTPUT_PATH% %REF_OUTPUT_PATH% --rtol %RTOL_VALUE% --atol %ATOL_VALUE% -o receipt.json
%NRTEST_COMMAND%

4
tools/run-nrtest.sh
View File

@@ -19,6 +19,8 @@ run-nrtest()
return_value=0
test_suite_path=$1
benchmark_ver="2012vs10"
nrtest_execute_cmd="nrtest execute"
test_app_path="apps/epanet-$2.json"
@@ -26,7 +28,7 @@ tests="tests/examples tests/exeter tests/large tests/network_one tests/small tes
test_output_path="benchmark/epanet-$2"
nrtest_compare_cmd="nrtest compare"
ref_output_path="benchmark/epanet-2012"
ref_output_path="benchmark/epanet-${benchmark_ver}"
rtol_value=0.1
atol_value=0.0