[cig-commits] r4932 - in long/3D/Gale/trunk/src/Underworld: . Rheology/tests/expected Rheology/tests/testDirectorRandomness

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:54:13 -0700 (Wed, 11 Oct 2006)
New Revision: 4932

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testDirector2D_RandomDirs.0of1.testDirectorRandomness.dat.expected
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandomness/testDirectorRandomness.c
Log:
 r592 at earth:  boo | 2006-10-11 13:52:09 -0700
  r554 at earth (orig r331):  KathleenHumble | 2006-09-13 18:17:19 -0700
  patching test and chamging a print statement
  to get rid of a spurious error due
  to a bad print statement.
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:591
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:330
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:592
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:331

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testDirector2D_RandomDirs.0of1.testDirectorRandomness.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testDirector2D_RandomDirs.0of1.testDirectorRandomness.dat.expected	2006-10-11 20:54:10 UTC (rev 4931)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testDirector2D_RandomDirs.0of1.testDirectorRandomness.dat.expected	2006-10-11 20:54:13 UTC (rev 4932)
@@ -1,5 +1,5 @@
 Swarm has 200 local particles, therefore expect average of 5.6 director normals in each 10 degrees of arc.
 
-The standard deviation of director normals is within tolerance, 0.1, of expected standard deviation, 2.8 
+The standard deviation of director normals is within tolerance, 1.0, of expected standard deviation, 2.8 
 
 All circle angle counts are within range.

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandomness/testDirectorRandomness.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandomness/testDirectorRandomness.c	2006-10-11 20:54:10 UTC (rev 4931)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirectorRandomness/testDirectorRandomness.c	2006-10-11 20:54:13 UTC (rev 4932)
@@ -7,7 +7,7 @@
 
 #include <assert.h>
 
-#define TEST_RAND_DIR_ERROR 1
+#define TEST_RAND_DIR_ERROR 1.0
 
 void Underworld_testDirectorRandomness_Function( FiniteElementContext* context ) {
 	AlignmentSwarmVariable* alignment              = (AlignmentSwarmVariable*) LiveComponentRegister_Get( context->CF->LCRegister, "alignment" );
@@ -69,14 +69,15 @@
 	circleAngleStdDev = sqrt(circleAngleSum / (36-1));
 	
 	#define TheoreticalStandardDeviation 2.82843
+	
 	if (fabs(circleAngleStdDev - TheoreticalStandardDeviation) < TEST_RAND_DIR_ERROR ) {
 		Journal_Printf( stream, "The standard deviation of director normals is within "
-		"tolerance, %g, of expected standard deviation, %.1f \n\n", 
+		"tolerance, %.1f, of expected standard deviation, %.1f \n\n", 
 		TEST_RAND_DIR_ERROR, TheoreticalStandardDeviation);
 	}
 	else {
 		Journal_Printf( stream, "The standard deviation of director normals is not within"
-		" tolerance, %g, of expected standard deviation, %.1f,instead is = %.1f \n\n", 
+		" tolerance, %.1f, of expected standard deviation, %.1f, instead is = %.1f \n\n", 
 		TEST_RAND_DIR_ERROR, TheoreticalStandardDeviation, circleAngleStdDev);
 	}