Index: wflow-py/Scripts/mapstack.py =================================================================== diff -u -r2aef8b1c3a3d5c674d3112cc60a67f20594c2cb8 -r7fbd3c0ac574e2dda5b272e842c33bd4f89ec57e --- wflow-py/Scripts/mapstack.py (.../mapstack.py) (revision 2aef8b1c3a3d5c674d3112cc60a67f20594c2cb8) +++ wflow-py/Scripts/mapstack.py (.../mapstack.py) (revision 7fbd3c0ac574e2dda5b272e842c33bd4f89ec57e) @@ -74,6 +74,8 @@ """ modelparameters = [] + modelparameters.append(self.ParamType(name="locMap",stack='inLoc.map',type="staticmap",default=0.0,verbose=True,lookupmaps=[])) + return modelparameters def stateVariables(self): @@ -133,6 +135,8 @@ self.timestepsecs = int(configget(self.config,'model','timestepsecs','86400')) self.basetimestep=86400 + self.inTSS = configget(self.config,'model','intss','intss.tss') + self.interpolmethod = configget(self.config,'model','interpolmethod','pol') # Reads all parameter from disk self.wf_updateparameters() @@ -172,7 +176,11 @@ self.logger.debug("Processing step: " + str(self.currentTimeStep())) self.wf_updateparameters() # read the temperature map for each step (see parameters()) + self.MapStack = timeinputscalar(os.path.join(self.caseName, self.inTSS),self.locMap) + self.MapStack = pcrut.interpolategauges(self.MapStack,self.interpolmethod) + + # The main function is used to run the program from the command line def main(argv=None): @@ -191,7 +199,7 @@ _lastTimeStep = 10 _firstTimeStep = 1 timestepsecs=86400 - wflow_cloneMap = 'wflow_subcatch.map' + wflow_cloneMap = 'clone.map' # This allows us to use the model both on the command line and to call # the model usinge main function from another python script.