Changeset 9665 for trunk/psLib
- Timestamp:
- Oct 19, 2006, 2:17:21 PM (20 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 4 edited
-
astro/psEarthOrientation.c (modified) (5 diffs)
-
astro/psTime.c (modified) (4 diffs)
-
astro/psTime.h (modified) (2 diffs)
-
types/psMetadata.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/astro/psEarthOrientation.c
r8776 r9665 8 8 * @author Robert Daniel DeSonia, MHPCC 9 9 * 10 * @version $Revision: 1. 39$ $Name: not supported by cvs2svn $11 * @date $Date: 2006- 09-08 02:33:23$10 * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2006-10-20 00:17:21 $ 12 12 * 13 13 * Copyright 2005 Maui High Performance Computing Center, University of Hawaii … … 756 756 PS_ASSERT_PTR_NON_NULL(time,NULL); 757 757 //Create a copy of the input time that can be manipulated/changed (input time is const). 758 psTime *in = p _psTimeCopy(time);758 psTime *in = psTimeCopy(time); 759 759 if (in->type != PS_TIME_UT1) { 760 760 in = psTimeConvert(in, PS_TIME_UT1); … … 1301 1301 from = psTimeFromMJD(fromMJD); 1302 1302 } else { 1303 from = p _psTimeCopy(fromTime);1303 from = psTimeCopy(fromTime); 1304 1304 } 1305 1305 if (toTime == NULL) { 1306 1306 to = psTimeFromMJD(toMJD); 1307 1307 } else { 1308 to = p _psTimeCopy(toTime);1308 to = psTimeCopy(toTime); 1309 1309 } 1310 1310 //Calculate the earthpoles and quaternions corresponding to each time (from, to). … … 1334 1334 from = psTimeFromMJD(fromMJD); 1335 1335 } else { 1336 from = p _psTimeCopy(fromTime);1336 from = psTimeCopy(fromTime); 1337 1337 } 1338 1338 if (toTime == NULL) { 1339 1339 to = psTimeFromMJD(toMJD); 1340 1340 } else { 1341 to = p _psTimeCopy(toTime);1341 to = psTimeCopy(toTime); 1342 1342 } 1343 1343 //Calculate the earthpoles and quaternions corresponding to each time (from, to). … … 1376 1376 from = psTimeFromMJD(fromMJD); 1377 1377 } else { 1378 from = p _psTimeCopy(fromTime);1378 from = psTimeCopy(fromTime); 1379 1379 } 1380 1380 if (toTime == NULL) { 1381 1381 to = psTimeFromMJD(toMJD); 1382 1382 } else { 1383 to = p _psTimeCopy(toTime);1383 to = psTimeCopy(toTime); 1384 1384 } 1385 1385 -
trunk/psLib/src/astro/psTime.c
r8776 r9665 10 10 * @author Ross Harman, MHPCC 11 11 * 12 * @version $Revision: 1.9 7$ $Name: not supported by cvs2svn $13 * @date $Date: 2006- 09-08 02:33:23$12 * @version $Revision: 1.98 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2006-10-20 00:17:21 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1302 1302 PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,(psU32)((1e9)-1),NAN); 1303 1303 1304 psTime *time2 = p _psTimeCopy(time);1304 psTime *time2 = psTimeCopy(time); 1305 1305 //XXX: ADD says that this formula works only for PS_TIME_TAI, so adding the following: 1306 1306 if (time->type == PS_TIME_UTC || time->type == PS_TIME_TT) { … … 1328 1328 PS_ASSERT_PTR_NON_NULL(time,NAN); 1329 1329 PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,(psU32)((1e9)-1),NAN); 1330 psTime *time2 = p _psTimeCopy(time);1330 psTime *time2 = psTimeCopy(time); 1331 1331 //XXX: ADD says that this formula works only for PS_TIME_TAI, so adding the following: 1332 1332 if (time->type == PS_TIME_UTC || time->type == PS_TIME_TT) { … … 1861 1861 } 1862 1862 1863 psTime *p _psTimeCopy(const psTime *inTime)1863 psTime *psTimeCopy(const psTime *inTime) 1864 1864 { 1865 1865 PS_ASSERT_PTR_NON_NULL(inTime, NULL); -
trunk/psLib/src/astro/psTime.h
r8595 r9665 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1. 49$ $Name: not supported by cvs2svn $14 * @date $Date: 2006- 08-25 20:04:16$13 * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2006-10-20 00:17:21 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 473 473 psF64 psTimerStop(void); 474 474 475 /** Private function for copyinga psTime.475 /** Copy a psTime. 476 476 * 477 477 * @return psTime*: New copy of existing psTime. 478 478 */ 479 psTime *p _psTimeCopy(479 psTime *psTimeCopy( 480 480 const psTime *inTime ///< input time to copy. 481 481 ); -
trunk/psLib/src/types/psMetadata.c
r9635 r9665 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.14 2$ $Name: not supported by cvs2svn $15 * @date $Date: 2006-10- 18 20:16:58$14 * @version $Revision: 1.143 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2006-10-20 00:17:21 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 377 377 } 378 378 case PS_DATA_TIME: { 379 psTime *timeCopy = p _psTimeCopy( (psTime*)(in->data.V) );379 psTime *timeCopy = psTimeCopy( (psTime*)(in->data.V) ); 380 380 if (timeCopy == NULL) { 381 381 psError(PS_ERR_BAD_PARAMETER_NULL, false,
Note:
See TracChangeset
for help on using the changeset viewer.
