Index: wflow-py/Sandbox/wflow_topoflex/wflow_topoflex.py =================================================================== diff -u -r0321a05fc7d7d3e0e956772a340c88bd1c10c5ad -rf3eddaa2fee4b6ecd0fdcb4cbe317b15106273de --- wflow-py/Sandbox/wflow_topoflex/wflow_topoflex.py (.../wflow_topoflex.py) (revision 0321a05fc7d7d3e0e956772a340c88bd1c10c5ad) +++ wflow-py/Sandbox/wflow_topoflex/wflow_topoflex.py (.../wflow_topoflex.py) (revision f3eddaa2fee4b6ecd0fdcb4cbe317b15106273de) @@ -350,9 +350,6 @@ self.sumax = eval(str(configget(self.config, "model", "sumax", "[0]"))) self.sumin = eval(str(configget(self.config, "model", "sumin", "[0]"))) self.samax = eval(str(configget(self.config, "model", "samax", "[0]"))) - self.susmax1 = eval(str(configget(self.config, "model", "susmax1", "[0]"))) - self.susmax2 = eval(str(configget(self.config, "model", "susmax2", "[0]"))) - self.susmax3 = eval(str(configget(self.config, "model", "susmax3", "[0]"))) self.srmax = eval(str(configget(self.config, "model", "sumax", "[0]"))) self.beta = eval(str(configget(self.config, "model", "beta", "[0]"))) self.famax = eval(str(configget(self.config, "model", "famax", "[0]"))) @@ -443,17 +440,15 @@ self.Si = [self.ZeroMap] * len(self.Classes) self.Su = [self.ZeroMap] * len(self.Classes) self.Sa = [self.ZeroMap] * len(self.Classes) - self.Sus = [self.ZeroMap] * len(self.Classes) self.Sf = [self.ZeroMap] * len(self.Classes) self.Sr = [self.ZeroMap] * len(self.Classes) # self.Ss = [self.ZeroMap] * len(self.Classes) # for separate gw reservoir per class self.Ss = self.ZeroMap # for combined gw reservoir self.Qstate = self.ZeroMap # for combined gw reservoir # set initial storage values - self.Sa = [x + y for (x, y) in zip(self.Su, [130 * scalar(self.TopoId)] * len(self.Classes))] - self.Su = [x + y for (x, y) in zip(self.Su, [130 * scalar(self.TopoId)] * len(self.Classes))] - self.Sus = [x + y for (x, y) in zip(self.Sus, [30 * scalar(self.TopoId)] * len(self.Classes))] + self.Sa = [x + y for (x, y) in zip(self.Su, [0.5*self.sumax * scalar(self.TopoId)] * len(self.Classes))] + self.Su = [x + y for (x, y) in zip(self.Su, [0.5*self.sumax * scalar(self.TopoId)] * len(self.Classes))] self.Ss = self.Ss + 30 * scalar(self.TopoId) # for combined gw reservoir else: