reverse

treden · Oct 20, 2023 · e5fe8b9 · e5fe8b9
1 parent 2f1f402
commit e5fe8b9
Show file tree

Hide file tree

Showing 29 changed files with 27 additions and 27 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -13,7 +13,7 @@
 # serve to show the default.
 
 
-import utide2D
+import utide
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -57,7 +57,7 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 
-version = release = utide2D.__version__
+version = release = utide.__version__
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation

diff --git a/tests/test_HNL.py b/tests/test_HNL.py
@@ -4,8 +4,8 @@
 import pytest
 from numpy.testing import assert_array_almost_equal, assert_array_equal
 
-import utide2D
-from utide2D.utilities import Bunch, convert_unicode_arrays, loadbunch
+import utide
+from utide.utilities import Bunch, convert_unicode_arrays, loadbunch
 
 thisdir = os.path.dirname(__file__)
 datapath = os.path.join(thisdir, "data")
@@ -23,13 +23,13 @@
     "conf_int": "linear",
 }
 
-coef_all = utide2D.solve(t, h, **solve_kw)
+coef_all = utide.solve(t, h, **solve_kw)
 
 sl_month = slice(24 * 31)
-coef_month = utide2D.solve(t[sl_month], h[sl_month], **solve_kw)
+coef_month = utide.solve(t[sl_month], h[sl_month], **solve_kw)
 
 sl_week = slice(24 * 7)
-coef_week = utide2D.solve(t[sl_week], h[sl_week], **solve_kw)
+coef_week = utide.solve(t[sl_week], h[sl_week], **solve_kw)
 
 month_index_dict = dict({(name.strip(), i) for i, name in enumerate(coef_month.name)})
 infer = Bunch()
@@ -42,7 +42,7 @@
     infer.amp_ratios.append(coef_month.A[iinf] / coef_month.A[iref])
     infer.phase_offsets.append(coef_month.g[iref] - coef_month.g[iinf])
 
