elp-mpp02 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

elp_mpp02/__init__.py

@@ -1 +1,27 @@
+# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: EUPL-1.2
+#  
+#  Copyright (c) 2019-2025  Marc van der Sluys - Nikhef/Utrecht University - marc.vandersluys.nl
+#   
+#  This file is part of the evTool Python package:
+#  Analyse and display output from the binary stellar-evolution code ev (a.k.a. STARS or TWIN).
+#  See: https://github.com/MarcvdSluys/evTool
+#   
+#  This is free software: you can redistribute it and/or modify it under the terms of the European Union
+#  Public Licence 1.2 (EUPL 1.2).  This software is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#  PURPOSE.  See the EU Public Licence for more details.  You should have received a copy of the European
+#  Union Public Licence along with this code.  If not, see <https://www.eupl.eu/1.2/en/>.
+
+
+"""Accurate Moon positions using the Lunar solution ELP/MPP02
+
+This module uses the semi-analytical Lunar solution ELP2000/MPP02 to compute the geocentric position of the
+Moon in the dynamical mean ecliptic and equinox of J2000.  This Python code has been adapted from the Fortran
+version in libTheSky.
+
+"""
+
+
 name = "elp-mpp02"
+__author__ = 'Marc van der Sluys - Nikhef/Utrecht University - marc.vandersluys.nl'

elp_mpp02/mpp02.py

@@ -27,7 +27,7 @@ References:
 
 - Refereed article: Chapront J., Francou G., A&A 404, 735 (2003)
 
-- libTheSky: http://libthesky.sourceforge.net/
+- libTheSky: https://libthesky.sourceforge.net/
 
 
 Dependencies:
@@ -37,29 +37,31 @@ Apart from the standard Python modules math and sys, numpy and fortranformat mus
 
 Copyright:
 
-Copyright (c) 2019 Marc van der Sluys, Radboud University Nijmegen, The Netherlands -
-http://astro.ru.nl/~sluys/  (this Python code)
+Copyright (c) 2019-2025 Marc van der Sluys, Department of Physics, Utrecht University, The Netherlands
+and Nikhef (Netherlands institute for high-energy physics and gravitational waves), Amsterdam, The Netherlands -
+https://www.nikhef.nl/~sluys/  (this Python code)
  
 This file is part of the ELP/MPP02 Python package, 
-see: [Pypi URL] / [Github URL]
+see: https://pypi.org/project/elp_mpp02/ / https://github.com/MarcvdSluys/ELP-MPP02
  
-This is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+This is free software: you can redistribute it and/or modify it under the terms of the European Union Public
+Licence 1.2 (EUPL 1.2).  This software is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+EU Public Licence for more details.  You should have received a copy of the European Union Public Licence
+along with this code.  If not, see <https://www.eupl.eu/1.2/en/>.
 
-This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
-warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License along with this code.  If not, see 
-<http://www.gnu.org/licenses/>.
+Acknowledgements:
+- Thanks to A. Vähäkangas for bug reports.
 
 """
 
 
-##############################################################################################################
 import math as m
 import numpy.core as np
 import sys
 
+
 # Global constants:
 d2r    = m.radians(1)  # Degrees to radians
 r2d    = m.degrees(1)  # Radians to degrees
@@ -69,6 +71,7 @@ pi2    = pi*2
 pio2   = pi/2
 jd2000 = 2451545
 
+
 # Global variables:
 modeInit = 999  # := uninitialised
 dataDir = '.'   # Directory where the data files are located (default '.': the current directory)
@@ -91,8 +94,6 @@ p    = np.zeros((8,5))
 delnu=0.; dele=0.; delg=0.; delnp=0.; delep=0.; dtasm=0.; am=0.
 
 
-
-##############################################################################################################
 def initialise_and_read_files(mode=0):
     """Initialise ELP/MPP02 constants and read the data files if necessary
     
@@ -104,24 +105,23 @@ def initialise_and_read_files(mode=0):
     """
     
     global modeInit
-    #print("Initialise and read files:", modeInit)
+    # print("Initialise and read files:", modeInit)
     
     # Initializing of constants and reading the files:
     ierr = 0
-    if(mode!=modeInit):
+    if mode!=modeInit:
         initialise(mode)
         ierr = read_files()
-        if(ierr!=0): return ierr
+        if ierr!=0: return ierr
         
         modeInit = mode  # Indicate that the data have been initialised
-        #print("modeInit:", modeInit)
+        # print("modeInit:", modeInit)
         return ierr
         
     return ierr
 
 
 
-##############################################################################################################
 def initialise(mode=0):
     """Initialization of the constants and parameters used for the evaluation of the ELP/MPP02 series
     
