Changeset 6184

Timestamp:

Jan 23, 2006, 10:04:31 AM (20 years ago)

Author:

drobbin

Message:

updated PrecessMethod. Fixed MetadataAddStr to error on NULL input. Time_TideUT1Corr?

Location:

trunk/psLib

Files:

• src/astro/psEarthOrientation.c (modified) (2 diffs)
• src/astro/psEarthOrientation.h (modified) (3 diffs)
• src/astro/psTime.c (modified) (4 diffs)
• src/astro/psTime.h (modified) (2 diffs)
• src/types/psMetadata.c (modified) (10 diffs)
• test/astro/tst_psEarthOrientation.c (modified) (10 diffs)
• test/astro/tst_psTime_04.c (modified) (2 diffs)
• test/types/tst_psMetadata_07.c (modified) (3 diffs)
• test/types/verified/tst_psMetadata_07.stderr (modified) (1 diff)

trunk/psLib/src/astro/psEarthOrientation.c

@@ -8 +8 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-18 23:49:06 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-23 20:04:31 $
  *
  *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -1462 +1462 @@
 }
 
-/******************************************************************************
-psSpherePrecess(coords, fromTime, toTime):
- 
-XXX: Use static memory for tmpST.
- *****************************************************************************/
-psSphere *psSpherePrecess(psSphere *coords,
-                          const psTime *fromTime,
-                          const psTime *toTime)
+psSphereRot *psSpherePrecess(const psTime *fromTime,
+                             const psTime *toTime,
+                             psPrecessMethod mode)
 {
     // Check input for NULL pointers
-    PS_ASSERT_PTR_NON_NULL(coords, NULL);
-    PS_ASSERT_PTR_NON_NULL(fromTime, NULL);
-    PS_ASSERT_PTR_NON_NULL(toTime, NULL);
-
+    if (fromTime == NULL && toTime == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                "Invalid time inputs.  fromTime & toTime cannot both be NULL.\n");
+        return NULL;
+    }
+    PS_ASSERT_INT_WITHIN_RANGE(mode, PS_PRECESS_ROUGH, PS_PRECESS_IAU2000A, NULL);
+    psF64 fromMJD, toMJD;
     // Calculate Julian centuries
