Added tests for DistOrb-RD4 and DistOrb-LL2.

VirtualPlanetaryLaboratory · Feb 9, 2024 · 3b719b3 · 3b719b3
1 parent 2055a2a
commit 3b719b3
Show file tree

Hide file tree

Showing 23 changed files with 1,979 additions and 4 deletions.
diff --git a/src/distorb.c b/src/distorb.c
@@ -2559,10 +2559,7 @@ void HessEigen(double **amat, int origsize, double real[], double imag[]) {
                 q /= lrcorner;
                 r /= lrcorner;
               }
-            } else {
-              // fprintf(stderr,"ERROR: k=m in distorb.c:HessEigen.");
-              // exit(EXIT_INT);
-            }
+            } 
             value = sqrt(p * p + q * q + r * r);
             s     = (double)fiSign(p) * value;
             if (s != 0.0) {

diff --git a/tests/Distorb/LL2/earth.in b/tests/Distorb/LL2/earth.in
@@ -0,0 +1,19 @@
+sName        Earth
+saModules    distorb distrot
+dMass        3.0018090452e-06
+dRadius      -1.
+dRotPeriod   -1
+dObliquity   23.44    #no Moons yet in vplanet....
+dSemi        1.00000321
+dEcc         0.01671327
+dInc         5e-5
+dLongP       102.948601
+dLongA       348.73936
+bGRCorr      1
+saOutputOrder    Time Ecce Inc ArgP LongA Obliq PrecA -TotEn -TotAngMom
+dDynEllip    3.28e-3
+dPrecA       0.0
+bForcePrecRate    1
+bCalcDynEllip    0
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/LL2/george.in b/tests/Distorb/LL2/george.in
@@ -0,0 +1,16 @@
+sName        George
+saModules    distorb
+dMass        4.3634170854e-05
+dRadius      -1.50000
+dRotPeriod   -1.00000
+dObliquity   0.00000
+dSemi        19.19203990
+dEcc        0.04713385
+dInc         0.76986
+dLongP       170.994339
+dLongA       74.22988
+#dDfcrit       0.1
+bGRCorr      1
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/LL2/jupiter.in b/tests/Distorb/LL2/jupiter.in
@@ -0,0 +1,17 @@
+sName        Jupiter
+saModules    distorb
+dMass        9.5407035176e-04
+dRadius      -1.50000
+dRotPeriod   -1.00000
+dObliquity   0.00000
+dSemi        5.20880408
+dEcc         0.04932699
+dInc         1.30530
+dLongP       15.1623
+dLongA       100.55615
+#dDfcrit       0.1
+bGRCorr      1
+#sOrbitModel    ll2
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/LL2/mars.in b/tests/Distorb/LL2/mars.in
@@ -0,0 +1,17 @@
+sName        Mars
+saModules    distorb distrot
+dMass        3.2253768844e-07
+dRadius      -0.53202
+dRotPeriod   -1.0259233
+dObliquity   25.189417           #obliquity, dynell from Armstrong 2004, Bouquillon & Souchay 1999
+dSemi        1.52366290
+dEcc         0.09341266
+dInc         1.85061
+dLongP       336.040919
+dLongA       49.57854
+bGRCorr      1
+saOutputOrder    Time Ecce Inc ArgP LongA Obliq PrecA PrecFNat
+dDynEllip    5.363e-3
+dPrecA       0.0
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/LL2/mercury.in b/tests/Distorb/LL2/mercury.in
@@ -0,0 +1,22 @@
+sName        Mercury
+saModules    distorb
+dMass        1.6592964824e-07
+dRadius      -1.00
+dRotPeriod   -1.00000
+dObliquity   23.5
+dSemi        0.38709897
+dEcc         0.20563056
+dInc         7.00487
+dLongP       77.456453
+dLongA       48.33167
+bGRCorr      1
+#sOrbitModel   rd4
+sOrbitModel  ll2
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
+#bOutputLapl     1
+bHaltHillStab   0
+bHaltCloseEnc   1
+bInvPlane   0
+bOutputEigen 0
diff --git a/tests/Distorb/LL2/neptune.in b/tests/Distorb/LL2/neptune.in
@@ -0,0 +1,16 @@
+sName        Neptune
+saModules    distorb
+dMass        5.1472361809e-05
+dRadius      -1.50000
+dRotPeriod   -1.00000
+dObliquity   0.00000
+dSemi        30.07050641
+dEcc        0.00857659
+dInc         1.76917
+dLongP       44.633872
+dLongA       131.72169
+#dDfcrit       0.1
+bGRCorr      1
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/LL2/saturn.in b/tests/Distorb/LL2/saturn.in
@@ -0,0 +1,15 @@
+sName        Saturn
+saModules    distorb
+dMass        2.8565829146e-04
+dRadius      -1.00        #radius, rotper, and obl don't matter without distrot and/or eqtide
+dRotPeriod   -1.00000
+dObliquity   23.5
+dSemi       9.53999265
+dEcc         0.05434133
+dInc         2.48446
+dLongP       92.193712
+dLongA       113.71504
+bGRCorr      1
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/LL2/sun.in b/tests/Distorb/LL2/sun.in
@@ -0,0 +1,6 @@
+# sun parameters
+sName        sun
+dMass        1
+dSemi        0
+dEcc         0
+dRadius      0.00135
diff --git a/tests/Distorb/LL2/test_LL2.py b/tests/Distorb/LL2/test_LL2.py
diff --git a/tests/Distorb/LL2/venus.in b/tests/Distorb/LL2/venus.in
@@ -0,0 +1,17 @@
+sName        Venus
+saModules    distorb distrot
+dMass        2.4464824121e-06
+dRadius      -0.9499
+dRotPeriod   -243.69
+dObliquity   177.36
+dSemi        0.72333377
+dEcc          0.00677478
+dInc         3.39471
+dLongP       131.54907
+dLongA       76.68069
+bGRCorr      1
+saOutputOrder    Time Ecce Inc ArgP LongA Obliq PrecA
+dDynEllip    1.3125e-5    #based on J2 from Yoder 1995
+dPrecA       0.0
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/LL2/vpl.in b/tests/Distorb/LL2/vpl.in
@@ -0,0 +1,19 @@
+sSystemName   solarsys
+iVerbose      5
+iDigits       6
+bOverwrite    1
+sUnitMass     solar
+sUnitLength   au
+sUnitTime     y
+sUnitAngle    d
+bDoLog        1
+saBodyFiles   sun.in mercury.in venus.in earth.in mars.in jupiter.in $
+                    saturn.in george.in neptune.in
+#saBodyFiles   sun.in venus.in earth.in mars.in jupiter.in saturn.in george.in neptune.in
+#saBodyFiles   sun.in  mercury.in jupiter.in saturn.in
+
+bDoForward    1
+bVarDt        1
+dEta          0.01
+dStopTime     5000
+dOutputTime   1000
diff --git a/tests/Distorb/RD4/earth.in b/tests/Distorb/RD4/earth.in
@@ -0,0 +1,19 @@
+sName        Earth
+saModules    distorb distrot
+dMass        3.0018090452e-06
+dRadius      -1.
+dRotPeriod   -1
+dObliquity   23.44    #no Moons yet in vplanet....
+dSemi        1.00000321
+dEcc         0.01671327
+dInc         5e-5
+dLongP       102.948601
+dLongA       348.73936
+# bGRCorr      0
+saOutputOrder    Time Ecce Inc ArgP LongA Obliq PrecA -TotEn -TotAngMom
+dDynEllip    3.28e-3
+dPrecA       0.0
+bForcePrecRate    1
+bCalcDynEllip    0
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/RD4/george.in b/tests/Distorb/RD4/george.in
@@ -0,0 +1,16 @@
+sName        George
+saModules    distorb
+dMass        4.3634170854e-05
+dRadius      -1.50000
+dRotPeriod   -1.00000
+dObliquity   0.00000
+dSemi        19.19203990
+dEcc        0.04713385
+dInc         0.76986
+dLongP       170.994339
+dLongA       74.22988
+#dDfcrit       0.1
+#bGRCorr       0
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/RD4/jupiter.in b/tests/Distorb/RD4/jupiter.in
@@ -0,0 +1,17 @@
+sName        Jupiter
+saModules    distorb
+dMass        9.5407035176e-04
+dRadius      -1.50000
+dRotPeriod   -1.00000
+dObliquity   0.00000
+dSemi        5.20880408
+dEcc         0.04932699
+dInc         1.30530
+dLongP       15.1623
+dLongA       100.55615
+#dDfcrit       0.1
+#bGRCorr       0
+#sOrbitModel    ll2
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/RD4/mars.in b/tests/Distorb/RD4/mars.in
@@ -0,0 +1,17 @@
+sName        Mars
+saModules    distorb distrot
+dMass        3.2253768844e-07
+dRadius      -0.53202
+dRotPeriod   -1.0259233
+dObliquity   25.189417           #obliquity, dynell from Armstrong 2004, Bouquillon & Souchay 1999
+dSemi        1.52366290
+dEcc         0.09341266
+dInc         1.85061
+dLongP       336.040919
+dLongA       49.57854
+# bGRCorr      0
+saOutputOrder    Time Ecce Inc ArgP LongA Obliq PrecA PrecFNat
+dDynEllip    5.363e-3
+dPrecA       0.0
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/RD4/mercury.in b/tests/Distorb/RD4/mercury.in
@@ -0,0 +1,22 @@
+sName        Mercury
+saModules    distorb
+dMass        1.6592964824e-07
+dRadius      -1.00
+dRotPeriod   -1.00000
+dObliquity   23.5
+dSemi        0.38709897
+dEcc         0.20563056
+dInc         7.00487
+dLongP       77.456453
+dLongA       48.33167
+bGRCorr      1
+sOrbitModel   rd4
+#sOrbitModel  ll2
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
+#bOutputLapl     1
+bHaltHillStab   0
+bHaltCloseEnc   1
+bInvPlane   0
+bOutputEigen 0
diff --git a/tests/Distorb/RD4/neptune.in b/tests/Distorb/RD4/neptune.in
@@ -0,0 +1,16 @@
+sName        Neptune
+saModules    distorb
+dMass        5.1472361809e-05
+dRadius      -1.50000
+dRotPeriod   -1.00000
+dObliquity   0.00000
+dSemi        30.07050641
+dEcc        0.00857659
+dInc         1.76917
+dLongP       44.633872
+dLongA       131.72169
+#dDfcrit       0.1
+#bGRCorr       0
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/RD4/saturn.in b/tests/Distorb/RD4/saturn.in
@@ -0,0 +1,15 @@
+sName        Saturn
+saModules    distorb
+dMass        2.8565829146e-04
+dRadius      -1.00        #radius, rotper, and obl don't matter without distrot and/or eqtide
+dRotPeriod   -1.00000
+dObliquity   23.5
+dSemi       9.53999265
+dEcc         0.05434133
+dInc         2.48446
+dLongP       92.193712
+dLongA       113.71504
+# bGRCorr      0
+saOutputOrder    Time Ecce Inc ArgP LongA
+#bOverrideMaxEcc  1
+#dHaltMaxEcc     0.4
diff --git a/tests/Distorb/RD4/sun.in b/tests/Distorb/RD4/sun.in
@@ -0,0 +1,6 @@
+# sun parameters
+sName        sun
+dMass        1
+dSemi        0
+dEcc         0
+dRadius      0.00135