Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev

appveyor.yml

@@ -17,13 +17,13 @@ matrix:
 
 environment: 
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-    GENERATOR: "Visual Studio 10 2010"
-    GROUP: "SUPPORTED"
-    BOOST_ROOT: "C:/Libraries/boost"
-  # New build on Visual Studio 15 2017
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     GENERATOR: "Visual Studio 15 2017"
+    GROUP: "SUPPORTED"
+    BOOST_ROOT: "C:/Libraries/boost_1_67_0"
+  # New build on Visual Studio 15 2017
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    GENERATOR: "Visual Studio 15 2017 Win64"
     GROUP: "EXPERIMENTAL"
     BOOST_ROOT: "C:/Libraries/boost_1_67_0"
 

src/funcs.h

@@ -193,24 +193,8 @@ void    matrixcoeffs(EN_Project *pr);               /* Finds hyd. matrix coeffs.
 
 /* ----------- SMATRIX.C ---------------*/
 int     createsparse(EN_Project *pr);               /* Creates sparse matrix      */
-int     allocsparse(EN_Project *pr);                /* Allocates matrix memory    */
 void    freesparse(EN_Project *pr);                 /* Frees matrix memory        */
-int     buildlists(EN_Project *pr, int);            /* Builds adjacency lists     */
+int     linsolve(EN_Project *pr, int);              /* Solves set of linear eqns. */
-int     paralink(EN_Project *pr, int, int, int);    /* Checks for parallel links  */
-void    xparalinks(EN_Project *pr);                 /* Removes parallel links     */
-void    freelists(EN_Project *pr);                  /* Frees adjacency lists      */
-void    countdegree(EN_Project *pr);                /* Counts links at each node  */
-int     reordernodes(EN_Project *pr);               /* Finds a node re-ordering   */
-int     mindegree(solver_t *s, int, int);           /* Finds min. degree node     */
-int     growlist(EN_Project *pr, int);              /* Augments adjacency list    */
-int     newlink(EN_Project *pr, Padjlist);          /* Adds fill-ins for a node   */
-int     linked(EN_Network *net, int, int);          /* Checks if 2 nodes linked   */
-int     addlink(EN_Network *net, int, int, int);    /* Creates new fill-in        */
-int     storesparse(EN_Project *pr, int);           /* Stores sparse matrix       */
-int     ordersparse(hydraulics_t *h, int);          /* Orders matrix storage      */
-void    transpose(int,int *,int *,                  /* Transposes sparse matrix   */
-        int *,int *,int *,int *,int *);
-int     linsolve(solver_t *s, int);                 /* Solves set of inear eqns.  */
 
 /* ----------- QUALITY.C ---------------*/
 int     openqual(EN_Project *pr);                   /* Opens WQ solver system     */

src/hydsolver.c

@@ -122,7 +122,7 @@ int  hydsolve(EN_Project *pr, int *iter, double *relerr)
             hlosscoeff(pr, i);
         }
         matrixcoeffs(pr);
-        errcode = linsolve(&hyd->solver, net->Njuncs);
+        errcode = linsolve(pr, net->Njuncs);
 
         /* Take action depending on error code */
         if (errcode < 0) {

src/types.h

@@ -100,7 +100,7 @@ typedef  int          INT4;
 ---------------------------------------------------------------------
 */
 #define  MEMCHECK(x)  (((x) == NULL) ? 101 : 0 )
-#define  FREE(x)      (free((x)))
+#define  FREE(x)      if ((x)) free((x))
 
 /*
 ---------------------------------------------------------------------

tools/before-test.cmd

@@ -25,8 +25,8 @@ set SCRIPT_HOME=%~dp0
 set TEST_HOME=%~1
 
 
-set EXAMPLES_VER=1.0.2-dev
+set EXAMPLES_VER=1.0.2-dev.1
-set BENCHMARK_VER=220dev-vs17
+set BENCHMARK_VER=220dev1
 
 
 set TESTFILES_URL=https://github.com/OpenWaterAnalytics/epanet-example-networks/archive/v%EXAMPLES_VER%.zip

tools/before-test.sh

@@ -22,8 +22,8 @@
 SCRIPT_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TEST_HOME=$1
 
-EXAMPLES_VER="1.0.1"
+EXAMPLES_VER="1.0.2-dev.1"
-BENCHMARK_VER="2012vs10"
+BENCHMARK_VER="220dev1"
 
 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"

tools/run-nrtest.cmd

@@ -18,7 +18,7 @@ setlocal
 set NRTEST_SCRIPT_PATH=%~1
 set TEST_SUITE_PATH=%~2
 
-set BENCHMARK_VER=220dev-vs17
+set BENCHMARK_VER=220dev1
 
 
 set NRTEST_EXECUTE_CMD=python %NRTEST_SCRIPT_PATH%\nrtest execute

tools/run-nrtest.sh

@@ -19,7 +19,7 @@ run-nrtest()
 return_value=0
 
 test_suite_path=$1
-benchmark_ver="2012vs10"
+benchmark_ver="220dev1"
 
 
 nrtest_execute_cmd="nrtest execute"