Index: wflow-py/wflow/wflow_w3ra.py =================================================================== diff -u -r0271bdb8a467261f4ea7a7314190fc59a011225c -r1b94591824be39aa254dfefe6ddddbc01ed5e98b --- wflow-py/wflow/wflow_w3ra.py (.../wflow_w3ra.py) (revision 0271bdb8a467261f4ea7a7314190fc59a011225c) +++ wflow-py/wflow/wflow_w3ra.py (.../wflow_w3ra.py) (revision 1b94591824be39aa254dfefe6ddddbc01ed5e98b) @@ -169,72 +169,72 @@ # Add reading of parameters here - self.K_gw = self.wf_readmap(os.path.join(self.Dir, "staticmaps/K_gw.map"),0.0,fail=True) - self.K_rout = self.wf_readmap(os.path.join(self.Dir, "staticmaps/K_rout.map"),0.0,fail=True) - self.Sgref = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Sgref.map"),0.0,fail=True) + self.K_gw = self.wf_readmap(os.path.join(self.Dir, "staticmaps/k_gw.map"),0.0,fail=True) + self.K_rout = self.wf_readmap(os.path.join(self.Dir, "staticmaps/k_rout.map"),0.0,fail=True) + self.Sgref = self.wf_readmap(os.path.join(self.Dir, "staticmaps/sgref.map"),0.0,fail=True) self.alb_dry1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/alb_dry.map"),0.0,fail=True) self.alb_wet1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/alb_wet.map"),0.0,fail=True) self.beta1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/beta.map"),0.0,fail=True) - self.cGsmax1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/cGsmax.map"),0.0,fail=True) - self.ER_frac_ref1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/ER_frac_ref.map"),0.0,fail=True) - self.FdrainFC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/FdrainFC.map"),0.0,fail=True) - self.Fgw_conn1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Fgw_conn.map"),0.0,fail=True) - self.Fhru1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Fhru.map"),0.0,fail=True) - self.SLA1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/SLA.map"),0.0,fail=True) - self.LAIref1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/LAIref.map"),0.0,fail=True) - self.FsoilEmax1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/FsoilEmax.map"),0.0,fail=True) - self.fvegref_G1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fvegref_G.map"),0.0,fail=True) - self.FwaterE1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/FwaterE.map"),0.0,fail=True) - self.Gfrac_max1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Gfrac_max.map"),0.0,fail=True) + self.cGsmax1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/cgsmax.map"),0.0,fail=True) + self.ER_frac_ref1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/er_frac_ref.map"),0.0,fail=True) + self.FdrainFC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fdrainfc.map"),0.0,fail=True) + self.Fgw_conn1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fgw_conn.map"),0.0,fail=True) + self.Fhru1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fhru.map"),0.0,fail=True) + self.SLA1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/sla.map"),0.0,fail=True) + self.LAIref1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/lairef.map"),0.0,fail=True) + self.FsoilEmax1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fsoilemax.map"),0.0,fail=True) + self.fvegref_G1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fvegref_g.map"),0.0,fail=True) + self.FwaterE1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fwatere.map"),0.0,fail=True) + self.Gfrac_max1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/gfrac_max.map"),0.0,fail=True) self.hveg1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/hveg.map"),0.0,fail=True) - self.InitLoss1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/InitLoss.map"),0.0,fail=True) - self.LAImax1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/LAImax.map"),0.0,fail=True) - self.PrefR1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/PrefR.map"),0.0,fail=True) - self.S_sls1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/S_sls.map"),0.0,fail=True) - self.S0FC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/S0FC.map"),0.0,fail=True) - self.SsFC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/SsFC.map"),0.0,fail=True) - self.SdFC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/SdFC.map"),0.0,fail=True) - self.Vc1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Vc.map"),0.0,fail=True) + self.InitLoss1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/initloss.map"),0.0,fail=True) + self.LAImax1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/laimax.map"),0.0,fail=True) + self.PrefR1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/prefr.map"),0.0,fail=True) + self.S_sls1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/s_sls.map"),0.0,fail=True) + self.S0FC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/s0fc.map"),0.0,fail=True) + self.SsFC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/ssfc.map"),0.0,fail=True) + self.SdFC1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/sdfc.map"),0.0,fail=True) + self.Vc1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/vc.map"),0.0,fail=True) self.w0ref_alb1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/w0ref_alb.map"),0.0,fail=True) - self.Us01 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Us0.map"),0.0,fail=True) - self.Ud01 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Ud0.map"),0.0,fail=True) - self.wslimU1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wslimU.map"),0.0,fail=True) - self.wdlimU1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wdlimU.map"),0.0,fail=True) - self.w0limE1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/w0limE.map"),0.0,fail=True) - self.Tgrow1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Tgrow.map"),0.0,fail=True) - self.Tsenc1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Tsenc.map"),0.0,fail=True) + self.Us01 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/us0.map"),0.0,fail=True) + self.Ud01 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/ud0.map"),0.0,fail=True) + self.wslimU1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wslimu.map"),0.0,fail=True) + self.wdlimU1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wdlimu.map"),0.0,fail=True) + self.w0limE1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/w0lime.map"),0.0,fail=True) + self.Tgrow1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/tgrow.map"),0.0,fail=True) + self.Tsenc1 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/tsenc.map"),0.0,fail=True) self.alb_dry2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/alb_dry2.map"),0.0,fail=True) self.alb_wet2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/alb_wet2.map"),0.0,fail=True) self.beta2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/beta2.map"),0.0,fail=True) - self.cGsmax2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/cGsmax2.map"),0.0,fail=True) - self.ER_frac_ref2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/ER_frac_ref2.map"),0.0,fail=True) - self.FdrainFC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/FdrainFC2.map"),0.0,fail=True) - self.Fgw_conn2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Fgw_conn2.map"),0.0,fail=True) - self.Fhru2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Fhru2.map"),0.0,fail=True) - self.SLA2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/SLA2.map"),0.0,fail=True) - self.LAIref2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/LAIref2.map"),0.0,fail=True) - self.FsoilEmax2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/FsoilEmax2.map"),0.0,fail=True) - self.fvegref_G2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fvegref_G2.map"),0.0,fail=True) - self.FwaterE2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/FwaterE2.map"),0.0,fail=True) - self.Gfrac_max2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Gfrac_max2.map"),0.0,fail=True) + self.cGsmax2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/cgsmax2.map"),0.0,fail=True) + self.ER_frac_ref2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/er_frac_ref2.map"),0.0,fail=True) + self.FdrainFC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fdrainfc2.map"),0.0,fail=True) + self.Fgw_conn2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fgw_conn2.map"),0.0,fail=True) + self.Fhru2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fhru2.map"),0.0,fail=True) + self.SLA2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/sla2.map"),0.0,fail=True) + self.LAIref2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/lairef2.map"),0.0,fail=True) + self.FsoilEmax2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fsoilemax2.map"),0.0,fail=True) + self.fvegref_G2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fvegref_g2.map"),0.0,fail=True) + self.FwaterE2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/fwatere2.map"),0.0,fail=True) + self.Gfrac_max2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/gfrac_max2.map"),0.0,fail=True) self.hveg2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/hveg2.map"),0.0,fail=True) - self.InitLoss2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/InitLoss2.map"),0.0,fail=True) - self.LAImax2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/LAImax2.map"),0.0,fail=True) - self.PrefR2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/PrefR2.map"),0.0,fail=True) - self.S_sls2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/S_sls2.map"),0.0,fail=True) - self.S0FC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/S0FC2.map"),0.0,fail=True) - self.SsFC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/SsFC2.map"),0.0,fail=True) - self.SdFC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/SdFC2.map"),0.0,fail=True) - self.Vc2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Vc2.map"),0.0,fail=True) + self.InitLoss2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/initloss2.map"),0.0,fail=True) + self.LAImax2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/laimax2.map"),0.0,fail=True) + self.PrefR2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/prefr2.map"),0.0,fail=True) + self.S_sls2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/s_sls2.map"),0.0,fail=True) + self.S0FC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/s0fc2.map"),0.0,fail=True) + self.SsFC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/ssfc2.map"),0.0,fail=True) + self.SdFC2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/sdfc2.map"),0.0,fail=True) + self.Vc2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/vc2.map"),0.0,fail=True) self.w0ref_alb2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/w0ref_alb2.map"),0.0,fail=True) - self.Us02 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Us02.map"),0.0,fail=True) - self.Ud02 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Ud02.map"),0.0,fail=True) - self.wslimU2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wslimU2.map"),0.0,fail=True) - self.wdlimU2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wdlimU2.map"),0.0,fail=True) - self.w0limE2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/w0limE2.map"),0.0,fail=True) - self.Tgrow2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Tgrow2.map"),0.0,fail=True) - self.Tsenc2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/Tsenc2.map"),0.0,fail=True) + self.Us02 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/us02.map"),0.0,fail=True) + self.Ud02 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/ud02.map"),0.0,fail=True) + self.wslimU2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wslimu2.map"),0.0,fail=True) + self.wdlimU2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/wdlimu2.map"),0.0,fail=True) + self.w0limE2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/w0lime2.map"),0.0,fail=True) + self.Tgrow2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/tgrow2.map"),0.0,fail=True) + self.Tsenc2 = self.wf_readmap(os.path.join(self.Dir, "staticmaps/tsenc2.map"),0.0,fail=True) self.wf_multparameters()