@@ -135,15 +135,19 @@ def initialise(mode=0):
     
     global modeInit,  w,eart,peri, dela,zeta,  p,delnu,dele,delg,delnp,delep,dtasm,am
     global p1,p2,p3,p4,p5, q1,q2,q3,q4,q5
-    #print("Initialise:", modeInit)
+    # print("Initialise:", modeInit)
     
     Dprec = -0.29965  # Constant for the correction to the constant of precession - source: IAU 2000A
     
+    bp = np.array([
+        [  0.311079095,  -0.103837907  ],
+        [ -0.4482398e-2,  0.668287e-3  ],
+        [ -0.1102485e-2, -0.1298072e-2 ],
+        [  0.1056062e-2, -0.178028e-3  ],
+        [  0.50928e-4,   -0.37342e-4   ]
+    ])  # (2,5)
     
-    bp = np.array([[0.311079095,-0.4482398e-2], [-0.110248500e-2,0.1056062e-2], [0.50928e-4,-0.103837907],
-                   [0.6682870e-3,-0.129807200e-2], [-0.1780280e-3,-0.37342e-4]]) # (5,2)
-    
-    if(mode<0 or mode>1): sys.exit('elp_mpp02.mpp02.initialise(): mode must have value 0 or 1, not %i' % mode)
+    if mode<0 or mode>1: sys.exit('elp_mpp02.mpp02.initialise(): mode must have value 0 or 1, not %i' % mode)
     
     # Constants for the evaluation of the partial derivatives:
     am     =  0.074801329           # Ratio of the mean motions (EMB / Moon)
@@ -153,7 +157,7 @@ def initialise(mode=0):
     
     
     # Corrections to constants:
-    if(mode==0):  # LLR
+    if mode==0:  # LLR
         # Values of the corrections to the constants fitted to LLR.  Fit 13-05-02 (2 iterations) except Phi
         # and eps w2_1 and w3_1.  See ELPdoc, Table 3 and paper, Table 1
         Dw1_0   = -0.10525
@@ -224,16 +228,16 @@ def initialise(mode=0):
     
     # Corrections to the secular terms of Moon angles.  This gives a better (long-term?) fit
     #   to DE 406.  See ELPdoc, Table 6/paper, Table 4, line 2:
-    if(mode==1):  # DE 405 / DE 406
-       w[0,3] -= 0.00018865/r2as
-       w[0,4] -= 0.00001024/r2as
-       
-       w[1,2] += 0.00470602/r2as
-       w[1,3] -= 0.00025213/r2as
-       
-       w[2,2] -= 0.00261070/r2as
-       w[2,3] -= 0.00010712/r2as
-
+    if mode==1:  # DE 405 / DE 406
+        w[0,3] -= 0.00018865/r2as
+        w[0,4] -= 0.00001024/r2as
+        
+        w[1,2] += 0.00470602/r2as
+        w[1,3] -= 0.00025213/r2as
+        
+        w[2,2] -= 0.00261070/r2as
+        w[2,3] -= 0.00010712/r2as
+    
     
     # Corrections to the mean motions of the Moon angles W2 and W3, infered from the modifications of the
     # constants:
@@ -262,10 +266,10 @@ def initialise(mode=0):
     
     # Arguments of Delaunay:
     for iD in range(5):
-       dela[0,iD] = w[0,iD]  - eart[iD]                 # D   =  W1 - Te + 180 degrees
-       dela[1,iD] = w[0,iD]  - w[2,iD]                  # F   =  W1 - W3
-       dela[2,iD] = w[0,iD]  - w[1,iD]                  # l   =  W1 - W2   mean anomaly of the Moon
-       dela[3,iD] = eart[iD] - peri[iD]                 # l'  =  Te - Pip  mean anomaly of EMB
+        dela[0,iD] = w[0,iD]  - eart[iD]                 # D   =  W1 - Te + 180 degrees
+        dela[1,iD] = w[0,iD]  - w[2,iD]                  # F   =  W1 - W3
+        dela[2,iD] = w[0,iD]  - w[1,iD]                  # l   =  W1 - W2   mean anomaly of the Moon
+        dela[3,iD] = eart[iD] - peri[iD]                 # l'  =  Te - Pip  mean anomaly of EMB
     
     dela[0,0] += pi
     
