Changeset 3712 for trunk/psLib/test/astronomy/tst_psTime_01.c

Timestamp:

Apr 18, 2005, 4:13:53 PM (21 years ago)

Author:

evanalst

Message:

Modify the psTime data structure. (SDR-13)

File:

• trunk/psLib/test/astronomy/tst_psTime_01.c (modified) (10 diffs)

trunk/psLib/test/astronomy/tst_psTime_01.c

@@ -23 +23 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.24 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-04-19 00:17:06 $
+ *  @version $Revision: 1.25 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-19 02:13:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
     testTime = (psTime*)psAlloc(sizeof(psTime));
     testTime->sec = 1090434144;
-    testTime->usec = 272044;
+    testTime->nsec = 272044000;
     testTime->type = PS_TIME_TAI;
 
@@ -57 +57 @@
     // Test B - Print test time
     printPositiveTestHeader(stdout,"psTime", "Print test time");
-    printf("Test time: Seconds = %lld Microseconds = %u\n",
+    printf("Test time: Seconds = %lld Nanoseconds = %u\n",
            (long long int)testTime->sec,
-           testTime->usec);
+           testTime->nsec);
     printFooter(stdout, "psTime", "Print test time", true);
 
@@ -79 +79 @@
     psTime *timeD = NULL;
     timeD = psTimeFromISO(isoString);
-    printf("psTime: Seconds = %lld Microseconds = %u\n",
+    printf("psTime: Seconds = %lld Nanoseconds = %u\n",
            (long long int)timeD->sec,
-           timeD->usec);
+           timeD->nsec);
     psFree(isoString);
     psFree(timeD);
@@ -92 +92 @@
     timeE = (psTime*)psAlloc(sizeof(psTime));
     timeE->sec = 1090434144;
-    timeE->usec = 272044;
+    timeE->nsec = 272044000;
     timeE->type = PS_TIME_TAI;
     timeE = psTimeConvert(timeE, PS_TIME_UTC);
     psFree(timeE);
-    printf("psTime: Seconds = %lld Microseconds = %u\n",
+    printf("psTime: Seconds = %lld Nanoseconds = %u\n",
            (long long int)timeE->sec,
-           timeE->usec);
+           timeE->nsec);
     printFooter(stdout, "psTime", "Convert psTime time to UTC time", true);
 
@@ -107 +107 @@
     timeF = (psTime*)psAlloc(sizeof(psTime));
     timeF->sec = 1090434112;
-    timeF->usec = 272044;
+    timeF->nsec = 272044000;
     timeF->type = PS_TIME_UTC;
     timeF = psTimeConvert(timeF, PS_TIME_TAI);
     psFree(timeF);
-    printf("psTime: Seconds = %lld Microseconds = %u\n",
+    printf("psTime: Seconds = %lld Nanoseconds = %u\n",
            (long long int)timeF->sec,
-           timeF->usec);
+           timeF->nsec);
     printFooter(stdout, "psTime", "Convert UTC time to psTime", true);
 
@@ -129 +129 @@
     psTime *timeH = NULL;
     timeH = psTimeFromMJD(mjdTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n",
+    printf("psTime: Seconds = %lld Nanoseconds = %u\n",
            (long long int)timeH->sec,
-           timeH->usec);
+           timeH->nsec);
     psFree(timeH);
     printFooter(stdout, "psTime", "Convert MJD time to psTime", true);
@@ -148 +148 @@
     psTime *timeJ = NULL;
     timeJ = psTimeFromJD(jdTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n",
+    printf("psTime: Seconds = %lld Nanoseconds = %u\n",
            (long long int)timeJ->sec,
-           timeJ->usec);
+           timeJ->nsec);
     psFree(timeJ);
     printFooter(stdout, "psTime", "Convert JD time to psTime", true);
@@ -169 +169 @@
     psTime *timeL = NULL;
     timeL = psTimeFromTimeval(&timevalTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n",
+    printf("psTime: Seconds = %lld Nanoseconds = %u\n",
            (long long int)timeL->sec,
-           timeL->usec);
+           timeL->nsec);
     psFree(timeL);
     printFooter(stdout, "psTime", "Convert timeval time to psTime", true);
@@ -194 +194 @@
     psTime *timeN = NULL;
     timeN = psTimeFromTM(tmTime);
-    printf("psTime: Seconds = %lld Microseconds = %u\n",
+    printf("psTime: Seconds = %lld Nanoseconds = %u\n",
            (long long int)timeN->sec,
-           timeN->usec);
+           timeN->nsec);
     psFree(timeN);
     psFree(tmTime);