Index: wflow-py/wflow/pcrglobwb/virtualOS.py =================================================================== diff -u -rd6ff5f0cdbb84e579b51b352ba41ed7097c0f2f4 -r03fe40c20653bdeb9c03b87b5bced114a1593926 --- wflow-py/wflow/pcrglobwb/virtualOS.py (.../virtualOS.py) (revision d6ff5f0cdbb84e579b51b352ba41ed7097c0f2f4) +++ wflow-py/wflow/pcrglobwb/virtualOS.py (.../virtualOS.py) (revision 03fe40c20653bdeb9c03b87b5bced114a1593926) @@ -1731,22 +1731,22 @@ if abs(a) > threshold or abs(b) > threshold: if PrintOnlyErrors: - msg = "\n" - msg += "\n" - msg = "\n" - msg += "\n" - msg += "##############################################################################################################################################\n" - msg += "WARNING !!!!!!!! Water Balance Error %s Min %f Max %f Mean %f" % ( + #msg = "\n" + #msg += "\n" + #msg = "\n" + #msg += "\n" + #msg += "##############################################################################################################################################\n" + msg = "WARNING !!!!!!!! Water Balance Error %s Min %f Max %f Mean %f" % ( processName, a, b, c, ) - msg += "\n" - msg += "##############################################################################################################################################\n" - msg += "\n" - msg += "\n" - msg += "\n" + #msg += "\n" + #msg += "##############################################################################################################################################\n" + #msg += "\n" + #msg += "\n" + #msg += "\n" logger.error(msg) Index: wflow-py/wflow/wf_DynamicFramework.py =================================================================== diff -u -r0bde90d2807da3f2c32db63b38dd14a6873b05ed -r03fe40c20653bdeb9c03b87b5bced114a1593926 --- wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 0bde90d2807da3f2c32db63b38dd14a6873b05ed) +++ wflow-py/wflow/wf_DynamicFramework.py (.../wf_DynamicFramework.py) (revision 03fe40c20653bdeb9c03b87b5bced114a1593926) @@ -1729,7 +1729,8 @@ for var in allvars: try: fname = os.path.join(directory, var).replace("\\", "/") + ".map" - savevar = getattr(self._userModel(), var) + #savevar = getattr(self._userModel(), var) + savevar = reduce(getattr, var.split('.'), self._userModel()) try: # Check if we have a list of maps b = len(savevar) @@ -1747,7 +1748,8 @@ ) a = a + 1 except: - thevar = getattr(self._userModel(), var) + #thevar = getattr(self._userModel(), var) + thevar = reduce(getattr, var.split('.'), self._userModel()) self.reportState( thevar, fname, style=1, gzipit=False, longname=fname ) @@ -2024,7 +2026,7 @@ for var in allvars: try: - setattr(self._userModel(), var + "_laststep", getattr(self._userModel(), var)) + setattr(self._userModel(), var + "_laststep", reduce(getattr, var.split('.'), self._userModel())) except: self.logger.warning("Problem saving state variable: " + var)