Changeset 5306 for trunk/psLib/test/astro

Timestamp:

Oct 13, 2005, 10:23:57 AM (21 years ago)

Author:

drobbin

Message:

Fixed psSphereRotAlloc and test. Correctly verified calculations.

Location:

trunk/psLib/test/astro

Files:

• tst_psEarthOrientation.c (modified) (2 diffs)
• tst_psSphereOps.c (modified) (3 diffs)
• verified/tst_psSphereOps.stdout (modified) (1 diff)

trunk/psLib/test/astro/tst_psEarthOrientation.c

@@ -1 @@
-/** @file  tst_psCoord.c
+/** @file  tst_psEarthOrientation.c
 *
 *  @brief The code will go on ...
@@ -6 +6 @@
 *  @author d-Rob, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-10-07 21:27:50 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-10-13 20:23:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/test/astro/tst_psSphereOps.c

@@ -6 +6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-10-08 03:51:20 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-10-13 20:23:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -48 +48 @@
 #define ERROR_TOL   0.0001
 
-#define ALPHA_P 0.5 * M_PI
-#define DELTA_P 1.0 * M_PI
-#define PHI_P 1.5 * M_PI
+#define ALPHA_P M_PI/6
+#define DELTA_P M_PI/4
+#define PHI_P M_PI/2
 
 psS32 testSphereRotAlloc( void )
@@ -62 +62 @@
         return 1;
     }
-    // Verify sin member is updated
-    double vx = cos(DELTA_P)*cos(ALPHA_P);
-    double vy = cos(DELTA_P)*sin(ALPHA_P);
-    double vz = sin(DELTA_P);
-    double q0 = vx * sin(PHI_P/2.0);
-    double q1 = vy * sin(PHI_P/2.0);
-    double q2 = vz * sin(PHI_P/2.0);
-    double q3 = cos(PHI_P/2.0);
-    double len = sqrt(q0*q0 + q1*q1 + q2*q2 + q3*q3);
-    printf("\nvz = %lf\n", vz);
-    q0 = q0/len;
-    q1 = q1/len;
-    q2 = q2/len;
-    q3 = q3/len;
-
+
+    double a0 = (ALPHA_P - PHI_P)/2.0;
+    double a1 = (ALPHA_P - PHI_P)/2.0;
+    double a2 = (ALPHA_P + PHI_P)/2.0;
+    double a3 = (ALPHA_P + PHI_P)/2.0;
+
+    double q3 = cos(a3)*cos(DELTA_P/2);
+    double q0 = sin(a0)*sin(DELTA_P/2);
+    double q1 = cos(a1)*sin(DELTA_P/2);
+    double q2 = sin(a2)*cos(DELTA_P/2);
+
+    printf("\n q0=%lf, q1=%lf, q2=%lf, q3=%lf,\n", q0, q1, q2, q3);
+    printf("myq0=%lf, myq1=%lf, myq2=%lf, myq3=%lf\n", myST->q0, myST->q1, myST->q2, myST->q3);
     if (FLT_EPSILON < fabs(q0 - myST->q0)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q0 is %f, should be %f\n", myST->q0, q0);
+        psError(PS_ERR_UNKNOWN,true,"myST->q0 is %lf, should be %lf\n", myST->q0, q0);
         return 2;
     }

trunk/psLib/test/astro/verified/tst_psSphereOps.stdout

@@ +1 @@
+
+ q0=-0.191342, q1=0.331414, q2=0.800103, q3=0.461940,
+myq0=-0.191342, myq1=0.331414, myq2=0.800103, myq3=0.461940