Index: wflow-py/UnitTests/Testwflow_hbv.py =================================================================== diff -u -r58f139b2afc2424fc9f8796934878bd6e49c31de -rf9f3c6899180840802fcf49f03ae83612edb4d66 --- wflow-py/UnitTests/Testwflow_hbv.py (.../Testwflow_hbv.py) (revision 58f139b2afc2424fc9f8796934878bd6e49c31de) +++ wflow-py/UnitTests/Testwflow_hbv.py (.../Testwflow_hbv.py) (revision f9f3c6899180840802fcf49f03ae83612edb4d66) @@ -19,14 +19,16 @@ # set runid, clonemap and casename. Also define the ini file runId = "unittest" - configfile="wflow_hbv.ini" - wflow_cloneMap = 'wflow_catchment.map' - caseName="wflow_hbv" - starttime = starttime = datetime.datetime(1990,0o1,0o1) + configfile = "wflow_hbv.ini" + wflow_cloneMap = "wflow_catchment.map" + caseName = "wflow_hbv" + starttime = starttime = datetime.datetime(1990, 1, 1) - myModel = wf.WflowModel(wflow_cloneMap, caseName,runId,configfile) - # initialise the framework - dynModelFw = wf.wf_DynamicFramework(myModel, stopTime,firstTimestep=startTime,datetimestart=starttime) + myModel = wf.WflowModel(wflow_cloneMap, caseName, runId, configfile) + # initialise the framework + dynModelFw = wf.wf_DynamicFramework( + myModel, stopTime, firstTimestep=startTime, datetimestart=starttime + ) print(dynModelFw.DT) # Load model config from files and check directory structure @@ -52,22 +54,17 @@ # nore read the csv results acn check of they match the first run # Sum should be approx c 4.569673676 - my_data = wf.genfromtxt(os.path.join(caseName,runId,"watbal.csv"), delimiter=',') + my_data = wf.genfromtxt( + os.path.join(caseName, runId, "watbal.csv"), delimiter="," + ) print("Checking water budget ....") - self.assertAlmostEqual(0.0011471913849163684,my_data[:,2].sum(),places=4) + self.assertAlmostEqual(0.0011471913849163684, my_data[:, 2].sum(), places=4) - my_data = wf.genfromtxt(os.path.join(caseName,runId,"run.csv"), delimiter=',') + my_data = wf.genfromtxt(os.path.join(caseName, runId, "run.csv"), delimiter=",") print("Checking discharge ....") - self.assertAlmostEqual(1092.849374135335,my_data[:,2].mean(),places=4) + self.assertAlmostEqual(1086.9438420613608, my_data[:, 2].mean(), places=4) - print ("Checking water budget ....") - self.assertAlmostEquals(0.0011471913849163684, my_data[:, 2].sum(), places=4) - my_data = wf.genfromtxt(os.path.join(caseName, runId, "run.csv"), delimiter=",") - print ("Checking discharge ....") - self.assertAlmostEquals(1086.9438420613608, my_data[:, 2].mean(), places=4) - - if __name__ == "__main__": unittest.main()