@@ -325,8 +329,6 @@ def initialise(mode=0):
     return
   
   
-
-##############################################################################################################
 def read_files():
     """Read the six data files containing the ELP/MPP02 series
     
@@ -336,7 +338,7 @@ def read_files():
     
     """
     
-    #print("Read files:")
+    # print("Read files:")
     global nmpb,cmpb,fmpb, nper,cper,fper
     global w,eart,peri, dela,zeta,  p,delnu,dele,delg,delnp,delep,dtasm,am
     
@@ -345,8 +347,8 @@ def read_files():
     ilu = np.zeros(4)  # will contain ints
     a   = 0.
     b   = np.zeros(5)
-    #ierr=1
-    #nerr=0
+    # ierr=1
+    # nerr=0
     
     import fortranformat as ff
     formatMainHeader = ff.FortranRecordReader('(25x,I10)')              # Block header format
@@ -357,8 +359,9 @@ def read_files():
         fileName = dataDir+'/ELP_MAIN.S'+str(iFile+1)
         try:
             inFile = open(fileName,'r')
-        except:
-            sys.stderr.write('Error opening file.  Please ensure that: '+fileName+'\n')
+        except Exception as err:
+            sys.stderr.write(str(err)+'\n\n')
+            sys.stderr.write('Please ensure that:\n')
             sys.stderr.write(' 1) you downloaded the data files ELP_*.S[123] from '+
                              'ftp://cyrano-se.obspm.fr/pub/2_lunar_solutions/2_elpmpp02/\n')
             sys.stderr.write(' 2) you set the variable mpp.dataDir to the correct value\n')
@@ -366,7 +369,7 @@ def read_files():
         
         line = inFile.readline()
         nmpb[iFile,0] = formatMainHeader.read(line)[0]
-        #if(nerr!=0): return 3
+        # if nerr!=0: return 3
         
         nmpb[iFile,1] = ir+1
         nmpb[iFile,2] = nmpb[iFile,0] + nmpb[iFile,1] - 1
@@ -375,10 +378,10 @@ def read_files():
         for iLine in range(nLines):
             line = inFile.readline()
             ilu[0],ilu[1],ilu[2],ilu[3], a, b[0],b[1],b[2],b[3],b[4] = formatMainBody.read(line)
-            #if(nerr!=0): return 4
+            # if nerr!=0: return 4
             
             tgv = b[0] + dtasm*b[4]
-            if(iFile==2):  a -= 2*a*delnu/3
+            if iFile==2:  a -= 2*a*delnu/3
             cmpb[ir] = a + tgv*(delnp-am*delnu) + b[1]*delg + b[2]*dele + b[3]*delep
             
             for k in range(5):
@@ -386,7 +389,7 @@ def read_files():
                 for i in range(4):
                     fmpb[k,ir] += ilu[i] * dela[i,k]
                     
-            if(iFile==2): fmpb[0,ir] += pio2
+            if iFile==2: fmpb[0,ir] += pio2
             ir += 1
             
         inFile.close()
@@ -407,33 +410,33 @@ def read_files():
         fileName = dataDir+'/ELP_PERT.S'+str(iFile+1)
         try:
             inFile = open(fileName,'r')
-        except:
-            sys.stderr.write('Error opening file: '+fileName+'\n')
+        except Exception as err:
+            sys.stderr.write(str(err)+'\n')
             exit(1)
             
         for it in range(4):
-            #if(nerr!=0): return 6
+            # if nerr!=0: return 6
             line = inFile.readline()
             nper[iFile,it,0],ipt = formatPertHeader.read(line)
             
             nper[iFile,it,1] = ir+1
             nper[iFile,it,2] = nper[iFile,it,0] + nper[iFile,it,1] - 1
-            if(nper[iFile,it,0]==0): continue  # cycle to next it
+            if nper[iFile,it,0]==0: continue  # cycle to next it
             
             nLines = int(round(nper[iFile,it,0]))
             for iLine in range(nLines):
                 line = inFile.readline()
                 ( icount,s,c,ifi[0],ifi[1],ifi[2],ifi[3],ifi[4],ifi[5],ifi[6],ifi[7],ifi[8],ifi[9],ifi[10], 
                   ifi[11],ifi[12],ifi[13],ifi[14],ifi[15] ) = formatPertBody.read(line)
