Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -rb88b7803bd17fd8098744779a5e6ed7188a42af6 -r74a26d4abc5ad299215677362810eeebc9e2458b --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision b88b7803bd17fd8098744779a5e6ed7188a42af6) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 74a26d4abc5ad299215677362810eeebc9e2458b) @@ -425,7 +425,7 @@ """ # Set logging - logfile = caseName + "/" + runId + "/" + logfname + logfile = os.path.join(caseName,runId,logfname) logger = pcrut.setlogger(logfile, model, thelevel=level) logger.info(model + " " + modelversion + " Case: " + caseName + " Runid: " + runId) @@ -816,7 +816,7 @@ thissection = "output" + tsformat + "_" + str(secnr) toprint = configsection(self._userModel().config, thissection) secnr = secnr + 1 - samplemapname = caseName + "/" + configget(self._userModel().config, thissection, "samplemap", "None") + samplemapname = os.path.join(caseName,configget(self._userModel().config, thissection, "samplemap", "None")) if "None" not in samplemapname: try: self.samplemap = readmap(samplemapname) @@ -945,8 +945,8 @@ if hasattr(self._userModel(), a.replace('self.', '')): thevar = getattr(self._userModel(), a.replace('self.', '')) self._reportNew(thevar, - self._userModel().Dir + "/" + self._userModel().runId + "/outmaps/" + self._userModel().config.get( - "outputmaps", a), longname=a) + os.path.join(self._userModel().Dir, self._userModel().runId,"outmaps", self._userModel().config.get( + "outputmaps", a)), longname=a) else: self.logger.warn("outputmap " + a + " not found in usermodel") @@ -1036,10 +1036,10 @@ config = ConfigParser.SafeConfigParser() config.optionxform = str - if os.path.exists(caseName + "/" + configfile): - config.read(caseName + "/" + configfile) + if os.path.exists(os.path.join(caseName,configfile)): + config.read(os.path.join(caseName,configfile)) else: - self.logger.error("Cannot open ini file: " + caseName + "/" + configfile) + self.logger.error("Cannot open ini file: " + os.path.join(caseName,configfile)) exit(1) return config