-    psF64 fromMJD = psTimeToMJD(fromTime);
-    psF64 toMJD = psTimeToMJD(toTime);
-    psF64 T = (toMJD - fromMJD) / JULIAN_CENTURY;
-
-    // Calculate conversion constants
-    //    psF64 alphaP = DEG_TO_RAD(90.0) - ((DEG_TO_RAD(0.6406161) * T) +
-    psF64 alphaP = DEG_TO_RAD(180.0) + ((DEG_TO_RAD(0.6406161) * T) +
-                                        (DEG_TO_RAD(0.0000839) * T * T) +
-                                        (DEG_TO_RAD(0.000005) * T * T * T));
-
-    psF64 deltaP = (DEG_TO_RAD(0.5567530) * T) -
-                   (DEG_TO_RAD(0.0001185) * T * T) -
-                   (DEG_TO_RAD(0.0000116) * T * T * T);
-
-    //    psF64 phiP = DEG_TO_RAD(90.0) + ((DEG_TO_RAD(0.6406161) * T) +
-    psF64 phiP = DEG_TO_RAD(180.0) + ((DEG_TO_RAD(0.6406161) * T) +
-                                      (DEG_TO_RAD(0.0003041) * T * T) +
-                                      (DEG_TO_RAD(0.0000051) * T * T * T));
-
-    // Create transform with proper constants
-    psSphereRot* tmpST = psSphereRotAlloc(alphaP, deltaP, phiP);
-
+    //If either input time is NULL, assume it to be J2000 -> from SDRS as of rev 18
+    if (fromTime == NULL) {
+        fromMJD = MJD_2000;
+    } else {
+        fromMJD = psTimeToMJD(fromTime);
+    }
+    if (toTime == NULL) {
+        toMJD = MJD_2000;
+    } else {
+        toMJD = psTimeToMJD(toTime);
+    }
+    psTime *from = NULL;
+    psTime *to = NULL;
+
+    if (mode == PS_PRECESS_ROUGH) {
+        //For PS_PRECESS_ROUGH, no time/earthpole corrections are used.  This is the
+        //lowest level of detail mode.
+        psF64 T = (toMJD - fromMJD) / JULIAN_CENTURY;
+
+        // Calculate conversion constants
+        //    psF64 alphaP = DEG_TO_RAD(90.0) - ((DEG_TO_RAD(0.6406161) * T) +
+        psF64 alphaP = DEG_TO_RAD(180.0) + ((DEG_TO_RAD(0.6406161) * T) +
+                                            (DEG_TO_RAD(0.0000839) * T * T) +
+                                            (DEG_TO_RAD(0.000005) * T * T * T));
+
+        psF64 deltaP = (DEG_TO_RAD(0.5567530) * T) -
+                       (DEG_TO_RAD(0.0001185) * T * T) -
+                       (DEG_TO_RAD(0.0000116) * T * T * T);
+
+        //    psF64 phiP = DEG_TO_RAD(90.0) + ((DEG_TO_RAD(0.6406161) * T) +
+        psF64 phiP = DEG_TO_RAD(180.0) + ((DEG_TO_RAD(0.6406161) * T) +
+                                          (DEG_TO_RAD(0.0003041) * T * T) +
+                                          (DEG_TO_RAD(0.0000051) * T * T * T));
+
+        // Create transform with proper constants
+        psSphereRot* tmpST = psSphereRotAlloc(alphaP, deltaP, phiP);
+        return tmpST;
+    } else if (mode == PS_PRECESS_IAU2000A) {
+        //For IAU2000A mode, run psEOC_PrecessionModel and then psSphereRot_CEOtoGCRS for
+        //each time.  Then difference the resulting rotations by adding the inverse
+        //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 = p_psTimeCopy(fromTime);
+        }
+        if (toTime == NULL) {
+            to = psTimeFromMJD(toMJD);
+        } else {
+            to = p_psTimeCopy(toTime);
+        }
+
+        psEarthPole *fromEP = psEOC_PrecessionModel(from);
+        psSphereRot *fromRot = psSphereRot_CEOtoGCRS(fromEP);
+        psEarthPole *toEP = psEOC_PrecessionModel(to);
+        psSphereRot *toRot = psSphereRot_CEOtoGCRS(toEP);
+        psSphereRot *fromConj = psSphereRotConjugate(NULL, fromRot);
+        psSphereRot *out = psSphereRotCombine(NULL, toRot, fromConj);
+        psFree(from);
+        psFree(to);
+        psFree(fromEP);
+        psFree(fromRot);
+        psFree(toEP);
+        psFree(toRot);
+        psFree(fromConj);
+        return out;
+    } else if (mode == PS_PRECESS_COMPLETE_A) {
+        //For PS_PRECESS_COMPLETE_A the same procedure as IAU2000A is used but with
+        //additional earthpole corrections from psEOC_PrecessionCorr.  The corrections
+        //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 = p_psTimeCopy(fromTime);
+        }
+        if (toTime == NULL) {
+            to = psTimeFromMJD(toMJD);
+        } else {
+            to = p_psTimeCopy(toTime);
+        }
+
+        psEarthPole *fromEP = psEOC_PrecessionModel(from);
+        psEarthPole *fromCorr = psEOC_PrecessionCorr(from, PS_IERS_A);
+        fromEP->x += fromCorr->x;
+        fromEP->y += fromCorr->y;
+        fromEP->s += fromCorr->s;
+        psSphereRot *fromRot = psSphereRot_CEOtoGCRS(fromEP);
+        psEarthPole *toEP = psEOC_PrecessionModel(to);
+        psEarthPole *toCorr = psEOC_PrecessionCorr(to, PS_IERS_A);
+        toEP->x += toCorr->x;
+        toEP->y += toCorr->y;
+        toEP->s += toCorr->s;
+        psSphereRot *toRot = psSphereRot_CEOtoGCRS(toEP);
+        psSphereRot *fromConj = psSphereRotConjugate(NULL, fromRot);
+        psSphereRot *out = psSphereRotCombine(NULL, toRot, fromConj);
+        psFree(from);
+        psFree(to);
+        psFree(fromEP);
+        psFree(fromCorr);
+        psFree(fromRot);
+        psFree(toEP);
+        psFree(toCorr);
+        psFree(toRot);
+        psFree(fromConj);
+        return out;
+    } else {  //mode == PS_PRECESS_COMPLETE_B
+        //For PS_PRECESS_COMPLETE_B the same procedure as IAU2000A is used but with
+        //additional earthpole corrections from psEOC_PrecessionCorr.  The corrections
+        //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 = p_psTimeCopy(fromTime);
+        }
+        if (toTime == NULL) {
+            to = psTimeFromMJD(toMJD);
+        } else {
+            to = p_psTimeCopy(toTime);
+        }
+
+        psEarthPole *fromEP = psEOC_PrecessionModel(from);
+        psEarthPole *fromCorr = psEOC_PrecessionCorr(from, PS_IERS_B);
+        fromEP->x += fromCorr->x;
+        fromEP->y += fromCorr->y;
+        fromEP->s += fromCorr->s;
+        psSphereRot *fromRot = psSphereRot_CEOtoGCRS(fromEP);
+        psEarthPole *toEP = psEOC_PrecessionModel(to);
+        psEarthPole *toCorr = psEOC_PrecessionCorr(to, PS_IERS_B);
+        toEP->x += toCorr->x;
+        toEP->y += toCorr->y;
+        toEP->s += toCorr->s;
+        psSphereRot *toRot = psSphereRot_CEOtoGCRS(toEP);
+        psSphereRot *fromConj = psSphereRotConjugate(NULL, fromRot);
+        psSphereRot *out = psSphereRotCombine(NULL, toRot, fromConj);
+        psFree(from);
+        psFree(to);
+        psFree(fromEP);
+        psFree(fromCorr);
+        psFree(fromRot);
+        psFree(toEP);
+        psFree(toCorr);
+        psFree(toRot);
+        psFree(fromConj);
+        return out;
+    }
     // Apply transform to coordinates
