Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r56eaa92ab85d71e87bc31ff0f3015dc890deb253 -r9e189ac4f4cf4cc959992318e9121098809a3573 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 56eaa92ab85d71e87bc31ff0f3015dc890deb253) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 9e189ac4f4cf4cc959992318e9121098809a3573) @@ -1110,9 +1110,27 @@ self.logger.debug("Found following input variables to get from netcdf file: " + str(varlst)) self.NcInput = netcdfinput(os.path.join(caseName, self.ncfile), self.logger, varlst) + # Meta info for netcdf files + meta = {} + meta['caseName'] = caseName + meta['runId'] = runId + meta['wflow_version'] = __version__ + meta['wflow_release'] = __release__ + meta['wflow_build'] = __build__ + meta['wflow_ini'] = self._userModel().configfile + if hasattr(sys, "frozen"): + meta['wflow_exe'] = "True" + else: + meta['wflow_exe'] = "False" + try: + metafrom_config = dict(self._userModel().config.items('netcdfmetadata')) + except: + metafrom_config = {} + meta.update(metafrom_config) + if self.ncfilestates != "None": smaps = self._userModel().stateVariables() maps = [s + ".map" for s in smaps] @@ -1125,17 +1143,7 @@ if self.ncoutfile != 'None': # Ncoutput buffer = int(configget(self._userModel().config, 'framework', 'netcdfwritebuffer', "50")) - meta = {} - meta['caseName'] = caseName - meta['runId'] = runId - meta['wflow_version'] =__version__ - meta['wflow_release'] =__release__ - try: - metafrom_config = dict(self._userModel().config.items('netcdfmetadata')) - except: - metafrom_config = {} - meta.update(metafrom_config) self.NcOutput = netcdfoutput(os.path.join(caseName, runId, self.ncoutfile), self.logger, self.DT.outPutStartTime, self.DT.runTimeSteps, @@ -1144,22 +1152,12 @@ zlib=self.ncfilecompression,least_significant_digit=self.ncfiledigits) if self.ncoutfilestatic != 'None': # Ncoutput - meta = {} - meta['caseName'] = caseName - meta['runId'] = runId - meta['wflow_version'] =__version__ - meta['wflow_release'] =__release__ self.NcOutputStatic = netcdfoutputstatic(os.path.join(caseName, runId, self.ncoutfilestatic), self.logger, self.DT.runEndTime,1,timestepsecs=self.DT.timeStepSecs, maxbuf=1, metadata=meta, EPSG=self.EPSG,Format=self.ncfileformat, zlib=self.ncfilecompression,least_significant_digit=self.ncfiledigits) if self.ncoutfilestate != 'None': # Ncoutput - meta = {} - meta['caseName'] = caseName - meta['runId'] = runId - meta['wflow_version'] =__version__ - meta['wflow_release'] =__release__ self.NcOutputState = netcdfoutputstatic(os.path.join(caseName, runId, self.ncoutfilestate), self.logger, self.DT.runEndTime,1,timestepsecs=self.DT.timeStepSecs, maxbuf=1, metadata=meta, EPSG=self.EPSG,Format=self.ncfileformat, Index: wflow-py/wflow/wflow_adapt.py =================================================================== diff -u -r56eaa92ab85d71e87bc31ff0f3015dc890deb253 -r9e189ac4f4cf4cc959992318e9121098809a3573 --- wflow-py/wflow/wflow_adapt.py (.../wflow_adapt.py) (revision 56eaa92ab85d71e87bc31ff0f3015dc890deb253) +++ wflow-py/wflow/wflow_adapt.py (.../wflow_adapt.py) (revision 9e189ac4f4cf4cc959992318e9121098809a3573) @@ -183,7 +183,6 @@ else: ofile.write(aline) - ofile.close() else: print inxml + " does not exists."