-                #if(nerr!=0): return 7
+                # if nerr!=0: return 7
                 
                 cper[ir] = m.sqrt(c**2+s**2)
                 pha = m.atan2(c,s)
-                if(pha<0): pha = pha+pi2
+                if pha<0: pha = pha+pi2
                 
                 for k in range(5):
                     fper[k,ir] = 0
-                    if(k==0): fper[k,ir] = pha
+                    if k==0: fper[k,ir] = pha
                     for i in range(4):
                         fper[k,ir] += ifi[i] * dela[i,k]
                         
@@ -449,7 +452,6 @@ def read_files():
     
 
 
-##############################################################################################################
 def elp_dms2rad(deg,min,sec):
     """Function for the conversion sexagesimal degrees -> radians in initialise()"""
     
@@ -457,8 +459,6 @@ def elp_dms2rad(deg,min,sec):
 
 
 
-
-##############################################################################################################
 def compute_lbr(jd, mode=0):
     """Compute the spherical lunar coordinates using the ELP2000/MPP02 lunar theory in the dynamical mean ecliptic
           and equinox of J2000.
@@ -480,7 +480,7 @@ def compute_lbr(jd, mode=0):
 
     """
 
-    #print("Compute lbr:")
+    # print("Compute lbr:")
     
     xyz,vxyz, ierr = compute_xyz(jd, mode)
     
@@ -489,17 +489,15 @@ def compute_lbr(jd, mode=0):
     lon = m.atan2(xyz[1], xyz[0])
     lat = m.asin(xyz[2]/rad)
     
-    #rad = rad/1.49597870700e8  # km -> AU
+    # rad = rad/1.49597870700e8  # km -> AU
     
-    #print('jd, xyz: ', jd, xyz[0:3])
+    # print('jd, xyz: ', jd, xyz[0:3])
     # print(jd, (lon%pi2)*r2d, lat*r2d, rad)
     
     return lon,lat,rad
 
 
 
-  
-##############################################################################################################
 def compute_xyz(jd, mode=0):
     """Compute the rectangular lunar coordinates using the ELP/MPP02 lunar theory in the dynamical mean ecliptic
     and equinox of J2000.
@@ -521,7 +519,7 @@ def compute_xyz(jd, mode=0):
 
     """
     
-    #print("Compute xyz:")
+    # print("Compute xyz:")
     global nmpb,cmpb,fmpb, nper,cper,fper
     global w, p1,p2,p3,p4,p5, q1,q2,q3,q4,q5
     
@@ -532,7 +530,7 @@ def compute_xyz(jd, mode=0):
     
     # Initialise data and read files if needed:
     ierr = initialise_and_read_files(mode)
-    if(ierr!=0): sys.exit('Could not read ELP-MPP02 files')
+    if ierr!=0: sys.exit('Could not read ELP-MPP02 files')
     
     
     # Initialization of time powers:
@@ -573,7 +571,7 @@ def compute_xyz(jd, mode=0):
                 y = fper[0,iLine]
                 xp = 0
                 yp = 0
-                if(it!=0): xp = it * x * t[it-1]
+                if it!=0: xp = it * x * t[it-1]
                 
                 for k in range(1,5):  # k=1,4
                     y  +=     fper[k,iLine] * t[k]
@@ -590,8 +588,8 @@ def compute_xyz(jd, mode=0):
     
     # v[0] = v[0] % pi2
     
-    #print('t: ', t[0],t[1],t[2],t[3],t[4])
-    #print('v:       ', v[0]*r2d,v[1]*r2d,v[2], v[3],v[4],v[5])
+    # print('t: ', t[0],t[1],t[2],t[3],t[4])
+    # print('v:       ', v[0]*r2d,v[1]*r2d,v[2], v[3],v[4],v[5])
     
     # compute the rectangular coordinates (for the EoD?):
     clamb  = m.cos(v[0])
@@ -600,13 +598,13 @@ def compute_xyz(jd, mode=0):
     sbeta  = m.sin(v[1])
     cw     = v[2]*cbeta
     sw     = v[2]*sbeta
-    #print("c/s l/b: ", clamb,slamb, cbeta,sbeta)
+    # print("c/s l/b: ", clamb,slamb, cbeta,sbeta)
     
     x0     = cw*clamb
     x1     = cw*slamb
     x2     = sw
