pyTMD 2.2.0__tar.gz → 2.2.2__tar.gz

{pytmd-2.2.0 → pytmd-2.2.2}/CITATION.cff

@@ -31,13 +31,13 @@ identifiers:
   - type: doi
     value: 10.5281/zenodo.5555395
     description: Zenodo Archive
-repository-code: 'https://github.com/tsutterley/pyTMD'
+repository-code: 'https://github.com/pyTMD/pyTMD'
 url: 'https://pytmd.readthedocs.io'
 repository: 'https://pypi.org/project/pyTMD'
 repository-artifact: 'https://anaconda.org/conda-forge/pytmd'
 doi: "10.5281/zenodo.5555395"
-version: "2.2.0"
-date-released: "2024-12-20"
+version: "2.2.2"
+date-released: "2025-02-19"
 keywords:
   - Ocean Tides
   - Load Tides

{pytmd-2.2.0 → pytmd-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pyTMD
-Version: 2.2.0
+Version: 2.2.2
 Summary: Python-based tidal prediction software for estimating ocean, load, solid Earth and pole tides
 Author: Tyler Sutterley
 Author-email: tsutterl@uw.edu
@@ -29,8 +29,8 @@ License: MIT License
         
 Project-URL: Homepage, https://pytmd.readthedocs.io
 Project-URL: Documentation, https://pytmd.readthedocs.io
-Project-URL: Repository, https://github.com/tsutterley/pyTMD
-Project-URL: Issues, https://github.com/tsutterley/pyTMD/issues
+Project-URL: Repository, https://github.com/pyTMD/pyTMD
+Project-URL: Issues, https://github.com/pyTMD/pyTMD/issues
 Keywords: Ocean Tides,Load Tides,Pole Tides,Solid Earth Tides,Tidal Prediction
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Science/Research
@@ -70,16 +70,12 @@ Requires-Dist: sphinx-design; extra == "doc"
 Requires-Dist: sphinx_rtd_theme; extra == "doc"
 Provides-Extra: all
 Requires-Dist: cartopy; extra == "all"
-Requires-Dist: gdal; extra == "all"
-Requires-Dist: h5py; extra == "all"
 Requires-Dist: ipyleaflet; extra == "all"
 Requires-Dist: ipywidgets; extra == "all"
 Requires-Dist: jplephem; extra == "all"
 Requires-Dist: matplotlib; extra == "all"
-Requires-Dist: mpi4py; extra == "all"
 Requires-Dist: notebook; extra == "all"
 Requires-Dist: pandas; extra == "all"
-Requires-Dist: pyyaml; extra == "all"
 Provides-Extra: dev
 Requires-Dist: flake8; extra == "dev"
 Requires-Dist: pytest>=4.6; extra == "dev"
@@ -93,26 +89,26 @@ pyTMD
 
 |License|
 |Documentation Status|
-|Coverage Status|
 |PyPI|
 |conda-forge|
+|commits-since|
 |zenodo|
 
-.. |License| image:: https://img.shields.io/github/license/tsutterley/pyTMD
-   :target: https://github.com/tsutterley/pyTMD/blob/main/LICENSE
+.. |License| image:: https://img.shields.io/github/license/pyTMD/pyTMD
+   :target: https://github.com/pyTMD/pyTMD/blob/main/LICENSE
 
 .. |Documentation Status| image:: https://readthedocs.org/projects/pytmd/badge/?version=latest
    :target: https://pytmd.readthedocs.io/en/latest/?badge=latest
 
-.. |Coverage Status| image:: https://codecov.io/gh/tsutterley/pyTMD/branch/main/graph/badge.svg
-   :target: https://codecov.io/gh/tsutterley/pyTMD
-
 .. |PyPI| image:: https://img.shields.io/pypi/v/pyTMD.svg
    :target: https://pypi.python.org/pypi/pyTMD/
 
 .. |conda-forge| image:: https://img.shields.io/conda/vn/conda-forge/pytmd
    :target: https://anaconda.org/conda-forge/pytmd
 
+.. |commits-since| image:: https://img.shields.io/github/commits-since/pyTMD/pyTMD/latest
+   :target: https://github.com/pyTMD/pyTMD/releases
+
 .. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.5555395.svg
    :target: https://doi.org/10.5281/zenodo.5555395
 
@@ -149,7 +145,7 @@ Development version from GitHub:
 
 .. code-block:: bash
 
-   python3 -m pip install git+https://github.com/tsutterley/pyTMD.git
+   python3 -m pip install git+https://github.com/pyTMD/pyTMD.git
 
 Dependencies
 ############
@@ -178,9 +174,9 @@ Download
 ########
 
 | The program homepage is:
-| https://github.com/tsutterley/pyTMD
+| https://github.com/pyTMD/pyTMD
 | A zip archive of the latest version is available directly at:
-| https://github.com/tsutterley/pyTMD/archive/main.zip
+| https://github.com/pyTMD/pyTMD/archive/main.zip
 
 Alternative Software
 ####################
@@ -204,7 +200,7 @@ Contributing
 ############
 
 This project contains work and contributions from the `scientific community <./CONTRIBUTORS.rst>`_.
-If you would like to contribute to the project, please have a look at the `open issues <https://github.com/tsutterley/pyTMD/issues>`_ and the project `code of conduct <./CODE_OF_CONDUCT.rst>`_.
+If you would like to contribute to the project, please have a look at the `open issues <https://github.com/pyTMD/pyTMD/issues>`_ and `discussions board <https://github.com/pyTMD/pyTMD/discussions>`_.
 
 Credits
 #######

{pytmd-2.2.0 → pytmd-2.2.2}/README.rst

@@ -4,26 +4,26 @@ pyTMD
 
 |License|
 |Documentation Status|
-|Coverage Status|
 |PyPI|
 |conda-forge|
+|commits-since|
 |zenodo|
 
-.. |License| image:: https://img.shields.io/github/license/tsutterley/pyTMD
-   :target: https://github.com/tsutterley/pyTMD/blob/main/LICENSE
+.. |License| image:: https://img.shields.io/github/license/pyTMD/pyTMD
+   :target: https://github.com/pyTMD/pyTMD/blob/main/LICENSE
 
 .. |Documentation Status| image:: https://readthedocs.org/projects/pytmd/badge/?version=latest
    :target: https://pytmd.readthedocs.io/en/latest/?badge=latest
 
-.. |Coverage Status| image:: https://codecov.io/gh/tsutterley/pyTMD/branch/main/graph/badge.svg
-   :target: https://codecov.io/gh/tsutterley/pyTMD
-
 .. |PyPI| image:: https://img.shields.io/pypi/v/pyTMD.svg
    :target: https://pypi.python.org/pypi/pyTMD/
 
 .. |conda-forge| image:: https://img.shields.io/conda/vn/conda-forge/pytmd
    :target: https://anaconda.org/conda-forge/pytmd
 
+.. |commits-since| image:: https://img.shields.io/github/commits-since/pyTMD/pyTMD/latest
+   :target: https://github.com/pyTMD/pyTMD/releases
+
 .. |zenodo| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.5555395.svg
    :target: https://doi.org/10.5281/zenodo.5555395
 
@@ -60,7 +60,7 @@ Development version from GitHub:
 
 .. code-block:: bash
 
-   python3 -m pip install git+https://github.com/tsutterley/pyTMD.git
+   python3 -m pip install git+https://github.com/pyTMD/pyTMD.git
 
 Dependencies
 ############
@@ -89,9 +89,9 @@ Download
 ########
 
 | The program homepage is:
-| https://github.com/tsutterley/pyTMD
+| https://github.com/pyTMD/pyTMD
 | A zip archive of the latest version is available directly at:
-| https://github.com/tsutterley/pyTMD/archive/main.zip
+| https://github.com/pyTMD/pyTMD/archive/main.zip
 
 Alternative Software
 ####################
@@ -115,7 +115,7 @@ Contributing
 ############
 
 This project contains work and contributions from the `scientific community <./CONTRIBUTORS.rst>`_.
-If you would like to contribute to the project, please have a look at the `open issues <https://github.com/tsutterley/pyTMD/issues>`_ and the project `code of conduct <./CODE_OF_CONDUCT.rst>`_.
+If you would like to contribute to the project, please have a look at the `open issues <https://github.com/pyTMD/pyTMD/issues>`_ and `discussions board <https://github.com/pyTMD/pyTMD/discussions>`_.
 
 Credits
 #######

{pytmd-2.2.0 → pytmd-2.2.2}/providers/AVISO.json

@@ -268,40 +268,40 @@
         "FES2022": {
             "format": "FES-netcdf",
             "model_file": [
-                "fes2022b/ocean_tide/2n2_fes2022.nc",
-                "fes2022b/ocean_tide/eps2_fes2022.nc",
-                "fes2022b/ocean_tide/j1_fes2022.nc",
-                "fes2022b/ocean_tide/k1_fes2022.nc",
-                "fes2022b/ocean_tide/k2_fes2022.nc",
-                "fes2022b/ocean_tide/l2_fes2022.nc",
-                "fes2022b/ocean_tide/lambda2_fes2022.nc",
-                "fes2022b/ocean_tide/m2_fes2022.nc",
-                "fes2022b/ocean_tide/m3_fes2022.nc",
-                "fes2022b/ocean_tide/m4_fes2022.nc",
-                "fes2022b/ocean_tide/m6_fes2022.nc",
-                "fes2022b/ocean_tide/m8_fes2022.nc",
-                "fes2022b/ocean_tide/mf_fes2022.nc",
-                "fes2022b/ocean_tide/mks2_fes2022.nc",
-                "fes2022b/ocean_tide/mm_fes2022.nc",
-                "fes2022b/ocean_tide/mn4_fes2022.nc",
-                "fes2022b/ocean_tide/ms4_fes2022.nc",
-                "fes2022b/ocean_tide/msf_fes2022.nc",
-                "fes2022b/ocean_tide/msqm_fes2022.nc",
-                "fes2022b/ocean_tide/mtm_fes2022.nc",
-                "fes2022b/ocean_tide/mu2_fes2022.nc",
-                "fes2022b/ocean_tide/n2_fes2022.nc",
-                "fes2022b/ocean_tide/n4_fes2022.nc",
-                "fes2022b/ocean_tide/nu2_fes2022.nc",
-                "fes2022b/ocean_tide/o1_fes2022.nc",
-                "fes2022b/ocean_tide/p1_fes2022.nc",
-                "fes2022b/ocean_tide/q1_fes2022.nc",
-                "fes2022b/ocean_tide/r2_fes2022.nc",
-                "fes2022b/ocean_tide/s1_fes2022.nc",
-                "fes2022b/ocean_tide/s2_fes2022.nc",
-                "fes2022b/ocean_tide/s4_fes2022.nc",
-                "fes2022b/ocean_tide/sa_fes2022.nc",
-                "fes2022b/ocean_tide/ssa_fes2022.nc",
-                "fes2022b/ocean_tide/t2_fes2022.nc"
+                "fes2022b/ocean_tide_20241025/2n2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/eps2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/j1_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/k1_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/k2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/l2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/lambda2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/m2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/m3_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/m4_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/m6_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/m8_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/mf_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/mks2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/mm_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/mn4_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/ms4_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/msf_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/msqm_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/mtm_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/mu2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/n2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/n4_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/nu2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/o1_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/p1_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/q1_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/r2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/s1_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/s2_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/s4_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/sa_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/ssa_fes2022.nc",
+                "fes2022b/ocean_tide_20241025/t2_fes2022.nc"
             ],
             "name": "FES2022",
             "reference": "https://doi.org/10.24400/527896/A01-2024.004",

{pytmd-2.2.0 → pytmd-2.2.2}/providers/providers.json

@@ -81,6 +81,27 @@
             "type": "z",
             "variable": "tide_ocean"
         },
+        "DTU23": {
+            "format": "GOT-ascii",
+            "model_file": [
+                "DTU23_OceanTide/DTU23/K1_DTU23.d",
+                "DTU23_OceanTide/DTU23/K2_DTU23.d",
+                "DTU23_OceanTide/DTU23/M2_DTU23.d",
+                "DTU23_OceanTide/DTU23/M4_DTU23.d",
+                "DTU23_OceanTide/DTU23/N2_DTU23.d",
+                "DTU23_OceanTide/DTU23/O1_DTU23.d",
+                "DTU23_OceanTide/DTU23/P1_DTU23.d",
+                "DTU23_OceanTide/DTU23/Q1_DTU23.d",
+                "DTU23_OceanTide/DTU23/S1_DTU23.d",
+                "DTU23_OceanTide/DTU23/S2_DTU23.d"
+            ],
+            "name": "DTU23",
+            "reference": "https://doi.org/10.3390/rs15184479",
+            "scale": 0.01,
+            "type": "z",
+            "variable": "tide_ocean",
+            "version": "2023"
+        },
         "EOT20": {
             "format": "FES-netcdf",
             "model_file": [

{pytmd-2.2.0 → pytmd-2.2.2}/pyTMD/__init__.py

@@ -24,14 +24,9 @@ import pyTMD.utilities
 import pyTMD.version
 from pyTMD import io
 from pyTMD import solve
-from pyTMD.crs import (
-    crs,
-    datum,
-    _ellipsoids
-)
+from pyTMD.crs import crs
 
 # Deprecated functions
-from pyTMD.check_points import check_points
 from pyTMD.compute_tide_corrections import (
     compute_corrections,
     compute_tide_corrections,
@@ -40,8 +35,6 @@ from pyTMD.compute_tide_corrections import (
     compute_OPT_corrections,
     compute_SET_corrections,
 )
-import pyTMD.eop
-import pyTMD.time
 
 # get semantic version from setuptools-scm
 __version__ = pyTMD.version.version

{pytmd-2.2.0 → pytmd-2.2.2}/pyTMD/arguments.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 u"""
 arguments.py
-Written by Tyler Sutterley (12/2024)
+Written by Tyler Sutterley (02/2025)
 Calculates the nodal corrections for tidal constituents
 Modification of ARGUMENTS fortran subroutine by Richard Ray 03/1999
 
@@ -39,6 +39,9 @@ REFERENCES:
         Ocean Tides", Journal of Atmospheric and Oceanic Technology, (2002).
 
 UPDATE HISTORY:
+    Updated 02/2025: add option to make doodson numbers strings
+        add Doodson number convention for converting 11 to E
+        add Doodson (1921) table for coefficients missing from Cartwright tables
     Updated 12/2024: added function to calculate tidal aliasing periods
     Updated 11/2024: allow variable case for Doodson number formalisms
         fix species in constituent parameters for complex tides
@@ -1488,6 +1491,8 @@ def _love_numbers(
     # return the Love numbers for frequency
     return (h2, k2, l2)
 
+# Doodson (1921) table with values missing from Cartwright tables
+_d1921_table = get_data_path(['data','d1921_tab.txt'])
 # Cartwright and Tayler (1971) table with 3rd-degree values
 _ct1971_table_5 = get_data_path(['data','ct1971_tab5.txt'])
 # Cartwright and Edden (1973) table with updated values
@@ -1542,6 +1547,8 @@ def _to_doodson_number(coef: list | np.ndarray, **kwargs):
     ----------
     coef: list or np.ndarray
         Doodson coefficients (Cartwright numbers) for constituent
+    astype: type, default float
+        Output data type for default case
     raise_error: bool, default True
         Raise exception if constituent is unsupported
 
@@ -1552,24 +1559,26 @@ def _to_doodson_number(coef: list | np.ndarray, **kwargs):
     """
     # default keyword arguments
     kwargs.setdefault('raise_error', True)
+    astype = kwargs.get('astype', float)
     # assert length and verify array
     coef = np.array(coef[:6]).astype(int)
     # add 5 to values following Doodson convention (prevent negatives)
     coef[1:] += 5
     # check for unsupported constituents
-    if (np.any(coef < 0) or np.any(coef > 10)) and kwargs['raise_error']:
+    if (np.any(coef < 0) or np.any(coef > 11)) and kwargs['raise_error']:
         raise ValueError('Unsupported constituent')
-    elif (np.any(coef < 0) or np.any(coef > 10)):
+    elif (np.any(coef < 0) or np.any(coef > 11)):
         return None
-    elif np.any(coef == 10):
-        # convert to string and replace 10 with X (Cartwright convention)
-        DO = [str(v).replace('10','X') for v in coef]
+    elif np.any(coef == 10) or np.any(coef == 11):
+        # convert coefficients to strings
+        # replace 10 with X and 11 with E (Doodson convention)
+        DO = [str(v).replace('10','X').replace('11','E') for v in coef]
         # convert to Doodson number
         return np.str_('{0}{1}{2}.{3}{4}{5}'.format(*DO))
     else:
         # convert to single number and round off floating point errors
         DO = np.sum([v*10**(2-o) for o,v in enumerate(coef)])
-        return np.round(DO, decimals=3)
+        return np.round(DO, decimals=3).astype(astype)
 
 def _to_extended_doodson(coef: list | np.ndarray, **kwargs):
     """
@@ -1610,8 +1619,9 @@ def _from_doodson_number(DO: str | float | np.ndarray, **kwargs):
         Doodson coefficients (Cartwright numbers) for constituent
     """
     # convert from Doodson number to Cartwright numbers
-    coef = [c.replace('X', '10') for c in re.findall(r'\w', str(DO).zfill(7))]
-    coef = np.array(coef, dtype=int)
+    # replace 10 with X and 11 with E (Doodson convention)
+    coef = np.array([c.replace('X', '10').replace('E', '11')
+        for c in re.findall(r'\w', str(DO).zfill(7))], dtype=int)
     # remove 5 from values following Doodson convention
     coef[1:] -= 5
     return coef

{pytmd-2.2.0 → pytmd-2.2.2}/pyTMD/astro.py

@@ -8,8 +8,8 @@ PYTHON DEPENDENCIES:
     numpy: Scientific Computing Tools For Python
         https://numpy.org
         https://numpy.org/doc/stable/user/numpy-for-matlab-users.html
-    PyEphem: Astronomical Ephemeris for Python
-        https://rhodesmill.org/pyephem/
+    jplephem: Astronomical Ephemeris for Python
+        https://pypi.org/project/jplephem/
 
 REFERENCES:
     Jean Meeus, Astronomical Algorithms, 2nd edition, 1998.

{pytmd-2.2.0 → pytmd-2.2.2}/pyTMD/compute.py

@@ -153,6 +153,7 @@ __all__ = [
     "corrections",
     "tide_elevations",
     "tide_currents",
+    "tide_masks",
     "LPET_elevations",
     "LPT_displacements",
     "OPT_displacements",
@@ -219,7 +220,7 @@ def tide_elevations(
         CROP: bool = False,
         BOUNDS: list | np.ndarray | None = None,
         BUFFER: int | float | None = None,
-        EPSG: str | int = 3031,
+        EPSG: str | int = 4326,
         EPOCH: list | tuple = (2000, 1, 1, 0, 0, 0),
         TYPE: str | None = 'drift',
         TIME: str = 'UTC',
@@ -260,7 +261,7 @@ def tide_elevations(
         Boundaries for cropping tide model data
     BUFFER: int, float or NoneType, default None
         Buffer distance for cropping tide model data
-    EPSG: int, default: 3031 (Polar Stereographic South, WGS84)
+    EPSG: int, default: 4326 (WGS84 Latitude and Longitude)
         Input coordinate system
     EPOCH: tuple, default (2000,1,1,0,0,0)
         Time period for calculating delta times
@@ -447,7 +448,7 @@ def tide_currents(
         CROP: bool = False,
         BOUNDS: list | np.ndarray | None = None,
         BUFFER: int | float | None = None,
-        EPSG: str | int = 3031,
+        EPSG: str | int = 4326,
         EPOCH: list | tuple = (2000, 1, 1, 0, 0, 0),
         TYPE: str | None = 'drift',
         TIME: str = 'UTC',
@@ -486,7 +487,7 @@ def tide_currents(
         Boundaries for cropping tide model data
     BUFFER: int, float or NoneType, default None
         Buffer distance for cropping tide model data
-    EPSG: int, default: 3031 (Polar Stereographic South, WGS84)
+    EPSG: int, default: 4326 (WGS84 Latitude and Longitude)
         Input coordinate system
     EPOCH: tuple, default (2000,1,1,0,0,0)
         Time period for calculating delta times
@@ -666,7 +667,7 @@ def tide_masks(x: np.ndarray, y: np.ndarray,
         MODEL: str | None = None,
         GZIP: bool = False,
         DEFINITION_FILE: str | pathlib.Path | None = None,
-        EPSG: str | int = 3031,
+        EPSG: str | int = 4326,
         METHOD: str = 'spline'
     ):
     """
@@ -686,7 +687,7 @@ def tide_masks(x: np.ndarray, y: np.ndarray,
         Tide model files are gzip compressed
     DEFINITION_FILE: str or NoneType, default None
         Tide model definition file for use
-    EPSG: str or int, default: 3031 (Polar Stereographic South, WGS84)
+    EPSG: str or int, default: 4326 (WGS84 Latitude and Longitude)
         Input coordinate system
     METHOD: str, default 'spline'
         interpolation method
@@ -794,7 +795,7 @@ def tide_masks(x: np.ndarray, y: np.ndarray,
 # PURPOSE: compute long-period equilibrium tidal elevations
 def LPET_elevations(
         x: np.ndarray, y: np.ndarray, delta_time: np.ndarray,
-        EPSG: str | int = 3031,
+        EPSG: str | int = 4326,
         EPOCH: list | tuple = (2000, 1, 1, 0, 0, 0),
         TYPE: str | None = 'drift',
         TIME: str = 'UTC',
@@ -811,7 +812,7 @@ def LPET_elevations(
         y-coordinates in projection EPSG
     delta_time: np.ndarray
         seconds since EPOCH or datetime array
-    EPSG: int, default: 3031 (Polar Stereographic South, WGS84)
+    EPSG: int, default: 4326 (WGS84 Latitude and Longitude)
         Input coordinate system
     EPOCH: tuple, default (2000,1,1,0,0,0)
         Time period for calculating delta times
@@ -899,7 +900,7 @@ def LPET_elevations(
 # following IERS Convention (2010) guidelines
 def LPT_displacements(
         x: np.ndarray, y: np.ndarray, delta_time: np.ndarray,
-        EPSG: str | int = 3031,
+        EPSG: str | int = 4326,
         EPOCH: list | tuple = (2000, 1, 1, 0, 0, 0),
         TYPE: str | None = 'drift',
         TIME: str = 'UTC',
@@ -920,7 +921,7 @@ def LPT_displacements(
         y-coordinates in projection EPSG
     delta_time: np.ndarray
         seconds since EPOCH or datetime array
-    EPSG: int, default: 3031 (Polar Stereographic South, WGS84)
+    EPSG: int, default: 4326 (WGS84 Latitude and Longitude)
         Input coordinate system
     EPOCH: tuple, default (2000,1,1,0,0,0)
         Time period for calculating delta times
@@ -959,7 +960,7 @@ def LPT_displacements(
 
     # validate input arguments
     assert TIME.lower() in ('gps', 'loran', 'tai', 'utc', 'datetime')
-    assert ELLIPSOID.upper() in pyTMD._ellipsoids
+    assert ELLIPSOID.upper() in pyTMD.spatial._ellipsoids
     assert CONVENTION.isdigit() and CONVENTION in timescale.eop._conventions
     # determine input data type based on variable dimensions
     if not TYPE:
@@ -998,7 +999,7 @@ def LPT_displacements(
     # degrees to radians
     dtr = np.pi/180.0
     # earth and physical parameters for ellipsoid
-    units = pyTMD.datum(ellipsoid=ELLIPSOID, units='MKS')
+    units = pyTMD.spatial.datum(ellipsoid=ELLIPSOID, units='MKS')
     # tidal love/shida numbers appropriate for the load tide
     hb2 = 0.6207
     lb2 = 0.0836
@@ -1099,7 +1100,7 @@ def LPT_displacements(
 # following IERS Convention (2010) guidelines
 def OPT_displacements(
         x: np.ndarray, y: np.ndarray, delta_time: np.ndarray,
-        EPSG: str | int = 3031,
+        EPSG: str | int = 4326,
         EPOCH: list | tuple = (2000, 1, 1, 0, 0, 0),
         TYPE: str | None = 'drift',
         TIME: str = 'UTC',
@@ -1121,7 +1122,7 @@ def OPT_displacements(
         y-coordinates in projection EPSG
     delta_time: np.ndarray
         seconds since EPOCH or datetime array
-    EPSG: int, default: 3031 (Polar Stereographic South, WGS84)
+    EPSG: int, default: 4326 (WGS84 Latitude and Longitude)
         Input coordinate system
     EPOCH: tuple, default (2000,1,1,0,0,0)
         Time period for calculating delta times
@@ -1166,7 +1167,7 @@ def OPT_displacements(
 
     # validate input arguments
     assert TIME.lower() in ('gps', 'loran', 'tai', 'utc', 'datetime')
-    assert ELLIPSOID.upper() in pyTMD._ellipsoids
+    assert ELLIPSOID.upper() in pyTMD.spatial._ellipsoids
     assert CONVENTION.isdigit() and CONVENTION in timescale.eop._conventions
     assert METHOD.lower() in ('bilinear', 'spline', 'linear', 'nearest')
     # determine input data type based on variable dimensions
@@ -1213,7 +1214,7 @@ def OPT_displacements(
     # degrees to radians
     dtr = np.pi/180.0
     # earth and physical parameters for ellipsoid
-    units = pyTMD.datum(ellipsoid=ELLIPSOID, units='MKS')
+    units = pyTMD.spatial.datum(ellipsoid=ELLIPSOID, units='MKS')
     # mean equatorial gravitational acceleration [m/s^2]
     ge = 9.7803278
     # density of sea water [kg/m^3]
@@ -1327,7 +1328,7 @@ def OPT_displacements(
 # PURPOSE: compute solid earth tidal elevations
 def SET_displacements(
         x: np.ndarray, y: np.ndarray, delta_time: np.ndarray,
-        EPSG: str | int = 3031,
+        EPSG: str | int = 4326,
         EPOCH: list | tuple = (2000, 1, 1, 0, 0, 0),
         TYPE: str | None = 'drift',
         TIME: str = 'UTC',
@@ -1348,7 +1349,7 @@ def SET_displacements(
         y-coordinates in projection EPSG
     delta_time: np.ndarray
         seconds since EPOCH or datetime array
-    EPSG: int, default: 3031 (Polar Stereographic South, WGS84)
+    EPSG: int, default: 4326 (WGS84 Latitude and Longitude)
         Input coordinate system
     EPOCH: tuple, default (2000,1,1,0,0,0)
         Time period for calculating delta times
@@ -1426,7 +1427,7 @@ def SET_displacements(
     nt = len(ts)
 
     # earth and physical parameters for ellipsoid
-    units = pyTMD.datum(ellipsoid=ELLIPSOID, units='MKS')
+    units = pyTMD.spatial.datum(ellipsoid=ELLIPSOID, units='MKS')
 
     # convert input coordinates to cartesian
     X, Y, Z = pyTMD.spatial.to_cartesian(lon, lat,