expose more imports at the module level (#74)

oceanmodeling · Apr 19, 2021 · a93fb22 · a93fb22
1 parent e1b33a2
commit a93fb22
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 9 deletions.
diff --git a/adcircpy/__init__.py b/adcircpy/__init__.py
@@ -4,20 +4,25 @@
 from pandas.plotting import register_matplotlib_converters
 
 from adcircpy.driver import AdcircRun
-from adcircpy.forcing import Tides
-from adcircpy.mesh import AdcircMesh
+from adcircpy.forcing import TidalSource, Tides, WaveForcing, \
+    WindForcing
 from adcircpy.fort15 import Fort15
+from adcircpy.mesh import AdcircMesh
 
 __all__ = [
     "AdcircMesh",
     "AdcircRun",
     "Tides",
-    'Fort15'
+    'TidalSource',
+    'WaveForcing',
+    'WindForcing',
+    'Fort15',
 ]
 
 mpl.rcParams['agg.path.chunksize'] = 10000
 register_matplotlib_converters()
 
 if util.find_spec("colored_traceback") is not None:
     import colored_traceback
+
     colored_traceback.add_hook(always=True)
diff --git a/adcircpy/forcing/__init__.py b/adcircpy/forcing/__init__.py
@@ -1,5 +1,17 @@
-from adcircpy.forcing.tides import Tides
+from adcircpy.forcing.tides import HAMTIDE, TPXO, TidalSource, Tides
+from adcircpy.forcing.waves import WaveForcing, WaveWatch3DataForcing
+from adcircpy.forcing.winds import AtmosphericMeshForcing, \
+    BestTrackForcing, OwiForcing, WindForcing
 
 __all__ = [
-    "Tides"
+    "Tides",
+    'TidalSource',
+    'TPXO',
+    'HAMTIDE',
+    'WaveForcing',
+    'WaveWatch3DataForcing',
+    'WindForcing',
+    'BestTrackForcing',
+    'AtmosphericMeshForcing',
+    'OwiForcing',
 ]
diff --git a/adcircpy/forcing/tides/__init__.py b/adcircpy/forcing/tides/__init__.py
@@ -1,9 +1,10 @@
 from adcircpy.forcing.tides.hamtide import HAMTIDE
-from adcircpy.forcing.tides.tides import Tides
+from adcircpy.forcing.tides.tides import TidalSource, Tides
 from adcircpy.forcing.tides.tpxo import TPXO
 
 __all__ = [
     "Tides",
+    'TidalSource',
     'TPXO',
     'HAMTIDE'
 ]
diff --git a/adcircpy/forcing/waves/__init__.py b/adcircpy/forcing/waves/__init__.py
@@ -1 +1,7 @@
-from .base import WaveForcing
+from adcircpy.forcing.waves.base import WaveForcing
+from adcircpy.forcing.waves.ww3 import WaveWatch3DataForcing
+
+__all__ = [
+    'WaveForcing',
+    'WaveWatch3DataForcing',
+]
diff --git a/adcircpy/forcing/winds/__init__.py b/adcircpy/forcing/winds/__init__.py
@@ -1,4 +1,11 @@
+from adcircpy.forcing.winds.atmesh import AtmosphericMeshForcing
+from adcircpy.forcing.winds.base import WindForcing
 from adcircpy.forcing.winds.best_track import BestTrackForcing
-from .base import WindForcing
+from adcircpy.forcing.winds.owi import OwiForcing
 
-__all__ = ['BestTrackForcing']
+__all__ = [
+    'WindForcing',
+    'BestTrackForcing',
+    'AtmosphericMeshForcing',
+    'OwiForcing',
+]