Changeset 9976 for trunk/psLib/src/astro/psEarthOrientation.c

Timestamp:

Nov 14, 2006, 11:15:43 AM (20 years ago)

Author:

drobbin

Message:

Implemented testing for psEarthOrientation. Done with motion, working on corrections. Edited data file dir in Makefile.am and changed a couple of, if (MJD==NAN) to if (isnan(MJD))

File:

• trunk/psLib/src/astro/psEarthOrientation.c (modified) (15 diffs)

trunk/psLib/src/astro/psEarthOrientation.c

@@ -8 +8 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-20 00:17:21 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-14 21:15:43 $
  *
  *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -284 +284 @@
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 "Aberration speed should not be equal to 0.\n");
+        return NULL;
+    }
+    if (fabs(speed) > 1.0) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "Aberration speed should not greater than the speed of light!.\n");
         return NULL;
     }
@@ -445 +450 @@
     // Convert psTime to MJD
     double MJD = psTimeToMJD(time);
-    if (MJD == NAN) {
+    if (isnan(MJD)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
                 "Time conversion to MJD failed.  Invalid input time.\n");
@@ -594 +599 @@
     //Convert the input time to MJD.  If NAN is returned, return NULL for the function.
     double MJD = psTimeToMJD(time);
-    if (MJD == NAN) {
+    if (isnan(MJD)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
                 "Time conversion to MJD failed.  Invalid input time.\n");
@@ -762 +767 @@
     //Check if tidal corrections should be included.
     //If so, make sure values are positive and in the correct range.
-    if (tidalCorr != NULL && tidalCorr->s != 0.0) {
+    if (tidalCorr != NULL && fabs(tidalCorr->s) > FLT_EPSILON) {
         int nsec = in->nsec + (int)(tidalCorr->s * 1e9);
         if (nsec > 1e9) {
@@ -777 +782 @@
     //Calculate the Julian Date from the input time in UT1 format.
     double T = psTimeToJD(in);
-    if (T == NAN) {
+    if (isnan(T)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
                 "Time conversion to JD failed.  Invalid input time.\n");
@@ -803 +808 @@
 
     double MJD = psTimeToMJD(time);
-    if (MJD == NAN) {
+    if ( isnan(MJD) ) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
                 "Time conversion to MJD failed.  Invalid input time.\n");
@@ -858 +863 @@
                 k = 2;
             }
-            if (k > (numRows-2)) {
-                k = numRows-2;
-            }
+            //            if (k > (numRows-2)) {
+            //                k = numRows-2;
+            //            }
             for (int m = k-1; m <= k+2; m++) {
                 xTerm = X->data.F64[m];
@@ -935 +940 @@
     // Convert psTime to MJD
     double MJD = psTimeToMJD(time);
-    if (MJD == NAN) {
+    if (isnan(MJD)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
                 "Time conversion to MJD failed.  Invalid input time.\n");
@@ -1019 +1024 @@
     double MJD = psTimeToMJD(time);
     //    printf("\nMJD check = %.13g\n", MJD);
-    if (MJD == NAN) {
+    if (isnan(MJD)) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
                 "Time conversion to MJD failed.  Invalid input time.\n");
@@ -1252 +1257 @@
     // Calculate Julian centuries
     //If either input time is NULL, assume it to be J2000 -> from SDRS as of rev 18
+    psTime *from = NULL;
+    psTime *to = NULL;
     if (fromTime == NULL) {
         fromMJD = MJD_2000;
+        from = psTimeFromMJD(fromMJD);
     } else {
         fromMJD = psTimeToMJD(fromTime);
+        from = psTimeCopy(fromTime);
     }
     if (toTime == NULL) {
         toMJD = MJD_2000;
+        to = psTimeFromMJD(toMJD);
     } else {
         toMJD = psTimeToMJD(toTime);
-    }
-    psTime *from = NULL;
-    psTime *to = NULL;
+        to = psTimeCopy(toTime);
+    }
     if (fromMJD > toMJD) {
         psWarning("From time is later than to time in psSpherePrecess.\n");
@@ -1290 +1299 @@
         // Create transform with proper constants
         psSphereRot* tmpST = psSphereRotAlloc(alphaP, deltaP, phiP);
+        psFree(from);
+        psFree(to);
         return tmpST;
     } else if (mode == PS_PRECESS_IAU2000A) {
@@ -1296 +1307 @@
         //rotation corresponding to fromTime to the toTime rotation.
 
-        //Since the time inputs are allowed to be NULL, either convert the MJD time
-        //or copy to non-NULL time
-        if (fromTime == NULL) {
-            from = psTimeFromMJD(fromMJD);
-        } else {
-            from = psTimeCopy(fromTime);
-        }
-        if (toTime == NULL) {
-            to = psTimeFromMJD(toMJD);
-        } else {
-            to = psTimeCopy(toTime);
-        }
         //Calculate the earthpoles and quaternions corresponding to each time (from, to).
         //Combine the quaternions to produce the output psSphereRot.
@@ -1329 +1328 @@
         //for COMPLETE_A come from the IERS Bulletin A.
 
-        //Since the time inputs are allowed to be NULL, either convert the MJD time
-        //or copy to non-NULL time
-        if (fromTime == NULL) {
-            from = psTimeFromMJD(fromMJD);
-        } else {
-            from = psTimeCopy(fromTime);
-        }
-        if (toTime == NULL) {
-            to = psTimeFromMJD(toMJD);
-        } else {
-            to = psTimeCopy(toTime);
-        }
         //Calculate the earthpoles and quaternions corresponding to each time (from, to).
         //Add in the precession corrections from IERS bulletin A.
@@ -1371 +1358 @@
         //for COMPLETE_B come from the IERS Bulletin B.
 
-        //Since the time inputs are allowed to be NULL, either convert the MJD time
-        //or copy to non-NULL time
-        if (fromTime == NULL) {
-            from = psTimeFromMJD(fromMJD);
-        } else {
-            from = psTimeCopy(fromTime);
-        }
-        if (toTime == NULL) {
-            to = psTimeFromMJD(toMJD);
-        } else {
-            to = psTimeCopy(toTime);
-        }
-
         //Calculate the earthpoles and quaternions corresponding to each time (from, to).
         //Add in the precession corrections from IERS bulletin B.