Index: wflow-py/UnitTests/Testwflow_hbv2.py =================================================================== diff -u -re774b8e055165f099bb07691cee2caf32a2277ed -r1738c121cfc83b76d915b8ed55747cb1bb9a2f64 --- wflow-py/UnitTests/Testwflow_hbv2.py (.../Testwflow_hbv2.py) (revision e774b8e055165f099bb07691cee2caf32a2277ed) +++ wflow-py/UnitTests/Testwflow_hbv2.py (.../Testwflow_hbv2.py) (revision 1738c121cfc83b76d915b8ed55747cb1bb9a2f64) @@ -23,12 +23,12 @@ configfile="wflow_hbv_hr.ini" wflow_cloneMap = 'wflow_catchment.map' caseName="wflow_hbv" - starttime = starttime = datetime.datetime(1990,01,01) + starttime = starttime = datetime.datetime(1990,0o1,0o1) myModel = wf.WflowModel(wflow_cloneMap, caseName,runId,configfile) # initialise the framework dynModelFw = wf.wf_DynamicFramework(myModel, stopTime,firstTimestep=startTime,datetimestart=starttime) - print dynModelFw.DT + print(dynModelFw.DT) # Load model config from files and check directory structure dynModelFw.createRunId(NoOverWrite=False,level=wf.logging.DEBUG) @@ -58,11 +58,11 @@ my_data = wf.genfromtxt(os.path.join(caseName,runId,"watbal.csv"), delimiter=',') print("Checking water budget ....") - self.assertAlmostEquals( 0.0013141632080078125,my_data[:,2].sum(),places=4) + 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.assertAlmostEquals(1837.7918265024821 ,my_data[:,2].mean(),places=4) + self.assertAlmostEqual(1837.7918265024821 ,my_data[:,2].mean(),places=4)