diff --git a/wetb/prepost/dlcdefs.py b/wetb/prepost/dlcdefs.py index aea674918d14f40fb9b0ffcecb4acbf3add4175d..8627cb1f17af71a2e9a3f27687d44a7fe9b924e7 100644 --- a/wetb/prepost/dlcdefs.py +++ b/wetb/prepost/dlcdefs.py @@ -12,7 +12,7 @@ import unittest import pandas as pd -from wetb import misc +from wetb.prepost import misc def casedict2xlsx(): """ diff --git a/wetb/prepost/dlcplots.py b/wetb/prepost/dlcplots.py index 093b45b62ff7fd955076b8fc4f4ce7189fbd6d4b..880d5ae50db29f4710039d150e1281d72325cd72 100644 --- a/wetb/prepost/dlcplots.py +++ b/wetb/prepost/dlcplots.py @@ -31,9 +31,9 @@ import pandas as pd #import numpy as np #import windIO -from wetb import mplutils -from wetb import Simulations as sim -from wetb import dlcdefs +from wetb.prepost import mplutils +from wetb.prepost import Simulations as sim +from wetb.prepost import dlcdefs plt.rc('font', family='serif') plt.rc('xtick', labelsize=10) diff --git a/wetb/prepost/dlctemplate.py b/wetb/prepost/dlctemplate.py index 6f716256b527d9f0b55df1864c8662149c2cc09f..47d795b78f67a21b3e4d36207ca9d2b37ae96445 100755 --- a/wetb/prepost/dlctemplate.py +++ b/wetb/prepost/dlctemplate.py @@ -16,11 +16,9 @@ from argparse import ArgumentParser from matplotlib import pyplot as plt #import matplotlib as mpl -from wetb import Simulations as sim -#import misc -#import windIO -from wetb import dlcdefs -from wetb import dlcplots +from wetb.prepost import Simulations as sim +from wetb.prepost import dlcdefs +from wetb.prepost import dlcplots plt.rc('font', family='serif') plt.rc('xtick', labelsize=10) diff --git a/wetb/prepost/filters.py b/wetb/prepost/filters.py index acd89c373830ccbac0222aea5feb764c21f3a191..760ffe27fcbe5964d901b1875bc295b0d36f35c5 100644 --- a/wetb/prepost/filters.py +++ b/wetb/prepost/filters.py @@ -11,9 +11,9 @@ Created on Sun Jan 20 18:14:02 2013 import numpy as np import scipy as sp -from wetb import DataChecks as chk -from wetb.misc import calc_sample_rate -from wetb import mplutils +from wetb.prepost import DataChecks as chk +from wetb.prepost.misc import calc_sample_rate +from wetb.prepost import mplutils class Filters: diff --git a/wetb/prepost/h2_vs_hs2.py b/wetb/prepost/h2_vs_hs2.py index bafddccda33ab0d5b8f3127b4e63172939e1ff04..8bbce7b428cc21d3a084c2fd6a39b71e52516c78 100644 --- a/wetb/prepost/h2_vs_hs2.py +++ b/wetb/prepost/h2_vs_hs2.py @@ -15,10 +15,10 @@ import numpy as np import pandas as pd from matplotlib import pyplot as plt -from wetb import Simulations as sim -from wetb import dlcdefs -from wetb import hawcstab2 as hs2 -from wetb import mplutils +from wetb.prepost import Simulations as sim +from wetb.prepost import dlcdefs +from wetb.prepost import hawcstab2 as hs2 +from wetb.prepost import mplutils class Configurations: diff --git a/wetb/prepost/hawcstab2.py b/wetb/prepost/hawcstab2.py index 1068541b6b5da437c780d5047ff4a46637817dd2..516be89f409cdade1eb975a6a08d0e6ec2ecaa91 100644 --- a/wetb/prepost/hawcstab2.py +++ b/wetb/prepost/hawcstab2.py @@ -14,7 +14,7 @@ import re import numpy as np import pandas as pd -from wetb import mplutils +from wetb.prepost import mplutils class dummy: diff --git a/wetb/prepost/windIO.py b/wetb/prepost/windIO.py index 94779622b436864ed899c494b48ecfbdae0c88a5..c58d41b77ed23d7993d3c0abb099cf4e8f416518 100755 --- a/wetb/prepost/windIO.py +++ b/wetb/prepost/windIO.py @@ -32,7 +32,7 @@ import pandas as pd # misc is part of prepost, which is available on the dtu wind gitlab server: # https://gitlab.windenergy.dtu.dk/dave/prepost -from wetb import misc +from wetb.prepost import misc # wind energy python toolbox, available on the dtu wind redmine server: # http://vind-redmine.win.dtu.dk/projects/pythontoolbox/repository/show/fatigue_tools import fatigue