pyTMD 2.2.7__tar.gz → 2.2.8__tar.gz

{pytmd-2.2.7 → pytmd-2.2.8}/MANIFEST.in

@@ -2,6 +2,7 @@ graft pyTMD/data
 prune .github*
 prune doc*
 prune notebooks*
+prune providers*
 prune run*
 prune test*
 exclude *.cfg

pytmd-2.2.8/PKG-INFO

@@ -0,0 +1,224 @@
+Metadata-Version: 2.4
+Name: pyTMD
+Version: 2.2.8
+Summary: Python-based tidal prediction software for estimating ocean, load, solid Earth and pole tides
+Author: Tyler Sutterley
+Author-email: tsutterl@uw.edu
+Maintainer: pyTMD contributors
+License: MIT License
+        
+        Copyright (c) 2017 Tyler C Sutterley
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
+Project-URL: Homepage, https://pytmd.readthedocs.io
+Project-URL: Documentation, https://pytmd.readthedocs.io
+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
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Scientific/Engineering :: Physics
+Classifier: Topic :: Scientific/Engineering :: Oceanography
+Requires-Python: ~=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: lxml
+Requires-Dist: netCDF4
+Requires-Dist: numpy
+Requires-Dist: pyproj
+Requires-Dist: python-dateutil
+Requires-Dist: scipy>=1.10.1
+Requires-Dist: timescale>=0.0.8
+Provides-Extra: doc
+Requires-Dist: docutils; extra == "doc"
+Requires-Dist: graphviz; extra == "doc"
+Requires-Dist: myst-nb; extra == "doc"
+Requires-Dist: numpydoc; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx-argparse>=0.4; extra == "doc"
+Requires-Dist: sphinxcontrib-bibtex; extra == "doc"
+Requires-Dist: sphinx-design; extra == "doc"
+Requires-Dist: sphinx_rtd_theme; extra == "doc"
+Provides-Extra: all
+Requires-Dist: cartopy; extra == "all"
+Requires-Dist: ipyleaflet; extra == "all"
+Requires-Dist: ipywidgets; extra == "all"
+Requires-Dist: jplephem; extra == "all"
+Requires-Dist: matplotlib; extra == "all"
+Requires-Dist: notebook; extra == "all"
+Requires-Dist: pandas; extra == "all"
+Provides-Extra: aws
+Requires-Dist: xarray; extra == "aws"
+Requires-Dist: dask; extra == "aws"
+Requires-Dist: zarr>=3; extra == "aws"
+Requires-Dist: h5netcdf; extra == "aws"
+Requires-Dist: geopandas; extra == "aws"
+Requires-Dist: pyarrow; extra == "aws"
+Requires-Dist: obstore; extra == "aws"
+Requires-Dist: s3fs; extra == "aws"
+Provides-Extra: dev
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pytest>=4.6; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-xdist; extra == "dev"
+Requires-Dist: oct2py; extra == "dev"
+Requires-Dist: boto3; extra == "dev"
+Dynamic: license-file
+
+# pyTMD
+
+[![License](https://img.shields.io/github/license/pyTMD/pyTMD)](https://github.com/pyTMD/pyTMD/blob/main/LICENSE)
+[![Documentation Status](https://readthedocs.org/projects/pytmd/badge/?version=latest)](https://pytmd.readthedocs.io/en/latest/?badge=latest)
+[![PyPI](https://img.shields.io/pypi/v/pyTMD.svg)](https://pypi.python.org/pypi/pyTMD/)
+[![conda-forge](https://img.shields.io/conda/vn/conda-forge/pytmd)](https://anaconda.org/conda-forge/pytmd)
+[![commits-since](https://img.shields.io/github/commits-since/pyTMD/pyTMD/latest)](https://github.com/pyTMD/pyTMD/releases/latest)
+[![zenodo](https://zenodo.org/badge/DOI/10.5281/zenodo.5555395.svg)](https://doi.org/10.5281/zenodo.5555395)
+
+Python-based tidal prediction software for estimating ocean, load, solid Earth and pole tides
+
+For more information: see the documentation at [pytmd.readthedocs.io](https://pytmd.readthedocs.io/)
+
+## Installation
+
+From PyPI:
+
+```bash
+python3 -m pip install pyTMD
+```
+
+To include all optional dependencies:
+
+```bash
+python3 -m pip install pyTMD[all]
+```
+
+Using `conda` or `mamba` from conda-forge:
+
+```bash
+conda install -c conda-forge pytmd
+```
+
+```bash
+mamba install -c conda-forge pytmd
+```
+
+Development version from GitHub:
+
+```bash
+python3 -m pip install git+https://github.com/pyTMD/pyTMD.git
+```
+
+### Running with Pixi
+
+Alternatively, you can use [Pixi](https://pixi.sh/) for a streamlined workspace environment:
+
+1. Install Pixi following the [installation instructions](https://pixi.sh/latest/#installation)
+2. Clone the project repository:
+
+```bash
+git clone https://github.com/pyTMD/pyTMD.git
+```
+
+3. Move into the `pyTMD` directory
+
+```bash
+cd pyTMD
+```
+
+4. Install dependencies and start JupyterLab:
+
+```bash
+pixi run start
+```
+
+This will automatically create the environment, install all dependencies, and launch JupyterLab in the [notebooks](./doc/source/notebooks/) directory.
+
+## Dependencies
+
+- [dateutil: powerful extensions to datetime](https://dateutil.readthedocs.io/en/stable/)
+- [lxml: processing XML and HTML in Python](https://pypi.python.org/pypi/lxml)
+- [netCDF4: Python interface to the netCDF C library](https://unidata.github.io/netcdf4-python/)
+- [numpy: Scientific Computing Tools For Python](https://www.numpy.org)
+- [pyproj: Python interface to PROJ library](https://pypi.org/project/pyproj/)
+- [scipy: Scientific Tools for Python](https://www.scipy.org/)
+- [timescale: Python tools for time and astronomical calculations](https://pypi.org/project/timescale/)
+
+## References
+
+> T. C. Sutterley, T. Markus, T. A. Neumann, M. R. van den Broeke, J. M. van Wessem, and S. R. M. Ligtenberg,
+> "Antarctic ice shelf thickness change from multimission lidar mapping", *The Cryosphere*,
+> 13, 1801-1817, (2019). [doi: 10.5194/tc-13-1801-2019](https://doi.org/10.5194/tc-13-1801-2019)
+>
+> L. Padman, M. R. Siegfried, H. A. Fricker,
+> "Ocean Tide Influences on the Antarctic and Greenland Ice Sheets", *Reviews of Geophysics*,
+> 56, 142-184, (2018). [doi: 10.1002/2016RG000546](https://doi.org/10.1002/2016RG000546)
+
+## Download
+
+The program homepage is:  
+<https://github.com/pyTMD/pyTMD>
+
+A zip archive of the latest version is available directly at:  
+<https://github.com/pyTMD/pyTMD/archive/main.zip>
+
+## Alternative Software
+
+perth5 from NASA Goddard Space Flight Center:  
+<https://codeberg.org/rray/perth5>
+
+Matlab Tide Model Driver from Earth & Space Research:  
+<https://github.com/EarthAndSpaceResearch/TMD_Matlab_Toolbox_v2.5>
+
+Fortran OSU Tidal Prediction Software:  
+<https://www.tpxo.net/otps>
+
+## Disclaimer
+
+This package includes software developed at NASA Goddard Space Flight Center (GSFC) and the University of Washington Applied Physics Laboratory (UW-APL).
+It is not sponsored or maintained by the Universities Space Research Association (USRA), AVISO or NASA.
+The software is provided here for your convenience but *with no guarantees whatsoever*.
+It should not be used for coastal navigation or any application that may risk life or property.
+
+## 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 [contribution guidelines](./doc/source/getting_started/Contributing.rst), [open issues](https://github.com/pyTMD/pyTMD/issues) and [discussions board](https://github.com/pyTMD/pyTMD/discussions).
+
+## Credits
+
+The Tidal Model Driver ([TMD](https://github.com/EarthAndSpaceResearch/TMD_Matlab_Toolbox_v2.5)) Matlab Toolbox was developed by Laurie Padman, Lana Erofeeva and Susan Howard.
+An updated version of the TMD Matlab Toolbox ([TMD3](https://github.com/chadagreene/Tide-Model-Driver)) was developed by Chad Greene.
+The OSU Tidal Inversion Software (OTIS) and OSU Tidal Prediction Software ([OTPS](https://www.tpxo.net/otps)) were developed by Lana Erofeeva and Gary Egbert ([copyright OSU](https://www.tpxo.net/tpxo-products-and-registration), licensed for non-commercial use).
+The NASA Goddard Space Flight Center (GSFC) PREdict Tidal Heights (PERTH3) software was developed by Richard Ray and Remko Scharroo.
+An updated and more versatile version of the NASA GSFC tidal prediction software ([PERTH5](https://codeberg.org/rray/perth5)) was developed by Richard Ray.
+
+## License
+
+The content of this project is licensed under the [Creative Commons Attribution 4.0 Attribution license](https://creativecommons.org/licenses/by/4.0/) and the source code is licensed under the [MIT license](LICENSE).

pytmd-2.2.8/README.md

@@ -0,0 +1,130 @@
+# pyTMD
+
+[![License](https://img.shields.io/github/license/pyTMD/pyTMD)](https://github.com/pyTMD/pyTMD/blob/main/LICENSE)
+[![Documentation Status](https://readthedocs.org/projects/pytmd/badge/?version=latest)](https://pytmd.readthedocs.io/en/latest/?badge=latest)
+[![PyPI](https://img.shields.io/pypi/v/pyTMD.svg)](https://pypi.python.org/pypi/pyTMD/)
+[![conda-forge](https://img.shields.io/conda/vn/conda-forge/pytmd)](https://anaconda.org/conda-forge/pytmd)
+[![commits-since](https://img.shields.io/github/commits-since/pyTMD/pyTMD/latest)](https://github.com/pyTMD/pyTMD/releases/latest)
+[![zenodo](https://zenodo.org/badge/DOI/10.5281/zenodo.5555395.svg)](https://doi.org/10.5281/zenodo.5555395)
+
+Python-based tidal prediction software for estimating ocean, load, solid Earth and pole tides
+
+For more information: see the documentation at [pytmd.readthedocs.io](https://pytmd.readthedocs.io/)
+
+## Installation
+
+From PyPI:
+
+```bash
+python3 -m pip install pyTMD
+```
+
+To include all optional dependencies:
+
+```bash
+python3 -m pip install pyTMD[all]
+```
+
+Using `conda` or `mamba` from conda-forge:
+
+```bash
+conda install -c conda-forge pytmd
+```
+
+```bash
+mamba install -c conda-forge pytmd
+```
+
+Development version from GitHub:
+
+```bash
+python3 -m pip install git+https://github.com/pyTMD/pyTMD.git
+```
+
+### Running with Pixi
+
+Alternatively, you can use [Pixi](https://pixi.sh/) for a streamlined workspace environment:
+
+1. Install Pixi following the [installation instructions](https://pixi.sh/latest/#installation)
+2. Clone the project repository:
+
+```bash
+git clone https://github.com/pyTMD/pyTMD.git
+```
+
+3. Move into the `pyTMD` directory
+
+```bash
+cd pyTMD
+```
+
+4. Install dependencies and start JupyterLab:
+
+```bash
+pixi run start
+```
+
+This will automatically create the environment, install all dependencies, and launch JupyterLab in the [notebooks](./doc/source/notebooks/) directory.
+
+## Dependencies
+
+- [dateutil: powerful extensions to datetime](https://dateutil.readthedocs.io/en/stable/)
+- [lxml: processing XML and HTML in Python](https://pypi.python.org/pypi/lxml)
+- [netCDF4: Python interface to the netCDF C library](https://unidata.github.io/netcdf4-python/)
+- [numpy: Scientific Computing Tools For Python](https://www.numpy.org)
+- [pyproj: Python interface to PROJ library](https://pypi.org/project/pyproj/)
+- [scipy: Scientific Tools for Python](https://www.scipy.org/)
+- [timescale: Python tools for time and astronomical calculations](https://pypi.org/project/timescale/)
+
+## References
+
+> T. C. Sutterley, T. Markus, T. A. Neumann, M. R. van den Broeke, J. M. van Wessem, and S. R. M. Ligtenberg,
+> "Antarctic ice shelf thickness change from multimission lidar mapping", *The Cryosphere*,
+> 13, 1801-1817, (2019). [doi: 10.5194/tc-13-1801-2019](https://doi.org/10.5194/tc-13-1801-2019)
+>
+> L. Padman, M. R. Siegfried, H. A. Fricker,
+> "Ocean Tide Influences on the Antarctic and Greenland Ice Sheets", *Reviews of Geophysics*,
+> 56, 142-184, (2018). [doi: 10.1002/2016RG000546](https://doi.org/10.1002/2016RG000546)
+
+## Download
+
+The program homepage is:  
+<https://github.com/pyTMD/pyTMD>
+
+A zip archive of the latest version is available directly at:  
+<https://github.com/pyTMD/pyTMD/archive/main.zip>
+
+## Alternative Software
+
+perth5 from NASA Goddard Space Flight Center:  
+<https://codeberg.org/rray/perth5>
+
+Matlab Tide Model Driver from Earth & Space Research:  
+<https://github.com/EarthAndSpaceResearch/TMD_Matlab_Toolbox_v2.5>
+
+Fortran OSU Tidal Prediction Software:  
+<https://www.tpxo.net/otps>
+
+## Disclaimer
+
+This package includes software developed at NASA Goddard Space Flight Center (GSFC) and the University of Washington Applied Physics Laboratory (UW-APL).
+It is not sponsored or maintained by the Universities Space Research Association (USRA), AVISO or NASA.
+The software is provided here for your convenience but *with no guarantees whatsoever*.
+It should not be used for coastal navigation or any application that may risk life or property.
+
+## 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 [contribution guidelines](./doc/source/getting_started/Contributing.rst), [open issues](https://github.com/pyTMD/pyTMD/issues) and [discussions board](https://github.com/pyTMD/pyTMD/discussions).
+
+## Credits
+
+The Tidal Model Driver ([TMD](https://github.com/EarthAndSpaceResearch/TMD_Matlab_Toolbox_v2.5)) Matlab Toolbox was developed by Laurie Padman, Lana Erofeeva and Susan Howard.
+An updated version of the TMD Matlab Toolbox ([TMD3](https://github.com/chadagreene/Tide-Model-Driver)) was developed by Chad Greene.
+The OSU Tidal Inversion Software (OTIS) and OSU Tidal Prediction Software ([OTPS](https://www.tpxo.net/otps)) were developed by Lana Erofeeva and Gary Egbert ([copyright OSU](https://www.tpxo.net/tpxo-products-and-registration), licensed for non-commercial use).
+The NASA Goddard Space Flight Center (GSFC) PREdict Tidal Heights (PERTH3) software was developed by Richard Ray and Remko Scharroo.
+An updated and more versatile version of the NASA GSFC tidal prediction software ([PERTH5](https://codeberg.org/rray/perth5)) was developed by Richard Ray.
+
+## License
+
+The content of this project is licensed under the [Creative Commons Attribution 4.0 Attribution license](https://creativecommons.org/licenses/by/4.0/) and the source code is licensed under the [MIT license](LICENSE).

{pytmd-2.2.7 → pytmd-2.2.8}/pyTMD/arguments.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 u"""
 arguments.py
-Written by Tyler Sutterley (08/2025)
+Written by Tyler Sutterley (09/2025)
 Calculates the nodal corrections for tidal constituents
 Modification of ARGUMENTS fortran subroutine by Richard Ray 03/1999
 
@@ -39,6 +39,7 @@ REFERENCES:
         Ocean Tides", Journal of Atmospheric and Oceanic Technology, (2002).
 
 UPDATE HISTORY:
+    Updated 09/2025: added spherical harmonic degree to tide potential tables
     Updated 08/2025: add Cartwright and Tayler table with radiational tides
         make frequency function a wrapper around one that calculates using
             Doodson coefficients (Cartwright numbers)
@@ -1773,6 +1774,8 @@ def _frequency(
             - ``'Meeus'``
             - ``'ASTRO5'`` 
             - ``'IERS'``
+    include_planets: bool, default False
+        Include planetary terms in the frequency calculation
 
     Returns
     -------
@@ -1781,6 +1784,7 @@ def _frequency(
     """
     # set default keyword arguments
     kwargs.setdefault('method', 'Cartwright')
+    kwargs.setdefault('include_planets', False)
     # Modified Julian Dates at J2000
     MJD = np.array([51544.5, 51544.55])
     # time interval in seconds
@@ -1799,7 +1803,13 @@ def _frequency(
     k = 90.0 + np.zeros((nt))
 
     # determine equilibrium arguments
-    fargs = np.c_[tau, s, h, p, n, pp, k]
+    if kwargs['include_planets']:
+        lm, lv, la, lj, ls = pyTMD.astro.planetary_longitudes(MJD)
+        fargs = np.c_[tau, s, h, p, n, pp, k, lm, lv, la, lj, ls]
+    else:
+        fargs = np.c_[tau, s, h, p, n, pp, k]
+
+    # calculate the rates of change of the fundamental arguments
     rates = (fargs[1,:] - fargs[0,:])/deltat
     fd = np.dot(rates, coef)
     # convert to radians per second
@@ -1986,8 +1996,8 @@ def _complex_love_numbers(
         # frequency dependence of Love number l2
         L2 = np.zeros((4), dtype=np.complex128)
         L2[0] = 0.84963e-1 - 0.7395e-3j
-        L2[1] = -0.22107e-3 - 0.9446e-5j
-        L2[2] = 0.54710e-5 - 0.2990e-6j
+        L2[1] = -0.22107e-3 - 0.9646e-5j
+        L2[2] = -0.54710e-5 - 0.2990e-6j
         L2[3] = -0.29904e-7 - 0.7717e-8j
         # estimate the complex Love number fors diurnal tides
         # equation 6.9 of IERS conventions 2010
@@ -2002,19 +2012,23 @@ def _complex_love_numbers(
 # Hs1: amplitude for epoch span 1 (1900 epoch)
 _d1921_table = get_data_path(['data','d1921_tab.txt'])
 # Cartwright and Tayler (1971) table with 3rd-degree values
-# Hs1: amplitude for epoch span 1 (1861-09-21 to 1879-09-22)
-# Hs2: amplitude for epoch span 2 (1915-05-16 to 1933-05-22)
-# Hs3: amplitude for epoch span 2 (1951-05-23 to 1969-05-22)
-_ct1971_table_5 = get_data_path(['data','ct1971_tab5.txt'])
 # Cartwright and Edden (1973) table with updated values
-_ce1973_table_1 = get_data_path(['data','ce1973_tab1.txt'])
+_cte1973_table = get_data_path(['data','cte1973_tab.txt'])
 # Cartwright and Tayler (1971) table with radiational tides
-# Hs1: amplitude for epoch span 1 (1900 epoch)
 _ct1971_table_6 = get_data_path(['data','ct1971_tab6.txt'])
+# Hartmann and Wenzel (1995) tidal potential catalog
+_hw1995_table = get_data_path(['data','hw1995_tab.txt'])
+# Tamura (1987) tidal potential catalog
+_t1987_table = get_data_path(['data','t1987_tab.txt'])
+# Woodworth (1990) tables with updated and 3rd-degree values
+_w1990_table = get_data_path(['data','w1990_tab.txt'])
 
 def _parse_tide_potential_table(
         table: str | pathlib.Path,
-        columns: int = 3,
+        skiprows: int = 1,
+        columns: int = 1,
+        include_degree: bool = True,
+        include_planets: bool = False
     ):
     """Parse tables of tide-generating potential
 
@@ -2022,12 +2036,18 @@ def _parse_tide_potential_table(
     ----------
     table: str or pathlib.Path
         table of tide-generating potentials
-    columns: int, default 3
+    skiprows: int, default 1
+        number of header rows to skip in the table
+    columns: int, default 1
         number of amplitude columns in the table
+    include_degree: bool, default True
+        table includes spherical harmonic degree
+    include_planets: bool, default False
+        table includes coefficients for mean longitudes of planets
 
     Returns
     -------
-    CTE: float
+    CTE: np.ndarray
         Cartwright-Tayler-Edden table values
     """
     # verify table path
@@ -2035,15 +2055,32 @@ def _parse_tide_potential_table(
     with table.open(mode='r', encoding='utf8') as f:
         file_contents = f.readlines()
     # number of lines in the file
-    file_lines = len(file_contents)
-    # tau: coefficient for mean lunar time
+    file_lines = len(file_contents) - int(skiprows)
+    # names: names of the columns in the table
+    # formats: data types for each column in the table
+    names = []
+    formats = []
+    # l: spherical harmonic degree
+    if include_degree:
+        names.append('l')
+        formats.append('i')
+    # tau: spherical harmonic dependence (order)
     # s: coefficient for mean longitude of moon
     # h: coefficient for mean longitude of sun
     # p: coefficient for mean longitude of lunar perigee
     # n: coefficient for mean longitude of ascending lunar node
     # pp: coefficient for mean longitude of solar perigee
-    names = ['tau','s','h','p','n','pp']
-    formats = ['i','i','i','i','i','i']
+    names.extend(['tau','s','h','p','n','pp'])
+    formats.extend(['i','i','i','i','i','i'])
+    # lme: coefficient for mean longitude of Mercury
+    # lve: coefficient for mean longitude of Venus
+    # lma: coefficient for mean longitude of Mars
+    # lju: coefficient for mean longitude of Jupiter
+    # lsa: coefficient for mean longitude of Saturn
+    if include_planets:
+        names.extend(['lme','lve','lma','lju','lsa'])
+        formats.extend(['i','i','i','i','i'])
+    # tide potential amplitudes (Cartwright and Tayler norm)
     for c in range(columns):
         # add amplitude columns to names and formats
         names.append(f'Hs{c+1}')
@@ -2052,16 +2089,14 @@ def _parse_tide_potential_table(
     names.append('DO')
     formats.append('U7')
     # create a structured numpy dtype for the table
-    # names: names of the columns in the table
-    # formats: data types for each column in the table
     dtype = np.dtype({'names':names, 'formats':formats})
     CTE = np.zeros((file_lines), dtype=dtype)
-    # number of output columns
-    columns = len(names)
+    # total number of output columns
+    total_columns = len(names)
     # iterate over each line in the file
-    for i,line in enumerate(file_contents):
-        # drop last column with values from Doodson (1921)
-        CTE[i] = np.array(tuple(line.split()[:columns]), dtype=dtype)
+    for i,line in enumerate(file_contents[skiprows:]):
+        # drop last column(s) with values from Doodson (1921)
+        CTE[i] = np.array(tuple(line.split()[:total_columns]), dtype=dtype)
     # return the table values
     return CTE
 

{pytmd-2.2.7 → pytmd-2.2.8}/pyTMD/astro.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 u"""
 astro.py
-Written by Tyler Sutterley (08/2025)
+Written by Tyler Sutterley (09/2025)
 Astronomical and nutation routines
 
 PYTHON DEPENDENCIES:
@@ -18,6 +18,7 @@ REFERENCES:
     Oliver Montenbruck, Practical Ephemeris Calculations, 1989.
 
 UPDATE HISTORY:
+    Updated 09/2025: added function to compute the planetary mean longitudes
     Updated 08/2025: convert angles with numpy radians and degrees functions
         convert arcseconds to radians with asec2rad function in math.py
         convert microarcseconds to radians with masec2rad function in math.py
@@ -86,6 +87,7 @@ jplephem.spk = import_dependency('jplephem.spk')
 
 __all__ = [
     "mean_longitudes",
+    "planetary_longitudes",
     "phase_angles",
     "doodson_arguments",
     "delaunay_arguments",
@@ -250,6 +252,56 @@ def mean_longitudes(
     # return as tuple
     return (S, H, P, N, Ps)
 
+# PURPOSE: compute the mean longitudes of the 5 closest planets
+def planetary_longitudes(MJD: np.ndarray):
+    r"""
+    Computes the astronomical mean longitudes of the 5 closest planets
+    :cite:p:`Meeus:1991vh,Simon:1994vo`
+
+    Parameters
+    ----------
+    MJD: np.ndarray
+        Modified Julian Day (MJD) of input date
+
+    Returns
+    -------
+    LMe: np.ndarray
+        mean longitude of Mercury (degrees)
+    LVe: np.ndarray
+        mean longitude of Venus (degrees)
+    LMa: np.ndarray
+        mean longitude of Mars (degrees)
+    LJu: np.ndarray
+        mean longitude of Jupiter (degrees)
+    LSa: np.ndarray
+        mean longitude of Saturn (degrees)
+    """
+    # convert from MJD to centuries relative to 2000-01-01T12:00:00
+    T = (MJD - _mjd_j2000)/_century
+    # mean longitudes of Mercury
+    mercury_longitude = np.array([252.250906, 149474.0722491, 3.035e-4, 1.8e-8])
+    LMe = polynomial_sum(mercury_longitude, T)
+    # mean longitudes of Venus
+    venus_longitude = np.array([181.9798001, 58519.2130302, 3.1014e-4, 1.5e-8])
+    LVe = polynomial_sum(venus_longitude, T)
+    # mean longitudes of Mars
+    mars_longitude = np.array([355.433, 19141.6964471, 3.1052e-4, 1.e-8])
+    LMa = polynomial_sum(mars_longitude, T)
+    # mean longitudes of Jupiter
+    jupiter_longitude = np.array([34.351519, 3036.3027748, 2.233e-4, 3.7e-8])
+    LJu = polynomial_sum(jupiter_longitude, T)
+    # mean longitudes of Saturn
+    saturn_longitude = np.array([50.077444, 1223.5110686, 5.1908-4, -3.0e-8])
+    LSa = polynomial_sum(saturn_longitude, T)
+    # take the modulus of each
+    LMe = normalize_angle(LMe)
+    LVe = normalize_angle(LVe)
+    LMa = normalize_angle(LMa)
+    LJu = normalize_angle(LJu)
+    LSa = normalize_angle(LSa)
+    # return as tuple
+    return (LMe, LVe, LMa, LJu, LSa)
+
 # PURPOSE: computes the phase angles of astronomical means
 def phase_angles(MJD: np.ndarray):
     # raise warning for deprecated function call