-    #print("x1,x2,x3: ", x0,x1,x2)
-    #print("p,q: ", p1,p2,p3,p4,p5, q1,q2,q3,q4,q5)
+    # print("x1,x2,x3: ", x0,x1,x2)
+    # print("p,q: ", p1,p2,p3,p4,p5, q1,q2,q3,q4,q5)
     
     # Is this simply precession in rectangular coordinates to J2000?  From?
     pw     = (p1 + p2*t[1] + p3*t[2] + p4*t[3] + p5*t[4]) * t[1]

{elp_mpp02-0.0.4.dist-info → elp_mpp02-0.0.6.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
-Name: elp-mpp02
-Version: 0.0.4
+Metadata-Version: 2.4
+Name: elp_mpp02
+Version: 0.0.6
 Summary: Accurate Moon positions using the Lunar solution ELP/MPP02 in Python
 Author-email: Marc van der Sluys <git@vandersluys.nl>
-License: GPLv3+
+License-Expression: GPL-3.0-or-later
 Project-URL: GitHub, https://github.com/MarcvdSluys/ELP-MPP02
 Project-URL: ReadTheDocs, https://readthedocs.org/projects/elp-mpp02/
 Keywords: Moon,astronomy,ephemeris
@@ -11,7 +11,6 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
@@ -20,6 +19,7 @@ Description-Content-Type: text/markdown
 License-File: LICENCE
 Requires-Dist: numpy
 Requires-Dist: fortranformat
+Dynamic: license-file
 
 # ELP_MPP02: accurate Moon positions using the lunar solution ELP/MPP02 in Python #
 
@@ -67,16 +67,21 @@ initialised and the data files need to be read, which can take ~10s.  If `mode`
 data must be reinitialised.
 
 
-## Author and licence ##
+## Copyright and licence ##
 
-* Author: Marc van der Sluys
-* Contact: http://astro.ru.nl/~sluys/
-* Website: [Github](https://github.com/MarcvdSluys/ELP-MPP02), [PyPI](https://pypi.org/project/elp_mpp02/)
-* Licence: [GPLv3+](https://www.gnu.org/licenses/gpl.html)
+* Copyright:  2019-2025 Marc van der Sluys, Department of Physics, Utrecht University and Nikhef (institute for high-energy physics and gravitational waves), Amsterdam (NL)
+* Contact:    https://marc.vandersluys.nl
+* Website:    [Github](https://github.com/MarcvdSluys/ELP-MPP02), [PyPI](https://pypi.org/project/elp_mpp02/)
+* Licence:    [EUPL 1.2](https://www.eupl.eu/1.2/en/)
+
+
+## Acknowledgements ##
+
+* Thanks to A. Vähäkangas for bug reports!
 
 
 ## References ##
 
 * [Chapront & Francou (2003)](https://ui.adsabs.harvard.edu/abs/2003A%26A...404..735C/abstract)
 * [FTP data files](ftp://cyrano-se.obspm.fr/pub/2_lunar_solutions/2_elpmpp02) &mdash; in case [FTP urls don't work in Markdown](https://github.com/gollum/gollum/issues/759): ftp://cyrano-se.obspm.fr/pub/2_lunar_solutions/2_elpmpp02
-* This Python code is adapted from the Fortran implementation in [libTheSky](http://libthesky.sourceforge.net/)
+* This Python code is adapted from the Fortran implementation in [libTheSky](https://libthesky.sourceforge.net/)

elp_mpp02-0.0.6.dist-info/RECORD

@@ -0,0 +1,7 @@
+elp_mpp02/__init__.py,sha256=1ZEQgZRpa0mDJQo3UCl9ZDrrUUeenPAKSAVmLIsROm8,1290
+elp_mpp02/mpp02.py,sha256=UOjrUlSHZOGBN5BJjrhKweaYJfgRW4ywdrSFhihDxdE,22927
+elp_mpp02-0.0.6.dist-info/licenses/LICENCE,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
+elp_mpp02-0.0.6.dist-info/METADATA,sha256=GQs3BznVLJLbRKDlz28VNMKYjEOvQVZTdc2Rp8dLPZE,3573
+elp_mpp02-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+elp_mpp02-0.0.6.dist-info/top_level.txt,sha256=rGLE8HZyORfVOogfp3wdPIT3wdHzLoFFWz3KL3o6TKE,10
+elp_mpp02-0.0.6.dist-info/RECORD,,

{elp_mpp02-0.0.4.dist-info → elp_mpp02-0.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any