-    psSphere *out = psSphereRotApply(NULL, tmpST, coords);
-    if (out->r < -0.0001) {
-        out->r += 2.0 * M_PI;
-    }
-
-    psFree(tmpST);
-
-    return(out);
+    //    psSphere *out = psSphereRotApply(NULL, tmpST, coords);
+    //    if (out->r < -0.0001) {
+    //        out->r += 2.0 * M_PI;
+    //    }
 }

trunk/psLib/src/astro/psEarthOrientation.h

@@ -9 +9 @@
 *  @author Robert Daniel DeSonia, MHPCC
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-18 23:49:06 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-23 20:04:31 $
 *
 *  Copyright 2005 Maui High Performance Computing Center, University of Hawaii
@@ -40 +40 @@
 typedef enum {
     PS_PRECESS_ROUGH,                  ///< roughest, lowest level of detail
-    PS_PRECESS_COMPLETE,               ///< complete level of detail
+    PS_PRECESS_COMPLETE_A,             ///< complete level of detail using IERS A
+    PS_PRECESS_COMPLETE_B,             ///< complete level of detail using IERS B
     PS_PRECESS_IAU2000A,               ///< highest level of detail
 }
@@ -179 +180 @@
  *  between two times.  The equinoxes shall be Julian equinoxes.
  *
- *  @return psSphere* the resulting spherical rotation
+ *  If NULL is provided for either time, it is assumed to have the reference
+ *  equinox value of J2000.  The mode argument is used to specify the level of
+ *  detail used in the calculation.
+ *
+ *  @return psSphere*:       the resulting spherical rotation
  */
