Accel fixed in matlab, not in c# some other nits.

CelesTrak · Feb 1, 2025 · d136971 · d136971
1 parent 09b71d4
commit d136971
Show file tree

Hide file tree

Showing 8 changed files with 664 additions and 544 deletions.
diff --git a/software/cs/AstroLib/Astrolib/AstroLib.cs b/software/cs/AstroLib/Astrolib/AstroLib.cs
@@ -4031,7 +4031,6 @@ public void eq2rv
         //    lod         - excess length of day                            sec
         //    xp          - polar motion coefficient                        arc sec
         //    yp          - polar motion coefficient                        arc sec
-        //    terms       - number of terms for ast calculation             0,2
         //    ddpsi, ddeps - corrections for fk5 to gcrf                    rad
         //    iau80arr     - iau80 coefficients of eop
         //
@@ -4053,9 +4052,9 @@ public void eq2rv
         public void rv2flt
             (
             double[] reci, double[] veci, double[] aeci,
-            double ttt, double jdut1, double lod,
-            double xp, double yp, int terms, double ddpsi, double ddeps,
             EOPSPWLib.iau80Class iau80arr,
+            double ttt, double jdut1, double lod,
+            double xp, double yp, double ddpsi, double ddeps,
             out double lon, out double latgc, out double rtasc, out double decl,
             out double fpa, out double az, out double magr, out double magv
             )
@@ -4123,7 +4122,6 @@ public void rv2flt
         //    lod         - excess length of day                            sec
         //    xp          - polar motion coefficient                        arc sec
         //    yp          - polar motion coefficient                        arc sec
-        //    terms       - number of terms for ast calculation             0,2
         //    ddpsi, ddeps - corrections for fk5 to gcrf                    rad
         //    iau80arr     - iau80 coefficients of eop
         //
@@ -4145,9 +4143,9 @@ public void rv2flt
         public void flt2rv
             (
             double rmag, double vmag, double latgc, double lon, double fpa, double az,
-            double ttt, double jdut1, double lod,
-            double xp, double yp, int terms, double ddpsi, double ddeps,
             EOPSPWLib.iau80Class iau80arr,
+            double ttt, double jdut1, double lod,
+            double xp, double yp, double ddpsi, double ddeps,
             out double[] reci, out double[] veci
             )
         {
@@ -4159,7 +4157,6 @@ public void flt2rv
             double[] hcrossr = new double[3];
             double temp, rtasc, decl, fpav;
 
-            double twopi = 2.0 * Math.PI;
             double small = 0.00000001;
 
             // -------- form position vector

diff --git a/software/cs/TestAll/TestAll/Form1.cs b/software/cs/TestAll/TestAll/Form1.cs
diff --git a/software/cs/TestSGP4/TestSGP4/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/software/cs/TestSGP4/TestSGP4/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/software/matlab/ecef2eci.m b/software/matlab/ecef2eci.m
@@ -76,10 +76,10 @@
 
     % veci1 = prec*nut * (stdot*recef + st*pm*vecef')  % alt approach using sidereal rate
 
-    temp = cross(omegaearth,rpef);
+    omgxr = cross(omegaearth,rpef);
     % two additional terms not needed if satellite is not on surface
     % of the Earth
-    aeci = prec*nut*st*( pm*aecef ) ...
-        + cross(omegaearth,temp) + 2.0*cross(omegaearth,vpef);
+    aeci = prec*nut*st*( pm*aecef ...
+        + cross(omegaearth,omgxr) + 2.0*cross(omegaearth,vpef) );
 
 end
diff --git a/software/matlab/eci2ecef.m b/software/matlab/eci2ecef.m
@@ -75,6 +75,6 @@
     temp  = cross(omegaearth,rpef);
 
     % two additional terms not needed if satellite is not on surface of the Earth
-    aecef = pm'*(st'*nut'*prec'*aeci) - cross(omegaearth,temp) - 2.0*cross(omegaearth,vpef);
+    aecef = pm'*(st'*nut'*prec'*aeci - cross(omegaearth,temp) - 2.0*cross(omegaearth,vpef) );
 
 end
diff --git a/software/matlab/eci2tod.m b/software/matlab/eci2tod.m
@@ -37,7 +37,7 @@
 %  references    :
 %    vallado       2022, 225
 %
-% [rtod, vtod, atod] = eci2tod(reci, veci, aeci, iau80arr, ttt, ddpsi, ddeps, ddx, ddy )
+% [rtod, vtod, atod] = eci2tod(reci, veci, aeci, iau80arr, ttt, ddpsi, ddeps)
 % ----------------------------------------------------------------------------
 
 function [rtod, vtod, atod] = eci2tod(reci, veci, aeci, iau80arr, ttt, ddpsi, ddeps)

diff --git a/software/matlab/ex3_1415.m b/software/matlab/ex3_1415.m
diff --git a/software/matlab/testall.m b/software/matlab/testall.m