fix several warnings in the tests

openstreams · Nov 7, 2018 · d0b998e · d0b998e
1 parent 381b934
commit d0b998e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/tests/test_wflow_sbm_dynveg.py b/tests/test_wflow_sbm_dynveg.py
@@ -60,7 +60,7 @@ def testapirun_netcfd(self):
             os.path.join(caseName, runId, "wbsoil.csv"), delimiter=","
         )
         print("Checking soil water budget ....")
-        self.assertAlmostEquals(0.00040802343085033499, my_data[:, 2].sum(), places=4)
+        self.assertAlmostEqual(0.00040802343085033499, my_data[:, 2].sum(), places=4)
         print("Checking precip sum ....")
         my_data = wf.genfromtxt(os.path.join(caseName, runId, "P.csv"), delimiter=",")
         self.assertAlmostEqual(sump, my_data[:, 2].sum())

diff --git a/tests/test_wflow_sbm_example.py b/tests/test_wflow_sbm_example.py
@@ -49,7 +49,7 @@ def testapirunexample(self):
         os.chdir(orgdir)
 
         print("Checking specific runoff ....")
-        self.assertAlmostEquals(46.76774859428406, my_data[:, 2].sum(), places=4)
+        self.assertAlmostEqual(46.76774859428406, my_data[:, 2].sum(), places=4)
 
 
 if __name__ == "__main__":

diff --git a/tests/test_wflow_sbm_nc.py b/tests/test_wflow_sbm_nc.py
@@ -62,7 +62,7 @@ def testapirun_netcfd(self):
             os.path.join(caseName, runId, "wbsoil.csv"), delimiter=","
         )
         print("Checking soil water budget ....")
-        self.assertAlmostEquals(0.0026834408363356488, my_data[:, 2].sum(), places=4)
+        self.assertAlmostEqual(0.0026834408363356488, my_data[:, 2].sum(), places=4)
         print("Checking precip sum ....")
         my_data = wf.genfromtxt(os.path.join(caseName, runId, "P.csv"), delimiter=",")
         self.assertAlmostEqual(sump, my_data[:, 2].sum())

diff --git a/tests/test_wflow_sbm_nc2.py b/tests/test_wflow_sbm_nc2.py
@@ -18,7 +18,7 @@ def testapirun_netcfd2(self):
         runId = "unittest"
         configfile = "wflow_sbm_NC2.ini"
         wflow_cloneMap = "wflow_catchment.map"
-        caseName = "../examples\wflow_rhine_sbm_nc"
+        caseName = "../examples/wflow_rhine_sbm_nc"
 
         myModel = wf.WflowModel(wflow_cloneMap, caseName, runId, configfile)
         # initialise the framework

diff --git a/wflow/wflow_lib.py b/wflow/wflow_lib.py
@@ -822,7 +822,7 @@ def subcatch_order_a(ldd, oorder):
     Determines subcatchments using the catchment order
 
     This version uses the last cell BELOW order to derive the
-    catchments. In general you want the \_b version
+    catchments. In general you want the _b version
 
     Input:
         - ldd

diff --git a/wflow/wflow_sbm.py b/wflow/wflow_sbm.py
@@ -68,7 +68,7 @@
     -U: The argument to this option should be a .tss file with measured discharge in
         [m^3/s] which the progam will use to update the internal state to match
         the measured flow. The number of columns in this file should match the
-        number of gauges in the wflow\_gauges.map file.
+        number of gauges in the wflow_gauges.map file.
 
     -u: list of gauges/columns to use in update. Format:
         -u [1 , 4 ,13]