Index: examples/hbvl_global/wflow_hbvl.ini =================================================================== diff -u -rd659dd80702515f254fde0a3baae4600f4faac52 -r8b08f07d1577581c87b804290de74fd24c62340f --- examples/hbvl_global/wflow_hbvl.ini (.../wflow_hbvl.ini) (revision d659dd80702515f254fde0a3baae4600f4faac52) +++ examples/hbvl_global/wflow_hbvl.ini (.../wflow_hbvl.ini) (revision 8b08f07d1577581c87b804290de74fd24c62340f) @@ -65,7 +65,7 @@ #self.QuickFlowCubic=quick #self.BaseFlowCubic=bas #self.WaterLevel=lev -#self.Precipitation=prec +self.InwaterMM=iw #self.ActEvap=act #self.BaseFlow=bas #self.Inwater=inw Index: wflow-py/UnitTests/wflow_sceleton/outstate/TSoil.map =================================================================== diff -u -r8528750f1b6542197b6924ee02c6a50ccb05b7d5 -r8b08f07d1577581c87b804290de74fd24c62340f Binary files differ Index: wflow-py/wflow/wflow_bmi.py =================================================================== diff -u -r45b42e0e083a7b9d44b06c9c2b154cd50df9394a -r8b08f07d1577581c87b804290de74fd24c62340f --- wflow-py/wflow/wflow_bmi.py (.../wflow_bmi.py) (revision 45b42e0e083a7b9d44b06c9c2b154cd50df9394a) +++ wflow-py/wflow/wflow_bmi.py (.../wflow_bmi.py) (revision 8b08f07d1577581c87b804290de74fd24c62340f) @@ -674,9 +674,11 @@ :return: X, Y: ,the lower left corner of the grid. """ + dims = self.dynModel.wf_supplyGridDim() + x = dims[0] + y = dims[7] + return [x, y] - return self.dynModel.wf_supplyGridDim()[0:2] - def get_grid_x(self, long_var_name): """ Give X coordinates of point in the model grid Index: wflow-py/wflow/wflow_lib.py =================================================================== diff -u -r6a7bc8aa1448ca6ea1197143f25524e413ac27b5 -r8b08f07d1577581c87b804290de74fd24c62340f --- wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision 6a7bc8aa1448ca6ea1197143f25524e413ac27b5) +++ wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision 8b08f07d1577581c87b804290de74fd24c62340f) @@ -198,14 +198,18 @@ - ysize - size of a cell in y direction - cols - number of columns - rows - number of rows + - xlr + - ylr """ # x and Y are the same for now xy = pcr2numpy(celllength(),numpy.nan)[0,0] xu = pcr2numpy(xcoordinate(1),numpy.nan)[0,0] yu = pcr2numpy(ycoordinate(1),numpy.nan)[0,0] + ylr = pcr2numpy(ycoordinate(1),numpy.nan)[getrows()-1,getcols()-1] + xlr = pcr2numpy(xcoordinate(1),numpy.nan)[getrows()-1,getcols()-1] - return [xu, yu, xy, xy, getrows(), getcols()] + return [xu, yu, xy, xy, getrows(), getcols(),xlr,ylr] def snaptomap(points,mmap):