From a93fb222da61627547265bbade25c0b7f3f13987 Mon Sep 17 00:00:00 2001
From: Zachary Burnett <zachary.burnett@noaa.gov>
Date: Mon, 19 Apr 2021 18:35:26 -0400
Subject: [PATCH] expose more imports at the module level (#74)

---
 adcircpy/__init__.py               | 11 ++++++++---
 adcircpy/forcing/__init__.py       | 16 ++++++++++++++--
 adcircpy/forcing/tides/__init__.py |  3 ++-
 adcircpy/forcing/waves/__init__.py |  8 +++++++-
 adcircpy/forcing/winds/__init__.py | 11 +++++++++--
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/adcircpy/__init__.py b/adcircpy/__init__.py
index 3caed089..c9144907 100644
--- a/adcircpy/__init__.py
+++ b/adcircpy/__init__.py
@@ -4,15 +4,19 @@
 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
@@ -20,4 +24,5 @@
 
 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
index 3b56b259..7b4c6645 100644
--- 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
index 756decd2..d336a96c 100644
--- 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
index 27bbe329..6477dd72 100644
--- 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
index ce3324d5..3d5666a8 100644
--- 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',
+]