Index: wflow-py/Scripts/bmi2runner.py =================================================================== diff -u -r7e1aec90b4c69d9702fb209c140bad554e1ef94d -r1960c2fe17ff9b9c9133054390876c444f1ebbbd --- wflow-py/Scripts/bmi2runner.py (.../bmi2runner.py) (revision 7e1aec90b4c69d9702fb209c140bad554e1ef94d) +++ wflow-py/Scripts/bmi2runner.py (.../bmi2runner.py) (revision 1960c2fe17ff9b9c9133054390876c444f1ebbbd) @@ -21,12 +21,12 @@ wflow_sbm@InwaterMM=wflow_routing@IW """ - +import wflow import wflow.wflow_bmi_combined as wfbmi import getopt import sys import logging -import wflow + import wflow.wflow_bmi_combined as bmi import wflow.pcrut as pcrut import wflow.wflow_adapt as wfa Index: wflow-py/wflow/__init__.py =================================================================== diff -u -r8157f9bb77914a4808d9bdc52912d628fd764a73 -r1960c2fe17ff9b9c9133054390876c444f1ebbbd --- wflow-py/wflow/__init__.py (.../__init__.py) (revision 8157f9bb77914a4808d9bdc52912d628fd764a73) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision 1960c2fe17ff9b9c9133054390876c444f1ebbbd) @@ -7,10 +7,10 @@ import os, sys if hasattr(sys, "frozen"): - print("Frozen exe, setting GDAl data path:") _ROOT = os.path.abspath(os.path.dirname(__file__)).split("library.zip")[0] os.environ['GDAL_DATA'] = os.path.join(_ROOT,'gdal-data') else: _ROOT = os.path.abspath(os.path.dirname(__file__)) + def get_data(path): return os.path.join(_ROOT, 'data', path) Index: wflow-py/wflow/wflow_sbm.py =================================================================== diff -u -r4aa1cae825097cfeab22ed487e5d5968e4073058 -r1960c2fe17ff9b9c9133054390876c444f1ebbbd --- wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 4aa1cae825097cfeab22ed487e5d5968e4073058) +++ wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 1960c2fe17ff9b9c9133054390876c444f1ebbbd) @@ -96,7 +96,6 @@ import shutil, glob import getopt - from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import *