Index: examples/wflow_rhine_sbm/wflow_sbm.ini =================================================================== diff -u -rd163cf5626448210556af243ff77b357bc1898e1 -r3bb53de3e1d138e181dfdf0fcee09a5926fb5e20 --- examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision d163cf5626448210556af243ff77b357bc1898e1) +++ examples/wflow_rhine_sbm/wflow_sbm.ini (.../wflow_sbm.ini) (revision 3bb53de3e1d138e181dfdf0fcee09a5926fb5e20) @@ -29,8 +29,8 @@ [run] # either a runinfo file or a start and end-time are required #runinfo=runinfo.xml -starttime= 1995-01-31 00:00:00 GMT -endtime= 1995-02-28 00:00:00 GMT +#starttime= 1995-01-31 00:00:00 GMT +#endtime= 1995-02-28 00:00:00 GMT # required, base timestep of the model timestepsecs = 86400 #start model with cold state @@ -66,7 +66,7 @@ # 3: matlab # netcdfoutput requires also outputformat = 1 (default) and additionally the name of the file -netcdfoutput = outmaps.nc +#netcdfoutput = outmaps.nc #netcdfstaticoutput = outsum.nc netcdfwritebuffer=100 Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -red16c201180e894dfc6a55b953d2a14870f2d847 -r3bb53de3e1d138e181dfdf0fcee09a5926fb5e20 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision ed16c201180e894dfc6a55b953d2a14870f2d847) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 3bb53de3e1d138e181dfdf0fcee09a5926fb5e20) @@ -618,7 +618,7 @@ self._userModel()._setFirstTimeStep(self._d_firstTimestep) self._d_lastTimestep = int(nrseconds/self.timestepsecs) + 1 else: - self.logger.warn("Not enough information in the [run] section. Need start and end time or a runinfo.xml file.... Reverting to default date/time") + self.logger.info("Not enough information in the [run] section. Need start and end time or a runinfo.xml file.... Reverting to default date/time") else: from dateutil import parser #self.datetime_firststep=datetime.datetime.strptime(st, "%Y-%m-%d %H:%M:%S") @@ -637,8 +637,6 @@ self._userModel()._setFirstTimeStep(self._d_firstTimestep) self._d_lastTimestep = int(nrseconds/self.timestepsecs) + 1 - - if self.ncfile != "None": mstacks = configsection(self._userModel().config,"inputmapstacks") varlst = [] @@ -652,7 +650,10 @@ meta ={} meta['caseName'] = caseName meta['runId'] = runId - self.NcOutput = netcdfoutput(caseName + "/" + runId + "/" + self.ncoutfile,self.logger,self.datetime_firststep,self._d_lastTimestep - self._d_firstTimestep + 1,maxbuf=buffer,metadata=meta) + self.NcOutput = netcdfoutput(caseName + "/" + runId + "/" + self.ncoutfile, + self.logger,self.datetime_firststep, + self._d_lastTimestep - self._d_firstTimestep + 1, + maxbuf=buffer,metadata=meta) if self.ncoutfilestatic != 'None': # Ncoutput Index: wflow-py/wflow/wf_netcdfio.py =================================================================== diff -u -r2af8b7ddca1739f47a999848e3c031285d1a664d -r3bb53de3e1d138e181dfdf0fcee09a5926fb5e20 --- wflow-py/wflow/wf_netcdfio.py (.../wf_netcdfio.py) (revision 2af8b7ddca1739f47a999848e3c031285d1a664d) +++ wflow-py/wflow/wf_netcdfio.py (.../wf_netcdfio.py) (revision 3bb53de3e1d138e181dfdf0fcee09a5926fb5e20) @@ -39,7 +39,7 @@ globmetadata['Conventions'] = 'CF-1.4' netcdfformat = "NETCDF4" -def prepare_nc(trgFile, timeList, x, y, metadata, logger, units='Days since 1900-01-01 00:00:00', calendar='gregorian',Format="NETCDF4",complevel=9,zlib=True): +def prepare_nc(trgFile, timeList, x, y, metadata, logger, units='Days since 1900-01-01 00:00:00', calendar='gregorian',Format="NETCDF4",complevel=9,zlib=True,least_significant_digit=None): """ This function prepares a NetCDF file with given metadata, for a certain year, daily basis data The function assumes a gregorian calendar and a time unit 'Days since 1900-01-01 00:00:00' @@ -59,19 +59,19 @@ nc_trg.createDimension('time', 0) #NrOfDays*8 nc_trg.createDimension('lat', len(y)) nc_trg.createDimension('lon', len(x)) - DateHour = nc_trg.createVariable('time','f8',('time',)) + DateHour = nc_trg.createVariable('time','f8',('time',),fill_value=-9999., zlib=zlib,complevel=complevel) DateHour.units = units DateHour.calendar = calendar DateHour.standard_name = 'time' DateHour.long_name = 'time' DateHour.axis = 'T' DateHour[:] = time - y_var = nc_trg.createVariable('lat','f4',('lat',)) + y_var = nc_trg.createVariable('lat','f4',('lat',),fill_value=-9999., zlib=zlib,complevel=complevel) y_var.standard_name = 'latitude' y_var.long_name = 'latitude' y_var.units = 'degrees_north' y_var.axis = 'Y' - x_var = nc_trg.createVariable('lon','f4',('lon',)) + x_var = nc_trg.createVariable('lon','f4',('lon',),fill_value=-9999., zlib=zlib,complevel=complevel) x_var.standard_name = 'longitude' x_var.long_name = 'longitude' x_var.units = 'degrees_east' @@ -149,7 +149,7 @@ """ # Open target netCDF file var = os.path.basename(var) - self.nc_trg = netCDF4.Dataset(self.ncfile, 'a',format=netcdfformat,zlib=True,complevel=1) + self.nc_trg = netCDF4.Dataset(self.ncfile, 'a',format=netcdfformat,zlib=True,complevel=9) self.nc_trg.set_fill_off() # read time axis and convert to time objects #TODO: use this to append time