From 0b70d878188182e081a66c4d87fb1f3749d92fad Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 13 Apr 2018 15:40:44 -0400
Subject: [PATCH 1/2] Migrating Appveyor to benchmark 2012vs10

---
 tools/before-test.cmd | 6 ++++--
 tools/run-nrtest.cmd  | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/before-test.cmd b/tools/before-test.cmd
index c461470..0e8b41a 100644
--- a/tools/before-test.cmd
+++ b/tools/before-test.cmd
@@ -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
diff --git a/tools/run-nrtest.cmd b/tools/run-nrtest.cmd
index 1c504e4..0b7c17f 100644
--- a/tools/run-nrtest.cmd
+++ b/tools/run-nrtest.cmd
@@ -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%

From cfcba154a75506acacba9c014a510e6ff839b7bc Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Fri, 13 Apr 2018 15:52:52 -0400
Subject: [PATCH 2/2] Migrating Travis to 2012vs10 benchmark

---
 tools/before-test.sh | 4 ++--
 tools/run-nrtest.sh  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/before-test.sh b/tools/before-test.sh
index 80b6794..8cb902b 100755
--- a/tools/before-test.sh
+++ b/tools/before-test.sh
@@ -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"
diff --git a/tools/run-nrtest.sh b/tools/run-nrtest.sh
index ddd750a..c561ad6 100755
--- a/tools/run-nrtest.sh
+++ b/tools/run-nrtest.sh
@@ -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