Index: examples/wflow_rhine_sbm/wflow_sbm.ini =================================================================== diff -u -r3bb53de3e1d138e181dfdf0fcee09a5926fb5e20 -r0c107ad8319af1405fc28d9a192a0d6aced12bdb --- examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision 3bb53de3e1d138e181dfdf0fcee09a5926fb5e20) +++ examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision 0c107ad8319af1405fc28d9a192a0d6aced12bdb) @@ -67,7 +67,7 @@ # netcdfoutput requires also outputformat = 1 (default) and additionally the name of the file #netcdfoutput = outmaps.nc -#netcdfstaticoutput = outsum.nc +netcdfstaticoutput = outsum.nc netcdfwritebuffer=100 [layout] Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r950bf9d5ed116fcdf860b2ead9550d54523fb1f2 -r0c107ad8319af1405fc28d9a192a0d6aced12bdb --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 950bf9d5ed116fcdf860b2ead9550d54523fb1f2) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 0c107ad8319af1405fc28d9a192a0d6aced12bdb) @@ -269,6 +269,9 @@ self._addMethodToClass(self.wf_updateparameters) self._addAttributeToClass("ParamType",self.ParamType) + if firstTimestep == 0: + firstTimestep = 1 + #self._userModel()._setNrTimeSteps(lastTimeStep - firstTimestep + 1) self._userModel()._setNrTimeSteps(lastTimeStep + 1) self._d_firstTimestep = 1 @@ -655,15 +658,27 @@ self._d_lastTimestep - self._d_firstTimestep + 1, maxbuf=buffer,metadata=meta) - if self.ncoutfilestatic != 'None': # Ncoutput buffer = int(configget(self._userModel().config,'framework','netcdfwritebuffer',"2")) meta ={} meta['caseName'] = caseName meta['runId'] = runId - self.NcOutputStatic = netcdfoutput(os.path.join(caseName,runId,self.ncoutfilestatic),self.logger,self.datetime_laststep,1,maxbuf=buffer,metadata=meta) + self.NcOutputStatic = netcdfoutput(os.path.join(caseName,runId,self.ncoutfilestatic), + self.logger,self.datetime_laststep, + self._d_lastTimestep - self._d_firstTimestep + 1, + maxbuf=buffer,metadata=meta) + # if self.ncoutfilestate != 'None': # Ncoutput + # buffer = int(configget(self._userModel().config,'framework','netcdfwritebuffer',"2")) + # meta ={} + # meta['caseName'] = caseName + # meta['runId'] = runId + # self.NcOutputState = netcdfoutput(os.path.join(caseName,runId,self.ncoutfilestate), + # self.logger,self.datetime_laststep, + # self._d_lastTimestep - self._d_firstTimestep + 1, + # maxbuf=buffer,metadata=meta) + if self.ncinfilestatic != 'None': # Ncoutput buffer = int(configget(self._userModel().config,'framework','netcdfwritebuffer',"2")) meta ={} @@ -771,11 +786,14 @@ a = 0 for z in savevar: fname = os.path.join(directory,var + "_" + str(a)).replace("\\","/") + ".map" - report(z,fname) + #report(z,fname) + self.reportStatic(z,fname,style=1,gzipit=False,longname=fname) a = a + 1 except: - execstr = "report(self._userModel()." + var +",\"" + fname + "\")" - exec execstr + #execstr = "report(self._userModel()." + var +",\"" + fname + "\")" + #exec execstr + thevar = eval("self._userModel()." + var) + self.reportStatic(thevar,fname,style=1,gzipit=False,longname=fname) except: self.logger.warn("Problem saving state variable: " + var) self.logger.warn(execstr) Index: wflow-py/wflow/wf_netcdfio.py =================================================================== diff -u -r3bb53de3e1d138e181dfdf0fcee09a5926fb5e20 -r0c107ad8319af1405fc28d9a192a0d6aced12bdb --- wflow-py/wflow/wf_netcdfio.py (.../wf_netcdfio.py) (revision 3bb53de3e1d138e181dfdf0fcee09a5926fb5e20) +++ wflow-py/wflow/wf_netcdfio.py (.../wf_netcdfio.py) (revision 0c107ad8319af1405fc28d9a192a0d6aced12bdb) @@ -98,7 +98,6 @@ """ Under construction """ - def date_range(start, end, tdelta="days"): if tdelta == "days": r = (end+dt.timedelta(days=1)-start).days @@ -132,10 +131,8 @@ globmetadata.update(metadata) - prepare_nc(self.ncfile,timeList,x,y,globmetadata,logger,Format=netcdfformat) - def savetimestep(self,timestep,pcrdata,unit="mm",var='P',name="Precipitation"): """ save a single timestep for a variable @@ -233,7 +230,6 @@ self.alldat.pop(var, None) logging.warn("Variable " + var + " not found in netcdf file: " + netcdffile) - def gettimestep(self,timestep,logging,var='P'): """ Gets a map for a single timestep. reads data in blocks assuming sequential access Index: wflow-py/wflow/wflow_routing.py =================================================================== diff -u -r950bf9d5ed116fcdf860b2ead9550d54523fb1f2 -r0c107ad8319af1405fc28d9a192a0d6aced12bdb --- wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 950bf9d5ed116fcdf860b2ead9550d54523fb1f2) +++ wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 0c107ad8319af1405fc28d9a192a0d6aced12bdb) @@ -434,7 +434,7 @@ else: self.Inflow = cover(self.wf_readmap(self.Inflow_mapstack, 0.0,verbose=False),0) - # The MAx here may lead to watbal error. Howvere, if inwaterMMM becomes < 0, the kinematic wave becomes very slow...... + # The MAx here may lead to watbal error. Howevere, if inwaterMMM becomes < 0, the kinematic wave becomes very slow...... self.InwaterMM = max(0.0,self.InwaterForcing) self.Inwater = self.InwaterMM * self.ToCubic # m3/s