From 0930a333212b151aea5a1743ce691231d05a275c Mon Sep 17 00:00:00 2001 From: Lew Rossman Date: Sun, 12 May 2019 19:20:16 -0400 Subject: [PATCH 1/3] Minor format change to status report --- src/report.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/report.c b/src/report.c index 0e7336d..181ffaf 100644 --- a/src/report.c +++ b/src/report.c @@ -1142,6 +1142,7 @@ int writehydwarn(Project *pr, int iter, double relerr) { disconnected(pr); pr->Warnflag = flag; + if (rpt->Messageflag) writeline(pr, " "); } return flag; } From dae0fc03d1dff3dc7ab7fdb74c14b29c092bb071 Mon Sep 17 00:00:00 2001 From: Lew Rossman Date: Sun, 12 May 2019 20:02:07 -0400 Subject: [PATCH 2/3] Removing status reports from CI testing --- tools/nrtest-epanet/nrtest_epanet/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/nrtest-epanet/nrtest_epanet/__init__.py b/tools/nrtest-epanet/nrtest_epanet/__init__.py index a118695..829a671 100644 --- a/tools/nrtest-epanet/nrtest_epanet/__init__.py +++ b/tools/nrtest-epanet/nrtest_epanet/__init__.py @@ -154,7 +154,7 @@ def epanet_report_compare(path_test, path_ref, rtol, atol): ''' HEADER = 10 FOOTER = 2 - + ''' with open(path_test ,'r') as ftest, open(path_ref, 'r') as fref: for (test_line, ref_line) in it.izip(hdf.parse(ftest, HEADER, FOOTER)[1], @@ -162,5 +162,5 @@ def epanet_report_compare(path_test, path_ref, rtol, atol): if test_line != ref_line: return False - + ''' return True From f8cf7e0eb3974634389b2a0dbd0f080bb6c68600 Mon Sep 17 00:00:00 2001 From: Lew Rossman Date: Mon, 13 May 2019 11:05:58 -0400 Subject: [PATCH 3/3] Restored CI testing of status reports --- tools/nrtest-epanet/nrtest_epanet/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/nrtest-epanet/nrtest_epanet/__init__.py b/tools/nrtest-epanet/nrtest_epanet/__init__.py index 829a671..22d6fe6 100644 --- a/tools/nrtest-epanet/nrtest_epanet/__init__.py +++ b/tools/nrtest-epanet/nrtest_epanet/__init__.py @@ -154,7 +154,7 @@ def epanet_report_compare(path_test, path_ref, rtol, atol): ''' HEADER = 10 FOOTER = 2 - ''' + with open(path_test ,'r') as ftest, open(path_ref, 'r') as fref: for (test_line, ref_line) in it.izip(hdf.parse(ftest, HEADER, FOOTER)[1], @@ -162,5 +162,5 @@ def epanet_report_compare(path_test, path_ref, rtol, atol): if test_line != ref_line: return False - ''' + return True