Index: wflow-py/Sandbox/wflow_HRU_test.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_HRU_test.py (.../wflow_HRU_test.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/Sandbox/wflow_HRU_test.py (.../wflow_HRU_test.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -24,9 +24,6 @@ """ import numpy -import os -import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/Sandbox/wflow_mswat.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_mswat.py (.../wflow_mswat.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Sandbox/wflow_mswat.py (.../wflow_mswat.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -22,7 +22,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/Sandbox/wflow_musle.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_musle.py (.../wflow_musle.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Sandbox/wflow_musle.py (.../wflow_musle.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -20,9 +20,6 @@ """ import numpy -import os -import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py =================================================================== diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py (.../reservoir_Sus.py) (revision 36b469410a4a5af24c3902cbebb595e9da83c7bb) +++ wflow-py/Sandbox/wflow_topoflex/reservoir_Sus.py (.../reservoir_Sus.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -11,8 +11,6 @@ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/Sandbox/wflow_usle.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_usle.py (.../wflow_usle.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/Sandbox/wflow_usle.py (.../wflow_usle.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -44,9 +44,6 @@ """ import numpy -import os -import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/Sandbox/wflow_vegetation.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_vegetation.py (.../wflow_vegetation.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/Sandbox/wflow_vegetation.py (.../wflow_vegetation.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -21,9 +21,6 @@ """ import numpy -import os -import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/Sandbox/wflow_w3.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_w3.py (.../wflow_w3.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Sandbox/wflow_w3.py (.../wflow_w3.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -33,7 +33,6 @@ import numpy import os import os.path -import shutil, glob import getopt import xarray Index: wflow-py/Sandbox/wflow_w3ra_v2.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Sandbox/wflow_w3ra_v2.py (.../wflow_w3ra_v2.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Sandbox/wflow_w3ra_v2.py (.../wflow_w3ra_v2.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -33,7 +33,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/Scripts/area_in_out.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/area_in_out.py (.../area_in_out.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/Scripts/area_in_out.py (.../area_in_out.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -17,9 +17,6 @@ """ import numpy -import os -import os.path -import shutil, glob import getopt try: Index: wflow-py/Scripts/bmi2runner.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/bmi2runner.py (.../bmi2runner.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Scripts/bmi2runner.py (.../bmi2runner.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -24,8 +24,6 @@ import wflow import wflow.wflow_bmi_combined as wfbmi import wflow.pcrut as pcrut -import os -import time import sys import getopt import logging Index: wflow-py/Scripts/gethbvpars.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/gethbvpars.py (.../gethbvpars.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/Scripts/gethbvpars.py (.../gethbvpars.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -11,7 +11,6 @@ """ -import glob import os.path import getopt import sys Index: wflow-py/Scripts/mapstack.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/mapstack.py (.../mapstack.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/Scripts/mapstack.py (.../mapstack.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -16,7 +16,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * @@ -149,7 +148,6 @@ setup needed. """ - pass def suspend(self): """ Index: wflow-py/Scripts/shptoraster.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/shptoraster.py (.../shptoraster.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Scripts/shptoraster.py (.../shptoraster.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -1,8 +1,5 @@ import os import os.path -import getopt -import configparser -import sys """ This scripts converst the hbv shape file to raster maps for the Index: wflow-py/Scripts/wfds_core.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/wfds_core.py (.../wfds_core.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/Scripts/wfds_core.py (.../wfds_core.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -24,7 +24,6 @@ import mmi.runner -import sys import docopt # from mmi.runner import runner Index: wflow-py/Scripts/wflow_flood.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/wflow_flood.py (.../wflow_flood.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Scripts/wflow_flood.py (.../wflow_flood.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -250,7 +250,6 @@ import wflow.wflow_lib as wflow_lib import datetime as dt -import pdb def main(): Index: wflow-py/Scripts/wflow_flood_lib.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/wflow_flood_lib.py (.../wflow_flood_lib.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Scripts/wflow_flood_lib.py (.../wflow_flood_lib.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -25,8 +25,6 @@ import pcraster as pcr import netCDF4 as nc import cftime -import datetime as dt -import pdb def setlogger(logfilename, logReference, verbose=True): Index: wflow-py/Scripts/wflow_sbm_rtc.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/Scripts/wflow_sbm_rtc.py (.../wflow_sbm_rtc.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/Scripts/wflow_sbm_rtc.py (.../wflow_sbm_rtc.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -6,7 +6,6 @@ import numpy import os import os.path -import shutil, glob import getopt import sys import getopt @@ -16,7 +15,7 @@ import wflow.wflow_bmi as bmi import logging import wflow.wflow_adapt as adapter -import datetime, calendar +import calendar import os import numpy as np import configparser Index: wflow-py/UnitTests/TestBMI_Init.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/UnitTests/TestBMI_Init.py (.../TestBMI_Init.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/UnitTests/TestBMI_Init.py (.../TestBMI_Init.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -3,8 +3,6 @@ import unittest import logging import wflow.wflow_bmi as bmi -import time -import os import datetime """ Index: wflow-py/UnitTests/TestBMI_bmi2runner.py =================================================================== diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/UnitTests/TestBMI_bmi2runner.py (.../TestBMI_bmi2runner.py) (revision 36b469410a4a5af24c3902cbebb595e9da83c7bb) +++ wflow-py/UnitTests/TestBMI_bmi2runner.py (.../TestBMI_bmi2runner.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -1,13 +1,11 @@ __author__ = "schelle" import unittest -import logging import sys sys.path = ["../wflow"] + ["../"] + sys.path sys.path = ["../Scripts"] + sys.path import bmi2runner as bmirun -import time import os import wflow_bmi_combined as bmi Index: wflow-py/UnitTests/TestBMI_bmi2runner2.py =================================================================== diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/UnitTests/TestBMI_bmi2runner2.py (.../TestBMI_bmi2runner2.py) (revision 36b469410a4a5af24c3902cbebb595e9da83c7bb) +++ wflow-py/UnitTests/TestBMI_bmi2runner2.py (.../TestBMI_bmi2runner2.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -1,14 +1,11 @@ __author__ = "schelle" import unittest -import logging import sys sys.path = ["../wflow"] + ["../"] + sys.path sys.path = ["../Scripts"] + sys.path import bmi2runner as bmirun -import time -import os import wflow_bmi_combined as bmi """ Index: wflow-py/UnitTests/TestBMI_combined.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/UnitTests/TestBMI_combined.py (.../TestBMI_combined.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/UnitTests/TestBMI_combined.py (.../TestBMI_combined.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -6,8 +6,6 @@ sys.path = ["../wflow"] + ["../"] + sys.path import wflow_bmi_combined as bmi -import time -import os """ Simple test for wflow bmi framework Index: wflow-py/UnitTests/TestBMI_combined_mp.py =================================================================== diff -u -r59cffa03cc52cdb4dc62a0ead1aafb6bc039b430 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/UnitTests/TestBMI_combined_mp.py (.../TestBMI_combined_mp.py) (revision 59cffa03cc52cdb4dc62a0ead1aafb6bc039b430) +++ wflow-py/UnitTests/TestBMI_combined_mp.py (.../TestBMI_combined_mp.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -1,13 +1,10 @@ __author__ = "schelle" import unittest -import logging import sys sys.path = ["../wflow"] + ["../"] + sys.path import wflow_bmi_combined_mp as bmi -import time -import os """ Simple test for wflow bmi framework Index: wflow-py/UnitTests/Test_w3ra_BMI.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/UnitTests/Test_w3ra_BMI.py (.../Test_w3ra_BMI.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/UnitTests/Test_w3ra_BMI.py (.../Test_w3ra_BMI.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -3,14 +3,11 @@ import unittest import logging import sys -import datetime sys.path = ["../"] + sys.path import wflow.wflow_bmi as bmi -import time from dateutil import parser import calendar -import os import wflow.wflow_sceleton as wf import numpy as np Index: wflow-py/UnitTests/Testwflow_sbm_nc2.py =================================================================== diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/UnitTests/Testwflow_sbm_nc2.py (.../Testwflow_sbm_nc2.py) (revision 36b469410a4a5af24c3902cbebb595e9da83c7bb) +++ wflow-py/UnitTests/Testwflow_sbm_nc2.py (.../Testwflow_sbm_nc2.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -2,7 +2,6 @@ import unittest import wflow.wflow_sbm as wf -import os """ Run sceleton for 10 steps and checks if the outcome is approx that of the reference run Index: wflow-py/WflowDeltashell/wflib.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/WflowDeltashell/wflib.py (.../wflib.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/WflowDeltashell/wflib.py (.../wflib.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -2,7 +2,6 @@ # Read a CSV file import csv # import the python csv library import os -import glob def GetItemByPartialName(list, name): Index: wflow-py/make_wflow_exe_buildserver.py =================================================================== diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/make_wflow_exe_buildserver.py (.../make_wflow_exe_buildserver.py) (revision 36b469410a4a5af24c3902cbebb595e9da83c7bb) +++ wflow-py/make_wflow_exe_buildserver.py (.../make_wflow_exe_buildserver.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -20,7 +20,6 @@ import glob import json import versioneer -import subprocess target = "normal" # Filter out wflow specific options Index: wflow-py/make_wflow_exe_cx.py =================================================================== diff -u -r36b469410a4a5af24c3902cbebb595e9da83c7bb -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision 36b469410a4a5af24c3902cbebb595e9da83c7bb) +++ wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -12,7 +12,9 @@ from cx_Freeze import setup, Executable, hooks -import ctypes, glob, os, shutil +import ctypes +import glob +import os import matplotlib import scipy import sys Index: wflow-py/make_wflow_openda_exe.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/make_wflow_openda_exe.py (.../make_wflow_openda_exe.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/make_wflow_openda_exe.py (.../make_wflow_openda_exe.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -1,4 +1,3 @@ -from distutils.core import setup from bbfreeze import Freezer from _version import * import ctypes Index: wflow-py/mkversion.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/mkversion.py (.../mkversion.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/mkversion.py (.../mkversion.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -1,6 +1,3 @@ -import os -import datetime -import subprocess a = open("wflow/__init__.py", "w") Index: wflow-py/mkversion_buildserver.py =================================================================== diff -u -r4143969ebd6b276284ea6e4198ee693bd6ab506a -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/mkversion_buildserver.py (.../mkversion_buildserver.py) (revision 4143969ebd6b276284ea6e4198ee693bd6ab506a) +++ wflow-py/mkversion_buildserver.py (.../mkversion_buildserver.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -1,7 +1,4 @@ -import os -import datetime -import subprocess a = open("wflow/__init__.py", "w") a.write( Index: wflow-py/openda_bmi/openda/bmi/thrift/BMIService.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/openda_bmi/openda/bmi/thrift/BMIService.py (.../BMIService.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/openda_bmi/openda/bmi/thrift/BMIService.py (.../BMIService.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -24,7 +24,6 @@ Parameters: - file """ - pass def update(self,): pass @@ -34,14 +33,12 @@ Parameters: - time """ - pass def update_frac(self, frac): """ Parameters: - frac """ - pass def finalize_model(self,): pass @@ -60,35 +57,30 @@ Parameters: - long_var_name """ - pass def get_var_units(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_var_rank(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_var_size(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_var_nbytes(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_start_time(self,): pass @@ -110,23 +102,20 @@ Parameters: - long_var_name """ - pass def get_value_at_indices(self, long_var_name, inds): """ Parameters: - long_var_name - inds """ - pass def set_value(self, long_var_name, src): """ Parameters: - long_var_name - src """ - pass def set_value_at_indices(self, long_var_name, inds, src): """ @@ -135,77 +124,66 @@ - inds - src """ - pass def get_grid_type(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_shape(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_spacing(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_origin(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_x(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_y(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_z(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_connectivity(self, long_var_name): """ Parameters: - long_var_name """ - pass def get_grid_offset(self, long_var_name): """ Parameters: - long_var_name """ - pass def initialize_config(self, file): """ Parameters: - file """ - pass def initialize_model(self,): pass @@ -215,14 +193,12 @@ Parameters: - start_time """ - pass def set_end_time(self, end_time): """ Parameters: - end_time """ - pass def get_attribute_names(self,): pass @@ -232,29 +208,25 @@ Parameters: - attribute_name """ - pass def set_attribute_value(self, attribute_name, attribute_value): """ Parameters: - attribute_name - attribute_value """ - pass def save_state(self, destination_directory): """ Parameters: - destination_directory """ - pass def load_state(self, source_directory): """ Parameters: - source_directory """ - pass class Client(Iface): Index: wflow-py/wflow/JarvisCoefficients.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/JarvisCoefficients.py (.../JarvisCoefficients.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/JarvisCoefficients.py (.../JarvisCoefficients.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -17,8 +17,6 @@ """ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/ops_scalar2grid.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/ops_scalar2grid.py (.../ops_scalar2grid.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/ops_scalar2grid.py (.../ops_scalar2grid.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -18,9 +18,6 @@ """ import numpy -import os -import os.path -import shutil, glob import getopt import wflow.pcrut as pcrut Index: wflow-py/wflow/pcrglobwb/groundwater.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/groundwater.py (.../groundwater.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/groundwater.py (.../groundwater.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -23,7 +23,6 @@ # along with this program. If not, see . import math -import subprocess import os from pcraster.framework import * Index: wflow-py/wflow/pcrglobwb/landCover.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/landCover.py (.../landCover.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/landCover.py (.../landCover.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -22,8 +22,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import re -import types import netCDF4 as nc import pcraster as pcr Index: wflow-py/wflow/pcrglobwb/landSurface.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/landSurface.py (.../landSurface.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/landSurface.py (.../landSurface.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -22,7 +22,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import types import pcraster as pcr from . import virtualOS as vos Index: wflow-py/wflow/pcrglobwb/ncConverter.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/ncConverter.py (.../ncConverter.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/ncConverter.py (.../ncConverter.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -22,13 +22,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os -import sys import datetime -import time -import re -import glob -import subprocess import netCDF4 as nc import cftime import numpy as np Index: wflow-py/wflow/pcrglobwb/parameterSoilAndTopo.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/parameterSoilAndTopo.py (.../parameterSoilAndTopo.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/parameterSoilAndTopo.py (.../parameterSoilAndTopo.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -22,7 +22,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os import pcraster as pcr from . import virtualOS as vos Index: wflow-py/wflow/pcrglobwb/routing.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/routing.py (.../routing.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/routing.py (.../routing.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -23,9 +23,6 @@ # along with this program. If not, see . import os -import types -import math -import types from pcraster.framework import * import pcraster as pcr Index: wflow-py/wflow/pcrglobwb/virtualOS.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/virtualOS.py (.../virtualOS.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/virtualOS.py (.../virtualOS.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -32,9 +32,7 @@ import os import gc import re -import math import sys -import types import calendar import glob Index: wflow-py/wflow/pcrglobwb/waterBodies.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrglobwb/waterBodies.py (.../waterBodies.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrglobwb/waterBodies.py (.../waterBodies.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -22,8 +22,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import os -import types from pcraster.framework import * import pcraster as pcr Index: wflow-py/wflow/pcrut.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/pcrut.py (.../pcrut.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/pcrut.py (.../pcrut.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -8,7 +8,6 @@ import numpy from math import * import sys -import csv from pcraster import * Index: wflow-py/wflow/reservoir_Sa.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/reservoir_Sa.py (.../reservoir_Sa.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/reservoir_Sa.py (.../reservoir_Sa.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -15,8 +15,6 @@ """ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/reservoir_Sf.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/reservoir_Sf.py (.../reservoir_Sf.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/reservoir_Sf.py (.../reservoir_Sf.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -8,8 +8,6 @@ """ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/reservoir_Si.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/reservoir_Si.py (.../reservoir_Si.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/reservoir_Si.py (.../reservoir_Si.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -7,8 +7,6 @@ List all function versions """ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/reservoir_Ss.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/reservoir_Ss.py (.../reservoir_Ss.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/reservoir_Ss.py (.../reservoir_Ss.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -11,8 +11,6 @@ """ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/reservoir_Su.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/reservoir_Su.py (.../reservoir_Su.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/reservoir_Su.py (.../reservoir_Su.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -8,8 +8,6 @@ """ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/reservoir_Sw.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/reservoir_Sw.py (.../reservoir_Sw.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/reservoir_Sw.py (.../reservoir_Sw.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -8,8 +8,6 @@ """ import numpy -import pdb -from copy import copy as copylist try: from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/stats.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/stats.py (.../stats.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/stats.py (.../stats.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -37,7 +37,6 @@ # get_box_plot_parameters # -import sys # Import math library from math import sqrt Index: wflow-py/wflow/wf_netcdfio.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wf_netcdfio.py (.../wf_netcdfio.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wf_netcdfio.py (.../wf_netcdfio.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -70,7 +70,6 @@ This function prepares a NetCDF file with given metadata, for a certain year, daily basis data The function assumes a gregorian calendar and a time unit 'Days since 1900-01-01 00:00:00' """ - import datetime as dt logger.info("Setting up netcdf output: " + trgFile) Index: wflow-py/wflow/wflow_adapt.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_adapt.py (.../wflow_adapt.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_adapt.py (.../wflow_adapt.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -54,11 +54,8 @@ from xml.etree.ElementTree import * from datetime import * -import time -import string import shutil -import re from glob import * import logging import logging.handlers Index: wflow-py/wflow/wflow_bmi.py =================================================================== diff -u -r9e83a242802687eb468cd8d7e25116336b4f4db7 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_bmi.py (.../wflow_bmi.py) (revision 9e83a242802687eb468cd8d7e25116336b4f4db7) +++ wflow-py/wflow/wflow_bmi.py (.../wflow_bmi.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -3,7 +3,6 @@ import os import logging import datetime -import parser import wflow.bmi as bmi from . import wflow_lib @@ -509,13 +508,11 @@ """ Return the number of fields of a compound type. """ - pass def inq_compound_field(self, name, index): """ Lookup the type,rank and shape of a compound field """ - pass class LookupNames: Index: wflow-py/wflow/wflow_bmi_combined_mp.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_bmi_combined_mp.py (.../wflow_bmi_combined_mp.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_bmi_combined_mp.py (.../wflow_bmi_combined_mp.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -7,7 +7,6 @@ import configparser import logging from pcraster import * -import multiprocessing def iniFileSetUp(configfile): Index: wflow-py/wflow/wflow_cqf.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_cqf.py (.../wflow_cqf.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_cqf.py (.../wflow_cqf.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -100,15 +100,13 @@ # import pcrut import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import * import scipy -import configparser wflow = "wflow_cqf: " Index: wflow-py/wflow/wflow_delwaq.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_delwaq.py (.../wflow_delwaq.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_delwaq.py (.../wflow_delwaq.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -81,7 +81,7 @@ from datetime import * import os import os.path -import shutil, glob +import shutil import getopt import time import struct Index: wflow-py/wflow/wflow_fit_brute.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_fit_brute.py (.../wflow_fit_brute.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_fit_brute.py (.../wflow_fit_brute.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -71,7 +71,8 @@ import pylab import getopt import sys -import csv, itertools +import csv +import itertools # TODO: do not read results from file Index: wflow-py/wflow/wflow_floodmap.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_floodmap.py (.../wflow_floodmap.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_floodmap.py (.../wflow_floodmap.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -61,7 +61,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflow_funcs.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_funcs.py (.../wflow_funcs.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_funcs.py (.../wflow_funcs.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -24,10 +24,6 @@ from numpy import * -import getopt -import os -import os.path -import sys from pcraster import * Index: wflow-py/wflow/wflow_gr4.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_gr4.py (.../wflow_gr4.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_gr4.py (.../wflow_gr4.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -37,7 +37,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflow_hbv.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_hbv.py (.../wflow_hbv.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_hbv.py (.../wflow_hbv.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -83,7 +83,6 @@ import sys import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflow_hbvl.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_hbvl.py (.../wflow_hbvl.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_hbvl.py (.../wflow_hbvl.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -77,7 +77,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflow_lib.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_lib.py (.../wflow_lib.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -34,12 +34,10 @@ """ -import getopt import os import os.path import sys -import configparser import osgeo.gdal as gdal from osgeo.gdalconst import * import pcraster Index: wflow-py/wflow/wflow_lintul.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_lintul.py (.../wflow_lintul.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_lintul.py (.../wflow_lintul.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -6,12 +6,10 @@ import numpy as np import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * from wflow.wflow_adapt import * -from time import strftime import time """ Index: wflow-py/wflow/wflow_pcrglobwb.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_pcrglobwb.py (.../wflow_pcrglobwb.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_pcrglobwb.py (.../wflow_pcrglobwb.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -91,15 +91,12 @@ import sys import os import os.path -import shutil, glob import getopt -import datetime from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import * -import configparser from wflow.pcrglobwb import landSurface from wflow.pcrglobwb import groundwater @@ -598,7 +595,6 @@ if self.reinit == 1: self.logger.info("Setting initial conditions to default (zero!)") - pass else: self.wf_resume(os.path.join(self.Dir, "instate")) Index: wflow-py/wflow/wflow_routing.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_routing.py (.../wflow_routing.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -62,14 +62,12 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import * -import configparser wflow = "wflow_routing: " Index: wflow-py/wflow/wflow_sbm.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_sbm.py (.../wflow_sbm.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -90,13 +90,11 @@ import sys import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import * -import configparser wflow = "wflow_sbm: " Index: wflow-py/wflow/wflow_sbm_old.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_sbm_old.py (.../wflow_sbm_old.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_sbm_old.py (.../wflow_sbm_old.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -91,14 +91,12 @@ # import pcrut import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * from wflow.wflow_funcs import * from wflow.wflow_adapt import * -import configparser wflow = "wflow_sbm: " Index: wflow-py/wflow/wflow_sceleton.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_sceleton.py (.../wflow_sceleton.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_sceleton.py (.../wflow_sceleton.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -19,9 +19,6 @@ """ import numpy -import os -import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflow_snow.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_snow.py (.../wflow_snow.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_snow.py (.../wflow_snow.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -56,11 +56,9 @@ """ -import pickle import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * import scipy Index: wflow-py/wflow/wflow_sphy.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_sphy.py (.../wflow_sphy.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_sphy.py (.../wflow_sphy.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -23,7 +23,6 @@ import sys import os import os.path -import shutil, glob import getopt import datetime as dt Index: wflow-py/wflow/wflow_topoflex.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -27,10 +27,7 @@ import numpy import os import os.path -import shutil, glob import getopt -import time -import pdb from wflow.wf_DynamicFramework import * from wflow.wflow_adapt import * Index: wflow-py/wflow/wflow_w3ra.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_w3ra.py (.../wflow_w3ra.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_w3ra.py (.../wflow_w3ra.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -39,7 +39,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflow_w3ra_new.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_w3ra_new.py (.../wflow_w3ra_new.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflow_w3ra_new.py (.../wflow_w3ra_new.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -35,7 +35,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflow_wave.py =================================================================== diff -u -rf33154035afcaa101c5a30594b9c86a4fe9f61ef -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflow_wave.py (.../wflow_wave.py) (revision f33154035afcaa101c5a30594b9c86a4fe9f61ef) +++ wflow-py/wflow/wflow_wave.py (.../wflow_wave.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -100,7 +100,6 @@ import numpy import os import os.path -import shutil, glob import getopt from wflow.wf_DynamicFramework import * Index: wflow-py/wflow/wflowtools_lib.py =================================================================== diff -u -rb90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0 -r236be615eeede4006b55d024fe76920d8f8c3d20 --- wflow-py/wflow/wflowtools_lib.py (.../wflowtools_lib.py) (revision b90c267fae9ec3423464cf9b6c7a9bcbcd45d3a0) +++ wflow-py/wflow/wflowtools_lib.py (.../wflowtools_lib.py) (revision 236be615eeede4006b55d024fe76920d8f8c3d20) @@ -8,7 +8,6 @@ import os import copy import sys -from subprocess import call import configparser import logging import logging.handlers