-coef_week_inf = utide2D.solve(t[sl_week], h[sl_week], infer=infer, **solve_kw)
+coef_week_inf = utide.solve(t[sl_week], h[sl_week], infer=infer, **solve_kw)
 
 runs = [
     (coef_all, "HNL2010.mat"),

diff --git a/tests/test_astron.py b/tests/test_astron.py
@@ -11,7 +11,7 @@
 """
 import numpy as np
 
-from utide2D.astronomy import ut_astron
+from utide.astronomy import ut_astron
 
 
 def test_astron():

diff --git a/tests/test_harmonics.py b/tests/test_harmonics.py
@@ -10,9 +10,9 @@
 
 from numpy.testing import assert_array_almost_equal
 
-from utide2D._ut_constants import _base_dir
-from utide2D.harmonics import FUV
-from utide2D.utilities import loadbunch
+from utide._ut_constants import _base_dir
+from utide.harmonics import FUV
+from utide.utilities import loadbunch
 
 fname = os.path.join(_base_dir, "FUV0.npz")
 

diff --git a/tests/test_normalize.py b/tests/test_normalize.py
@@ -3,7 +3,7 @@
 import numpy as np
 import pandas as pd
 
-from utide2D._time_conversion import _date2num, _normalize_time
+from utide._time_conversion import _date2num, _normalize_time
 
 
 def test_formats():

diff --git a/tests/test_order_constit.py b/tests/test_order_constit.py
@@ -1,8 +1,8 @@
 import numpy as np
 import pytest
 
-from utide2D import reconstruct, solve
-from utide2D._ut_constants import constit_index_dict, ut_constants
+from utide import reconstruct, solve
+from utide._ut_constants import constit_index_dict, ut_constants
 
 ts = 735604
 duration = 35

diff --git a/tests/test_periodogram.py b/tests/test_periodogram.py
@@ -3,7 +3,7 @@
 """
 import numpy as np
 
-import utide2D.periodogram as pgram
+import utide.periodogram as pgram
 
 
 def random_ts(ndays, dt_hours, is_complex=True):

diff --git a/tests/test_solve.py b/tests/test_solve.py
@@ -9,9 +9,9 @@
 import numpy as np
 import pytest
 
-from utide2D import reconstruct, solve
-from utide2D._ut_constants import ut_constants
-from utide2D.utilities import Bunch
+from utide import reconstruct, solve
+from utide._ut_constants import ut_constants
+from utide.utilities import Bunch
 
 ts = 735604
 duration = 35

diff --git a/tests/test_uv.py b/tests/test_uv.py
@@ -6,8 +6,8 @@
 import pytest
 from pandas import date_range
 
-from utide2D import reconstruct, solve
-from utide2D.utilities import Bunch
+from utide import reconstruct, solve
+from utide.utilities import Bunch
 
 
 def _fake_tide(t, M2amp, M2phase):

diff --git a/utide2D/__init__.py → utide/__init__.py b/utide2D/__init__.py → utide/__init__.py
diff --git a/utide2D/_reconstruct.py → utide/_reconstruct.py b/utide2D/_reconstruct.py → utide/_reconstruct.py
diff --git a/utide2D/_solve.py → utide/_solve.py b/utide2D/_solve.py → utide/_solve.py
diff --git a/utide2D/_time_conversion.py → utide/_time_conversion.py b/utide2D/_time_conversion.py → utide/_time_conversion.py
diff --git a/utide2D/_ut_constants.py → utide/_ut_constants.py b/utide2D/_ut_constants.py → utide/_ut_constants.py
diff --git a/utide2D/astronomy.py → utide/astronomy.py b/utide2D/astronomy.py → utide/astronomy.py
diff --git a/utide2D/confidence.py → utide/confidence.py b/utide2D/confidence.py → utide/confidence.py
@@ -10,9 +10,9 @@
 
 import numpy as np
 
-from utide2D.ellipse_params import ut_cs2cep
-from utide2D.periodogram import band_psd
-from utide2D.utilities import complex_interp
+from utide.ellipse_params import ut_cs2cep
+from utide.periodogram import band_psd
+from utide.utilities import complex_interp
 
 
 def band_averaged_psd_by_constit(tin, t, e, elor, coef, opt):

diff --git a/utide2D/constituent_selection.py → utide/constituent_selection.py b/utide2D/constituent_selection.py → utide/constituent_selection.py
diff --git a/utide2D/data/FUV0.mat → utide/data/FUV0.mat b/utide2D/data/FUV0.mat → utide/data/FUV0.mat
diff --git a/utide2D/data/FUV0.npz → utide/data/FUV0.npz b/utide2D/data/FUV0.npz → utide/data/FUV0.npz
diff --git a/utide2D/data/make_FUV_data.py → utide/data/make_FUV_data.py b/utide2D/data/make_FUV_data.py → utide/data/make_FUV_data.py
diff --git a/utide2D/data/mat2npz.py → utide/data/mat2npz.py b/utide2D/data/mat2npz.py → utide/data/mat2npz.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 
-from utide2D.utilities import loadbunch
+from utide.utilities import loadbunch
 
 datadir = os.path.join(os.path.dirname(__file__))
 

diff --git a/utide2D/data/ut_constants.mat → utide/data/ut_constants.mat b/utide2D/data/ut_constants.mat → utide/data/ut_constants.mat
diff --git a/utide2D/data/ut_constants.npz → utide/data/ut_constants.npz b/utide2D/data/ut_constants.npz → utide/data/ut_constants.npz
diff --git a/utide2D/diagnostics.py → utide/diagnostics.py b/utide2D/diagnostics.py → utide/diagnostics.py
diff --git a/utide2D/ellipse_params.py → utide/ellipse_params.py b/utide2D/ellipse_params.py → utide/ellipse_params.py
diff --git a/utide2D/harmonics.py → utide/harmonics.py b/utide2D/harmonics.py → utide/harmonics.py
diff --git a/utide2D/periodogram.py → utide/periodogram.py b/utide2D/periodogram.py → utide/periodogram.py
@@ -15,7 +15,7 @@
 import numpy as np
 from scipy import signal
 
-from utide2D.utilities import Bunch
+from utide.utilities import Bunch
 
 # __all__ = ['freq_bands', 'band_psd']
 

diff --git a/utide2D/robustfit.py → utide/robustfit.py b/utide2D/robustfit.py → utide/robustfit.py
@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from utide2D.utilities import Bunch
+from utide.utilities import Bunch
 
 
 # Weighting functions:

diff --git a/utide2D/utilities.py → utide/utilities.py b/utide2D/utilities.py → utide/utilities.py