Index: wflow-py/_version.py =================================================================== diff -u -r386e1c55976f6f11d6559512bb58f3eba92d09ca -r765337f7713dfd7df1c7de55b8a2c580c898f35b --- wflow-py/_version.py (.../_version.py) (revision 386e1c55976f6f11d6559512bb58f3eba92d09ca) +++ wflow-py/_version.py (.../_version.py) (revision 765337f7713dfd7df1c7de55b8a2c580c898f35b) @@ -1,2 +1,2 @@ -VERSION="119M $Id: mkversion.py 550 2012-11-27 19:17:46Z schelle $" -MVERSION="1.0-RC6-dev-119M" +VERSION="147M $Id: mkversion.py 550 2012-11-27 19:17:46Z schelle $" +MVERSION="1.0-RC6-dev-147M" Index: wflow-py/mkversion.py =================================================================== diff -u -r386e1c55976f6f11d6559512bb58f3eba92d09ca -r765337f7713dfd7df1c7de55b8a2c580c898f35b --- wflow-py/mkversion.py (.../mkversion.py) (revision 386e1c55976f6f11d6559512bb58f3eba92d09ca) +++ wflow-py/mkversion.py (.../mkversion.py) (revision 765337f7713dfd7df1c7de55b8a2c580c898f35b) @@ -19,7 +19,9 @@ a.write("__all__ = [\"wflow_funcs\",\"wflow_adapt\",\"wflow_lib\",\"pcrut\",\"wf_DynamicFramework\",\"stats\"]\n") a.write("__version__=\"" + manualmainversion + "\"\n") a.write("__release__=\"" + manualversion + "\"\n") +a.write("import osgeo.gdal as gdal") + print "=============================================================================" print "Now install wflow using setup.py install and regenerate the documentation...." -print "=============================================================================" +print "=============================================================================" Index: wflow-py/wflow/__init__.py =================================================================== diff -u -r386e1c55976f6f11d6559512bb58f3eba92d09ca -r765337f7713dfd7df1c7de55b8a2c580c898f35b --- wflow-py/wflow/__init__.py (.../__init__.py) (revision 386e1c55976f6f11d6559512bb58f3eba92d09ca) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision 765337f7713dfd7df1c7de55b8a2c580c898f35b) @@ -1,3 +1,4 @@ __all__ = ["wflow_funcs","wflow_adapt","wflow_lib","pcrut","wf_DynamicFramework","stats"] __version__="1.0-dev" -__release__="1.0-RC6-dev-119M" +__release__="1.0-RC6-dev-147M" +import osgeo.gdal as gdal \ No newline at end of file Index: wflow-py/wflow/wflow_lib.py =================================================================== diff -u -r11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3 -r765337f7713dfd7df1c7de55b8a2c580c898f35b --- wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision 11f8d5cb169091c08cc5b7210e35f2ce7aed5fb3) +++ wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision 765337f7713dfd7df1c7de55b8a2c580c898f35b) @@ -35,23 +35,21 @@ -from numpy import * import getopt import os import os.path import sys +import osgeo.gdal as gdal +from osgeo.gdalconst import * from pcraster import * from pcraster.framework import * import scipy import netCDF4 as nc4 import gzip, zipfile -import osgeo.gdal as gdal -from osgeo.gdalconst import * - Verbose=0 def lddcreate_save(lddname,dem,force, corevolume=1E35,catchmentprecipitation=1E35,corearea=1E35,outflowdepth=1E35):