Index: wflow-py/UnitTests/Testwflow_hbv2.py =================================================================== diff -u -r58f139b2afc2424fc9f8796934878bd6e49c31de -r5bc2c6406fea89698faa5d0ca1488dc25760b5e3 --- wflow-py/UnitTests/Testwflow_hbv2.py (.../Testwflow_hbv2.py) (revision 58f139b2afc2424fc9f8796934878bd6e49c31de) +++ wflow-py/UnitTests/Testwflow_hbv2.py (.../Testwflow_hbv2.py) (revision 5bc2c6406fea89698faa5d0ca1488dc25760b5e3) @@ -19,15 +19,17 @@ # set runid, clonemap and casename. Also define the ini file runId = "unittest" - configfile="wflow_hbv_hr.ini" - wflow_cloneMap = 'wflow_catchment.map' - caseName="wflow_hbv" - starttime = starttime = datetime.datetime(1990,0o1,0o1) + configfile = "wflow_hbv_hr.ini" + wflow_cloneMap = "wflow_catchment.map" + caseName = "wflow_hbv" + starttime = starttime = datetime.datetime(1990, 01, 01) - myModel = wf.WflowModel(wflow_cloneMap, caseName,runId,configfile) - # initialise the framework - dynModelFw = wf.wf_DynamicFramework(myModel, stopTime,firstTimestep=startTime,datetimestart=starttime) - print(dynModelFw.DT) + 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 dynModelFw.createRunId(NoOverWrite=False, level=wf.logging.DEBUG) @@ -54,15 +56,10 @@ # 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.0013141632080078125,my_data[:,2].sum(),places=4) - - my_data = wf.genfromtxt(os.path.join(caseName,runId,"run.csv"), delimiter=',') - print("Checking discharge ....") - self.assertAlmostEqual(1837.7918265024821 ,my_data[:,2].mean(),places=4) - print ("Checking water budget ....") self.assertAlmostEquals(0.0013141632080078125, my_data[:, 2].sum(), places=4)