From 75aadcfa92e69e147c7a6f78b333e649dd85ca0e Mon Sep 17 00:00:00 2001 From: Jaap Schellekens Date: Wed, 16 Nov 2016 14:43:47 +0100 Subject: [PATCH] topoflex update fro freezeing --- wflow-py/_version.py | 2 +- wflow-py/make_wflow_exe_cx.py | 7 +++++-- wflow-py/wflow/__init__.py | 2 +- wflow-py/wflow/wflow_topoflex.py | 14 +++++++------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/wflow-py/_version.py b/wflow-py/_version.py index c80a991a..ff043d6b 100644 --- a/wflow-py/_version.py +++ b/wflow-py/_version.py @@ -1,4 +1,4 @@ VERSION="1.0.master.1" MVERSION="1.0.master" NVERSION="1.0.1" -BUILD="2016-11-15 19:46:57.535519" +BUILD="2016-11-16 14:37:38.404000" diff --git a/wflow-py/make_wflow_exe_cx.py b/wflow-py/make_wflow_exe_cx.py index 3a3506b3..b95497fd 100644 --- a/wflow-py/make_wflow_exe_cx.py +++ b/wflow-py/make_wflow_exe_cx.py @@ -10,6 +10,10 @@ - deltashell - includes bmi/mmi link top deltashell. Windows only. Make sure you have zmq, bmi and mmi installed. bmi and mmi can be downloaded from the openearth github repository """ + +target = 'deltashell' +#target ='normal' + from cx_Freeze import setup, Executable, hooks @@ -66,8 +70,7 @@ os.system("python mkversion.py") -target = 'deltashell' -target ='normal' + data_files=[] scipy_path = os.path.dirname(scipy.__file__) diff --git a/wflow-py/wflow/__init__.py b/wflow-py/wflow/__init__.py index 1a5bb379..c284d3f3 100644 --- a/wflow-py/wflow/__init__.py +++ b/wflow-py/wflow/__init__.py @@ -2,5 +2,5 @@ __version__="1.0.master" __release__="1.0.master.1" __versionnr__="1.0.1" -__build__="2016-11-15 19:46:57.535519" +__build__="2016-11-16 14:37:38.404000" import osgeo.gdal as gdal \ No newline at end of file diff --git a/wflow-py/wflow/wflow_topoflex.py b/wflow-py/wflow/wflow_topoflex.py index d6c13975..c0dab7ab 100644 --- a/wflow-py/wflow/wflow_topoflex.py +++ b/wflow-py/wflow/wflow_topoflex.py @@ -21,13 +21,13 @@ $Rev: 898 $ """ -import reservoir_Si -import reservoir_Sa -import reservoir_Sw -import reservoir_Su -import reservoir_Sf -import reservoir_Ss -import JarvisCoefficients +import wflow.reservoir_Si as reservoir_Si +import wflow.reservoir_Sa as reservoir_Sa +import wflow.reservoir_Sw as reservoir_Sw +import wflow.reservoir_Su as reservoir_Su +import wflow.reservoir_Sf as reservoir_Sf +import wflow.reservoir_Ss as reservoir_Ss +import wflow.JarvisCoefficients as JarvisCoefficients import numpy import os