From 230668a34d2c9e6d4ae3a502b1df4d08371fcc2a Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Thu, 22 Mar 2018 17:27:53 -0400 Subject: [PATCH] Updating benchmark with new tests --- .../benchmark/epanet-2012/NET1-3/NET1-3.out | Bin 0 -> 9728 bytes .../benchmark/epanet-2012/NET1-3/NET1-3.rpt | 95 ++++++++++++++++++ .../epanet-2012/NET1-PBV/NET1-PBV.out | Bin 0 -> 2624 bytes .../epanet-2012/NET1-PBV/NET1-PBV.rpt | 24 +++++ .../benchmark/epanet-2012/NET1/NET1.out | Bin 0 -> 2624 bytes .../benchmark/epanet-2012/NET1/NET1.rpt | 24 +++++ .../benchmark/epanet-2012/NET1cv/NET1cv.out | Bin 0 -> 2624 bytes .../benchmark/epanet-2012/NET1cv/NET1cv.rpt | 26 +++++ .../epanet-2012/NET1emit/NET1emit.out | Bin 0 -> 2624 bytes .../epanet-2012/NET1emit/NET1emit.rpt | 25 +++++ .../epanet-2012/NET1negemit/NET1negemit.out | Bin 0 -> 2624 bytes .../epanet-2012/NET1negemit/NET1negemit.rpt | 28 ++++++ .../benchmark/epanet-2012/NET1np/NET1np.out | Bin 0 -> 2460 bytes .../benchmark/epanet-2012/NET1np/NET1np.rpt | 26 +++++ .../epanet-2012/NET1para/NET1para.out | Bin 0 -> 2708 bytes .../epanet-2012/NET1para/NET1para.rpt | 24 +++++ .../benchmark/epanet-2012/manifest.json | 88 ++++++++++++++++ .../tests/network_one/NET1-3.json | 14 +-- .../tests/network_one/NET1-PBV.json | 14 +-- .../tests/network_one/NET1.json | 14 +-- .../tests/network_one/NET1cv.json | 14 +-- .../tests/network_one/NET1emit.json | 14 +-- .../tests/network_one/NET1negemit.json | 14 +-- .../tests/network_one/NET1np.json | 14 +-- .../tests/network_one/NET1para.json | 14 +-- 25 files changed, 416 insertions(+), 56 deletions(-) create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-3/NET1-3.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-3/NET1-3.rpt create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-PBV/NET1-PBV.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-PBV/NET1-PBV.rpt create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1/NET1.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1/NET1.rpt create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1cv/NET1cv.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1cv/NET1cv.rpt create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1emit/NET1emit.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1emit/NET1emit.rpt create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1negemit/NET1negemit.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1negemit/NET1negemit.rpt create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1np/NET1np.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1np/NET1np.rpt create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1para/NET1para.out create mode 100644 tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1para/NET1para.rpt diff --git a/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-3/NET1-3.out b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-3/NET1-3.out new file mode 100644 index 0000000000000000000000000000000000000000..f5a7eb429e01324f3c65852c3266eed35002cf94 GIT binary patch literal 9728 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 literal 0 HcmV?d00001 diff --git a/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-3/NET1-3.rpt b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-3/NET1-3.rpt new file mode 100644 index 0000000..e2cf7b5 --- /dev/null +++ b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-3/NET1-3.rpt @@ -0,0 +1,95 @@ + Page 1 Thu Mar 22 17:13:07 2018 + + ****************************************************************** + * E P A N E T * + * Hydraulic and Water Quality * + * Analysis for Pipe Networks * + * Version 2.00.12 * + ****************************************************************** + + Analysis begun Thu Mar 22 17:13:07 2018 + + + Hydraulic Status: + ----------------------------------------------------------------------- + 0:00:00: Balancing the network: + Trial 1: relative flow change = 0.763338 + Trial 2: relative flow change = 0.090158 + Trial 3: relative flow change = 0.003566 + Trial 4: relative flow change = 0.000023 + 0:00:00: Balanced after 4 trials + 0:00:00: Reservoir 9 is emptying + 0:00:00: Tank 2 is filling at 120.00 ft + + 1:00:00: Balancing the network: + Trial 1: relative flow change = 0.013863 + Trial 2: relative flow change = 0.000081 + 1:00:00: Balanced after 2 trials + + 2:00:00: Balancing the network: + Trial 1: relative flow change = 0.078226 + Trial 2: relative flow change = 0.004052 + Trial 3: relative flow change = 0.000157 + 2:00:00: Balanced after 3 trials + + 3:00:00: Balancing the network: + Trial 1: relative flow change = 0.011208 + Trial 2: relative flow change = 0.000058 + 3:00:00: Balanced after 2 trials + + 4:00:00: Balancing the network: + Trial 1: relative flow change = 0.081776 + Trial 2: relative flow change = 0.001709 + Trial 3: relative flow change = 0.000017 + 4:00:00: Balanced after 3 trials + + 5:00:00: Balancing the network: + Trial 1: relative flow change = 0.007916 + Trial 2: relative flow change = 0.000024 + 5:00:00: Balanced after 2 trials + + 6:00:00: Balancing the network: + Trial 1: relative flow change = 0.079414 + Trial 2: relative flow change = 0.000909 + 6:00:00: Balanced after 2 trials + + 7:00:00: Balancing the network: + Trial 1: relative flow change = 0.004548 + Trial 2: relative flow change = 0.000008 + 7:00:00: Balanced after 2 trials + + 8:00:00: Balancing the network: + Trial 1: relative flow change = 0.075544 + Trial 2: relative flow change = 0.000607 + 8:00:00: Balanced after 2 trials + + 8:50:33: Pump 9 changed by Tank 2 control + 8:50:33: Balancing the network: + Trial 1: relative flow change = 2.375922 + Trial 2: relative flow change = 0.228731 + Trial 3: relative flow change = 0.010863 + Trial 4: relative flow change = 0.000037 + 8:50:33: Balanced after 4 trials + 8:50:33: Reservoir 9 is closed + 8:50:33: Tank 2 is emptying at 140.00 ft + 8:50:33: Pump 9 changed from open to closed + + 9:00:00: Balancing the network: + Trial 1: relative flow change = 0.000000 + 9:00:00: Balanced after 1 trials + + 10:00:00: Balancing the network: + Trial 1: relative flow change = 0.166666 + Trial 2: relative flow change = 0.000000 + 10:00:00: Balanced after 2 trials + + 11:00:00: Balancing the network: + Trial 1: relative flow change = 0.000000 + 11:00:00: Balanced after 1 trials + + 12:00:00: Balancing the network: + Trial 1: relative flow change = 0.200000 + Trial 2: relative flow change = 0.000000 + 12:00:00: Balanced after 2 trials + + Analysis ended Thu Mar 22 17:13:07 2018 diff --git a/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-PBV/NET1-PBV.out b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1-PBV/NET1-PBV.out new file mode 100644 index 0000000000000000000000000000000000000000..044500ade9d0dfaa0757595d0934bcfb9e5fbbac GIT binary patch literal 2624 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 literal 0 HcmV?d00001 diff --git a/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1emit/NET1emit.rpt b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1emit/NET1emit.rpt new file mode 100644 index 0000000..f339b3c --- /dev/null +++ b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1emit/NET1emit.rpt @@ -0,0 +1,25 @@ + Page 1 Thu Mar 22 17:13:07 2018 + + ****************************************************************** + * E P A N E T * + * Hydraulic and Water Quality * + * Analysis for Pipe Networks * + * Version 2.00.12 * + ****************************************************************** + + Analysis begun Thu Mar 22 17:13:07 2018 + + + Hydraulic Status: + ----------------------------------------------------------------------- + 0:00:00: Balancing the network: + Trial 1: relative flow change = 0.655886 + Trial 2: relative flow change = 0.090419 + Trial 3: relative flow change = 0.017845 + Trial 4: relative flow change = 0.002265 + Trial 5: relative flow change = 0.000041 + 0:00:00: Balanced after 5 trials + 0:00:00: Reservoir 9 is emptying + 0:00:00: Tank 2 is filling at 120.00 ft + + Analysis ended Thu Mar 22 17:13:07 2018 diff --git a/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1negemit/NET1negemit.out b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1negemit/NET1negemit.out new file mode 100644 index 0000000000000000000000000000000000000000..896bbe0c66d2c08e327c951bfe3d3342e69094e5 GIT binary patch literal 2624 zcmeH}T}V?=9Kg>~OOrH;)|;Nl0;!f~vnciK-rb$qC|N=xNFdJbI&aQxUZ)l%8bnzS zVn`Aii9{F*Js1>WluT0zg85`07`~MDflr}QM4jViNyV z_BsGa1^}$1Y@+BWE9Lj|=9GvP+6pZWTM@LKc2)^8u)Lo}PEvm&4Dk*k%ULGcANeg7N(-6vqJq@RGx>HXUYQI>WjLL9r1 zV>fBrjhy^OPJSaNzloFI#L0hHyM4e32PjMXw}}wPZq&9LIq^nLyonQ!I0GQg00?O} zfRIUZK*SjkaR%hQKX#w6yC#m3Kv_>oq%7Y-Odn5Kwr!;QWq+n;{u?Msl$AM{j^$x` zRwGte4OWZw!DO`b3jxh20@zQ$&^`iwt{ss*vjaQzDI%aHBOid=@RX4Was^lR@~igdD@c}YM)BB4qOhf-ibY^7r#yH5>F}T%#JB66!aR*6J0ar z>4959YSX+>t`uWk=Xo=@;uc=tHLzZQ7&j}t&C3zx6XkfZ?WK7j>0w@a%1tvU)C+;^ zbg{p0ckZ);op}3vzR;hYDO|r=FwEj&7g40uVuZb?SYXdCcF7vm;W$qMUU+u|KMH4J qf4BfYU&zP0Rkdm65SgEJrlwXpekW`wJ zt&o_Pg5ARM#GD+3qSVCXlFa{{@;6zEsOyaK(tUVpbq#2Vzhi0uyHjvSD(_Vj#6_K+FNe$ofHIATvPXAoZkRkb6LOgTS%4UoH#{ zhAs>Y`YsFybP;re4ulPsn+8-9;=<6O;>N(R)D;tZIAe-|)J3ZUD*yG5c)SscVv4y@UJ?{eI!>GHHsq^MWEVXP}#oUSgW!^3UPp zVW8OIg+*1)4W~R0NvNH0ka+ab;rpR*yDj&991Jw?*zvdAvKPLz(4p?cEQjyL>+QqV zmD?xGJ!2o$Eo8r9uA$=&sg;gqmYTNCtY;kLbr|d%bkiLe7QS~dmWptX+QqxOde5JXV)_|cEHG%Kk{@`ue?U67PJwLhZ+-<~<|b7r`lttjqW zmE}Pw1tBztVKIY^VLJUTr-BnB>@IP7+@;vvq6O;=9eebK=CE0d367cn`p1bQfmkAa zDq(m(4u*ZY5eOZ?UcV7G10fyzbg$N$gK41*vEPH0Nk~+=Qasr_`OUM7lfBFVoemxlQYDS_%l0553LO6DTV|Q5F z1x|i}lV9NEcX0AMIQh3&w~sjCh~!y+o`i7hg0)@X#0#8w2Pd9z1|XaP2(fN}5QpV} zgfk%F3<&kD3h>?+_6_W!xeQ4R^BL?6@f`*Fc?@wI$O{?bF<^t31q{gy)AN81a)BOv zpjIM)T2K>u0(w~WQ$=lL5-3+iJ=rRX^R}$XGuTlv^C?x)iHt&oF1u%<*fmoZ_k&6u zPK2r%@Dvordz48%=-`YP2f#Td$M!lx0~DdN)NU_Vm7Dh|fcZ_MG*%k`e!!s@Adm;> z9q~hdWZb9LEwKGCnK zLlj>cp>Mszbp5#zTK##H4i84@w=1t>Jw(TM0hjq`V?J#%>qYG=?^OLcujt)Y$wedS z51#&5O<8~a&(D8x1^b7bOy~T5Z;>n89;6^cjH@F}8N8997|wUnB$*6{o=TseE6!=6g?_-kLmJ~HCZtkZeaeN_i|-)lVUH*l5+b;q`}O+TYFD;OQ>f| z>Z)0*yeM!;WzYKZ+Y7hJo@*I0$k(+UeGr=%DGEY~VDhcvZ}w*#?ldtv-fI&(PbP_F zFE@%+7uJc5E84};(n7H%GgY*qW#T@eL@cj7Bt9zLAlkd~WAbd3Y*We#_J8yj>fj9d literal 0 HcmV?d00001 diff --git a/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1para/NET1para.rpt b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1para/NET1para.rpt new file mode 100644 index 0000000..ed3f339 --- /dev/null +++ b/tests/epanet-nrtestsuite/benchmark/epanet-2012/NET1para/NET1para.rpt @@ -0,0 +1,24 @@ + Page 1 Thu Mar 22 17:13:08 2018 + + ****************************************************************** + * E P A N E T * + * Hydraulic and Water Quality * + * Analysis for Pipe Networks * + * Version 2.00.12 * + ****************************************************************** + + Analysis begun Thu Mar 22 17:13:08 2018 + + + Hydraulic Status: + ----------------------------------------------------------------------- + 0:00:00: Balancing the network: + Trial 1: relative flow change = 0.738152 + Trial 2: relative flow change = 0.080662 + Trial 3: relative flow change = 0.002745 + Trial 4: relative flow change = 0.000004 + 0:00:00: Balanced after 4 trials + 0:00:00: Reservoir 9 is emptying + 0:00:00: Tank 2 is filling at 120.00 ft + + Analysis ended Thu Mar 22 17:13:08 2018 diff --git a/tests/epanet-nrtestsuite/benchmark/epanet-2012/manifest.json b/tests/epanet-nrtestsuite/benchmark/epanet-2012/manifest.json index c47181d..fa091df 100644 --- a/tests/epanet-nrtestsuite/benchmark/epanet-2012/manifest.json +++ b/tests/epanet-nrtestsuite/benchmark/epanet-2012/manifest.json @@ -37,6 +37,94 @@ }, "passed": true, "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1", + "output_files": { + "NET1.out": "epanet allclose", + "NET1.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1-3", + "output_files": { + "NET1-3.out": "epanet allclose", + "NET1-3.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1-PBV", + "output_files": { + "NET1-PBV.out": "epanet allclose", + "NET1-PBV.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1cv", + "output_files": { + "NET1cv.out": "epanet allclose", + "NET1cv.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1emit", + "output_files": { + "NET1emit.out": "epanet allclose", + "NET1emit.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1negemit", + "output_files": { + "NET1negemit.out": "epanet allclose", + "NET1negemit.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1np", + "output_files": { + "NET1np.out": "epanet allclose", + "NET1np.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" + }, + { + "description": "", + "error_msg": null, + "name": "NET1para", + "output_files": { + "NET1para.out": "epanet allclose", + "NET1para.rpt": "epanet report" + }, + "passed": true, + "version": "1.0" } ] } \ No newline at end of file diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1-3.json b/tests/epanet-nrtestsuite/tests/network_one/NET1-3.json index d69014d..104876c 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1-3.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1-3.json @@ -1,17 +1,17 @@ { - "name": ".//NET1-3", + "name": "NET1-3", "version": "1.0", "description": "", "args": [ - ".//NET1-3.inp", - ".//NET1-3.rpt", - ".//NET1-3.out" + "NET1-3.inp", + "NET1-3.rpt", + "NET1-3.out" ], "input_files": [ - ".//NET1-3.inp" + "NET1-3.inp" ], "output_files": { - ".//NET1-3.rpt": "epanet report", - ".//NET1-3.out": "epanet allclose" + "NET1-3.rpt": "epanet report", + "NET1-3.out": "epanet allclose" } } diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1-PBV.json b/tests/epanet-nrtestsuite/tests/network_one/NET1-PBV.json index 0bfb520..b428696 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1-PBV.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1-PBV.json @@ -1,17 +1,17 @@ { - "name": ".//NET1-PBV", + "name": "NET1-PBV", "version": "1.0", "description": "", "args": [ - ".//NET1-PBV.inp", - ".//NET1-PBV.rpt", - ".//NET1-PBV.out" + "NET1-PBV.inp", + "NET1-PBV.rpt", + "NET1-PBV.out" ], "input_files": [ - ".//NET1-PBV.inp" + "NET1-PBV.inp" ], "output_files": { - ".//NET1-PBV.rpt": "epanet report", - ".//NET1-PBV.out": "epanet allclose" + "NET1-PBV.rpt": "epanet report", + "NET1-PBV.out": "epanet allclose" } } diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1.json b/tests/epanet-nrtestsuite/tests/network_one/NET1.json index 25f0437..f88083d 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1.json @@ -1,17 +1,17 @@ { - "name": ".//NET1", + "name": "NET1", "version": "1.0", "description": "", "args": [ - ".//NET1.inp", - ".//NET1.rpt", - ".//NET1.out" + "NET1.inp", + "NET1.rpt", + "NET1.out" ], "input_files": [ - ".//NET1.inp" + "NET1.inp" ], "output_files": { - ".//NET1.rpt": "epanet report", - ".//NET1.out": "epanet allclose" + "NET1.rpt": "epanet report", + "NET1.out": "epanet allclose" } } diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1cv.json b/tests/epanet-nrtestsuite/tests/network_one/NET1cv.json index df0c65f..683daf1 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1cv.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1cv.json @@ -1,17 +1,17 @@ { - "name": ".//NET1cv", + "name": "NET1cv", "version": "1.0", "description": "", "args": [ - ".//NET1cv.inp", - ".//NET1cv.rpt", - ".//NET1cv.out" + "NET1cv.inp", + "NET1cv.rpt", + "NET1cv.out" ], "input_files": [ - ".//NET1cv.inp" + "NET1cv.inp" ], "output_files": { - ".//NET1cv.rpt": "epanet report", - ".//NET1cv.out": "epanet allclose" + "NET1cv.rpt": "epanet report", + "NET1cv.out": "epanet allclose" } } diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1emit.json b/tests/epanet-nrtestsuite/tests/network_one/NET1emit.json index 82985e6..7376d2a 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1emit.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1emit.json @@ -1,17 +1,17 @@ { - "name": ".//NET1emit", + "name": "NET1emit", "version": "1.0", "description": "", "args": [ - ".//NET1emit.inp", - ".//NET1emit.rpt", - ".//NET1emit.out" + "NET1emit.inp", + "NET1emit.rpt", + "NET1emit.out" ], "input_files": [ - ".//NET1emit.inp" + "NET1emit.inp" ], "output_files": { - ".//NET1emit.rpt": "epanet report", - ".//NET1emit.out": "epanet allclose" + "NET1emit.rpt": "epanet report", + "NET1emit.out": "epanet allclose" } } diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1negemit.json b/tests/epanet-nrtestsuite/tests/network_one/NET1negemit.json index 8ce3eba..87d86df 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1negemit.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1negemit.json @@ -1,17 +1,17 @@ { - "name": ".//NET1negemit", + "name": "NET1negemit", "version": "1.0", "description": "", "args": [ - ".//NET1negemit.inp", - ".//NET1negemit.rpt", - ".//NET1negemit.out" + "NET1negemit.inp", + "NET1negemit.rpt", + "NET1negemit.out" ], "input_files": [ - ".//NET1negemit.inp" + "NET1negemit.inp" ], "output_files": { - ".//NET1negemit.rpt": "epanet report", - ".//NET1negemit.out": "epanet allclose" + "NET1negemit.rpt": "epanet report", + "NET1negemit.out": "epanet allclose" } } diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1np.json b/tests/epanet-nrtestsuite/tests/network_one/NET1np.json index c3e1f8a..77349cd 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1np.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1np.json @@ -1,17 +1,17 @@ { - "name": ".//NET1np", + "name": "NET1np", "version": "1.0", "description": "", "args": [ - ".//NET1np.inp", - ".//NET1np.rpt", - ".//NET1np.out" + "NET1np.inp", + "NET1np.rpt", + "NET1np.out" ], "input_files": [ - ".//NET1np.inp" + "NET1np.inp" ], "output_files": { - ".//NET1np.rpt": "epanet report", - ".//NET1np.out": "epanet allclose" + "NET1np.rpt": "epanet report", + "NET1np.out": "epanet allclose" } } diff --git a/tests/epanet-nrtestsuite/tests/network_one/NET1para.json b/tests/epanet-nrtestsuite/tests/network_one/NET1para.json index f149f02..1f8a40c 100644 --- a/tests/epanet-nrtestsuite/tests/network_one/NET1para.json +++ b/tests/epanet-nrtestsuite/tests/network_one/NET1para.json @@ -1,17 +1,17 @@ { - "name": ".//NET1para", + "name": "NET1para", "version": "1.0", "description": "", "args": [ - ".//NET1para.inp", - ".//NET1para.rpt", - ".//NET1para.out" + "NET1para.inp", + "NET1para.rpt", + "NET1para.out" ], "input_files": [ - ".//NET1para.inp" + "NET1para.inp" ], "output_files": { - ".//NET1para.rpt": "epanet report", - ".//NET1para.out": "epanet allclose" + "NET1para.rpt": "epanet report", + "NET1para.out": "epanet allclose" } }