-psSphere* psSpherePrecess(
-    psSphere *coords,                  ///< coordinates (modified in-place)
+psSphereRot* psSpherePrecess(
+    //    psSphere *coords,                  ///< coordinates (modified in-place)
     const psTime *fromTime,            ///< equinox of coords input
-    const psTime *toTime               ///< equinox of coords output
+    const psTime *toTime,              ///< equinox of coords output
+    psPrecessMethod mode               ///< level of detail to use
 );
 

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-18 20:59:31 $
+ *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-23 20:04:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -920 +920 @@
     PS_ASSERT_PTR_NON_NULL(time, NULL);
     psTime *out = NULL;
+    //Also see psEOC_PolarTideCorr for more info.
 
     // Convert psTime to MJD
@@ -982 +983 @@
     out = psTimeAlloc(time->type);
     *out = *time;
-    //    out->sec = time->sec;
-    //    out->nsec = time->nsec;
-    //    out->leapsecond = time->leapsecond;
     if (out->type != PS_TIME_UT1) {
         out = psTimeConvert(out, PS_TIME_UT1);
     }
+    //see if corrections include seconds or just nano-seconds
+    //nano-seconds must be converted (scaled) to integer values & total cannot be negative
     if (fabs(CORZ) > 1.0) {
         int sec = (int)CORZ;
@@ -1806 +1806 @@
 }
 
+psTime *p_psTimeCopy(const psTime *inTime)
+{
+    PS_ASSERT_PTR_NON_NULL(inTime, NULL);
+    psTime *outTime = psTimeAlloc(inTime->type);
+    *outTime = *inTime;
+    return outTime;
+}
+

trunk/psLib/src/astro/psTime.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-18 20:59:31 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-23 20:04:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -432 +432 @@
 psF64 psTimerStop(void);
 
+/** Private function for copying a psTime.
+ *
+ *  @return psTime*:        New copy of existing psTime.
+ */
+psTime *p_psTimeCopy(
+    const psTime *inTime               ///< input time to copy.
+);
+
 /// @}
 

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-18 01:51:03 $
+ *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-23 20:04:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -320 +320 @@
 {
     PS_ASSERT_PTR_NON_NULL(in,NULL);
+    PS_ASSERT_PTR_NON_NULL(in->list,NULL);
     if (out ==  NULL) {
         out = psMetadataAlloc();
@@ -438 +439 @@
                    ...)
 {
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
     va_list argPtr;
 
@@ -454 +457 @@
                     va_list list)
 {
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
     psMetadataItem* metadataItem = NULL;
 
@@ -480 +485 @@
 METADATA_ADD_TYPE(F64,psF64,PS_DATA_F64)
 METADATA_ADD_TYPE(List,psList*,PS_DATA_LIST)
-METADATA_ADD_TYPE(Str,const char*,PS_DATA_STRING)
+//METADATA_ADD_TYPE(Str,const char*,PS_DATA_STRING)
 METADATA_ADD_TYPE(Vector,psVector*,PS_DATA_VECTOR)
 METADATA_ADD_TYPE(Image,psImage*,PS_DATA_IMAGE)
@@ -497 +502 @@
                       psPtr value)
 {
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
+    PS_ASSERT_PTR_NON_NULL(value,false);
     return (psMetadataAdd(md, location, name, type, comment, value) );
+
+}
+
+bool psMetadataAddStr(psMetadata *md,
+                      long location,
+                      const char *name,
+                      int format,
+                      const char *comment,
+                      const char* value)
+{
+    PS_ASSERT_PTR_NON_NULL(md,false);
+    PS_ASSERT_PTR_NON_NULL(md->list,false);
+    PS_ASSERT_PTR_NON_NULL(value,false);
+    return (psMetadataAdd(md, location, name, format | PS_DATA_STRING, comment, value) );
 
 }
@@ -604 +626 @@
                           const char *key)
 {
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     psMetadataItem *metadataItem = NULL;
 
@@ -853 +877 @@
                                const char *key)
 {
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     psMetadataItem *item = psMetadataLookup((psMetadata*)md, key); // The metadata with instruments
     psMetadata *value = NULL;  // The value to return
@@ -885 +911 @@
                              const char *key)
 {
+    PS_ASSERT_PTR_NON_NULL(md,NULL);
+    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     psMetadataItem *item = psMetadataLookup((psMetadata*)md, key); // The metadata with instruments
     //    char *value = NULL;   // The value to return
@@ -917 +945 @@
                      int level)
 {
+    PS_ASSERT_PTR_NON_NULL(md,);
     psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); // Iterator
     psMetadataItem *item = NULL; // Item from metadata

trunk/psLib/test/astro/tst_psEarthOrientation.c

@@ -5 +5 @@
 *  @author d-Rob, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-18 23:49:06 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-23 20:04:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -132 +132 @@
     speed /= c;
 
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     empty = psAberration(empty, apparent, direction, speed);
     if (empty != NULL) {
@@ -138 +139 @@
         return 1;
     }
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
     empty = psAberration(empty, actual, apparent, speed);
     if (empty != NULL) {
@@ -951 +953 @@
     psTime*       fromTime    = psTimeFromMJD(MJD_2100);
     psTime*       toTime      = psTimeFromMJD(MJD_1900);
-
+    psSphereRot *rot = NULL;
     // Set input coordinate
     inputCoord->r = SPHERE_PRECESS_TP1_R;
@@ -959 +961 @@
 
     // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
+    rot = psSpherePrecess(fromTime, toTime, PS_PRECESS_ROUGH);
+    outputCoord = psSphereRotApply(NULL, rot, inputCoord);
+    if (outputCoord->r < -0.0001) {
+        outputCoord->r += 2.0 * M_PI;
+    }
+    //    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime, PS_PRECESS_ROUGH);
     // Verify return is not NULL
     if(outputCoord == NULL) {
@@ -977 +984 @@
     }
     psFree(outputCoord);
+    psFree(rot);
 
     // Set input coordinate
@@ -985 +993 @@
 
     // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
+    rot = psSpherePrecess(fromTime, toTime, PS_PRECESS_ROUGH);
+    outputCoord = psSphereRotApply(NULL, rot, inputCoord);
+    if (outputCoord->r < -0.0001) {
+        outputCoord->r += 2.0 * M_PI;
+    }
+    //    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime, PS_PRECESS_ROUGH);
     // Verify return is not NULL
     if(outputCoord == NULL) {
@@ -1003 +1016 @@
     }
     psFree(outputCoord);
+    psFree(rot);
 
     // Set input coordinate
@@ -1011 +1025 @@
 
     // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
+    rot = psSpherePrecess(fromTime, toTime, PS_PRECESS_ROUGH);
+    outputCoord = psSphereRotApply(NULL, rot, inputCoord);
+    if (outputCoord->r < -0.0001) {
+        outputCoord->r += 2.0 * M_PI;
+    }
+    //    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime, PS_PRECESS_ROUGH);
     // Verify return is not NULL
     if(outputCoord == NULL) {
@@ -1029 +1048 @@
     }
     psFree(outputCoord);
-
+    psFree(rot);
+
+    // Invoke precess with invalid parameter
+    /*
+        psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
+        outputCoord = psSpherePrecess(inputCoord, fromTime, NULL);
+        if(outputCoord != NULL) {
+            psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
+            return 10;
+        }
+     
+        // Invoke precess with invalid parameter
+        psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
+        outputCoord = psSpherePrecess(inputCoord, NULL, toTime);
+        if(outputCoord != NULL) {
+            psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
+            return 11;
+        }
+    */
     // Invoke precess with invalid parameter
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(inputCoord, fromTime, NULL);
-    if(outputCoord != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
-        return 10;
-    }
-
-    // Invoke precess with invalid parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(inputCoord, NULL, toTime);
-    if(outputCoord != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
-        return 11;
-    }
-
-    // Invoke precess with invalid parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(NULL, fromTime, toTime);
-    if(outputCoord != NULL) {
+    rot = psSpherePrecess(fromTime, toTime, 10);
+    //    outputCoord = psSpherePrecess(NULL, fromTime, toTime, PS_PRECESS_ROUGH);
+    if(rot != NULL) {
+        //    if(outputCoord != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
         return 12;
     }
+    psFree(rot);
 
     // Free objects

trunk/psLib/test/astro/tst_psTime_04.c

@@ -18 +18 @@
  *  @author  David Robbins, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-01-18 20:59:32 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2006-01-23 20:04:31 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
 
 testDescription tests[] = {
-                              {testTimeInit1,-1,"p_psTimeInit",0,false},
-                              {testTimeInit2,-2,"p_psTimeInit",0,false},
-                              {testTimeInit3,-3,"p_psTimeInit",0,false},
-                              {testTimeInit4,-4,"p_psTimeInit",0,false},
-                              {testTimeInit5,-5,"p_psTimeInit",0,false},
-                              {testTimeInit6,-6,"p_psTimeInit",0,false},
-                              {testTimer1,-7,"psTimer",0,false},
-                              {testTideUT1Corr,-8,"psTime_TideUT1Corr",0,false},
+                              {testTimeInit1,1,"p_psTimeInit",0,false},
+                              {testTimeInit2,2,"p_psTimeInit",0,false},
+                              {testTimeInit3,3,"p_psTimeInit",0,false},
+                              {testTimeInit4,4,"p_psTimeInit",0,false},
+                              {testTimeInit5,5,"p_psTimeInit",0,false},
+                              {testTimeInit6,6,"p_psTimeInit",0,false},
+                              {testTimer1,8,"psTimer",0,false},
+                              {testTideUT1Corr,9,"psTime_TideUT1Corr",0,false},
                               {NULL}
                           };

trunk/psLib/test/types/tst_psMetadata_07.c

@@ -16 +16 @@
 *  @author  David Robbins, MHPCC
 *
-*  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-11-18 01:51:03 $
+*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-01-23 20:04:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
 
 testDescription tests[] = {
-                              {testMetaIter, 0, "Test psMetadataIterator fxns", 0, false},
-                              {testMetaWrite, 0, "Test psMetadataConfigWrite", 0, false},
-                              {testMetaRemove, 0, "Test psMetadataRemoveKey/Index", 0, false},
-                              {testMetaAddPtr, 0, "Test psMetadataAddPtr", 0, false},
-                              {testMetaCopy, 0, "Test psMetadataCopy", 0, false},
-                              {testArgument, 0, "Test psArgument fxns", 0, false},
+                              {testMetaIter, 1, "Test psMetadataIterator fxns", 0, false},
+                              {testMetaWrite, 2, "Test psMetadataConfigWrite", 0, false},
+                              {testMetaRemove, 3, "Test psMetadataRemoveKey/Index", 0, false},
+                              {testMetaAddPtr, 4, "Test psMetadataAddPtr", 0, false},
+                              {testMetaCopy, 5, "Test psMetadataCopy", 0, false},
+                              {testArgument, 6, "Test psArgument fxns", 0, false},
                               {NULL}
                           };
@@ -220 +220 @@
         return 8;
     }
+
+    psMetadata *strtest = psMetadataAlloc();
+    //should return false for NULL input string
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if (psMetadataAddStr(strtest, PS_LIST_TAIL, "bar", 0, "baz", NULL) ) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, "strtest failed for NULL.\n");
+        return 9;
+    }
+    psFree(strtest);
 
     psFree(item);

trunk/psLib/test/types/verified/tst_psMetadata_07.stderr

@@ -32 +32 @@
 \**********************************************************************************/
 
+<DATE><TIME>|<HOST>|I|testMetaAddPtr
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataAddStr (FILE:LINENO)
+    Unallowable operation: value is NULL.
 
 ---> TESTPOINT PASSED (psMetadata_07{Test psMetadataAddPtr} | tst_psMetadata_07.c)