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

walter at geodynamics.org walter at geodynamics.org
Tue Aug 1 01:56:10 PDT 2006 

Author: walter
Date: 2006-08-01 01:56:10 -0700 (Tue, 01 Aug 2006)
New Revision: 4182

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/expected/testVonMisesYieldCriterion.0of1.testYieldCriterion.dat.expected
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector/testDirector.c
Log:
 r431 at earth:  boo | 2006-08-01 01:53:44 -0700
  r411 at earth (orig r282):  PatrickSunter | 2006-07-26 17:30:18 -0700
  Updating Underworld Rheology tests to account for recent change in DT
  calculation. Results very similar, just had to take into account new
  dt being used immediately.
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:430
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:281
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:431
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:282

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-08-01 08:56:07 UTC (rev 4181)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testDirector2D_RandomDirs.0of1.testDirectorRandomness.dat.expected	2006-08-01 08:56:10 UTC (rev 4182)
@@ -2,37 +2,37 @@
 
 Circle angle 0-9 count = 5
 Circle angle 10-19 count = 3
-Circle angle 20-29 count = 3
-Circle angle 30-39 count = 5
-Circle angle 40-49 count = 13
-Circle angle 50-59 count = 7
-Circle angle 60-69 count = 5
-Circle angle 70-79 count = 3
-Circle angle 80-89 count = 2
-Circle angle 90-99 count = 5
-Circle angle 100-109 count = 4
-Circle angle 110-119 count = 6
+Circle angle 20-29 count = 2
+Circle angle 30-39 count = 4
+Circle angle 40-49 count = 6
+Circle angle 50-59 count = 13
+Circle angle 60-69 count = 6
+Circle angle 70-79 count = 4
+Circle angle 80-89 count = 3
+Circle angle 90-99 count = 2
+Circle angle 100-109 count = 3
+Circle angle 110-119 count = 5
 Circle angle 120-129 count = 9
-Circle angle 130-139 count = 9
-Circle angle 140-149 count = 9
-Circle angle 150-159 count = 8
+Circle angle 130-139 count = 11
+Circle angle 140-149 count = 11
+Circle angle 150-159 count = 9
 Circle angle 160-169 count = 4
 Circle angle 170-179 count = 5
 Circle angle 180-189 count = 8
 Circle angle 190-199 count = 2
-Circle angle 200-209 count = 4
+Circle angle 200-209 count = 2
 Circle angle 210-219 count = 4
-Circle angle 220-229 count = 6
-Circle angle 230-239 count = 7
-Circle angle 240-249 count = 2
+Circle angle 220-229 count = 5
+Circle angle 230-239 count = 6
+Circle angle 240-249 count = 5
 Circle angle 250-259 count = 5
 Circle angle 260-269 count = 2
 Circle angle 270-279 count = 2
-Circle angle 280-289 count = 5
-Circle angle 290-299 count = 6
-Circle angle 300-309 count = 6
-Circle angle 310-319 count = 7
-Circle angle 320-329 count = 7
-Circle angle 330-339 count = 8
+Circle angle 280-289 count = 4
+Circle angle 290-299 count = 4
+Circle angle 300-309 count = 7
+Circle angle 310-319 count = 8
+Circle angle 320-329 count = 8
+Circle angle 330-339 count = 9
 Circle angle 340-349 count = 3
 Circle angle 350-359 count = 11

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testVonMisesYieldCriterion.0of1.testYieldCriterion.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testVonMisesYieldCriterion.0of1.testYieldCriterion.dat.expected	2006-08-01 08:56:07 UTC (rev 4181)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testVonMisesYieldCriterion.0of1.testYieldCriterion.dat.expected	2006-08-01 08:56:10 UTC (rev 4182)
@@ -1,3 +1,3 @@
-Material yielded at time 0.753305 (step 14) within:
-	x:       0.3884 -        2.612
-	y:      0.02811 -        1.302
+Material yielded at time 0.741745 (step 14) within:
+	x:       0.3877 -        2.612
+	y:       0.0281 -        1.301

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector/testDirector.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector/testDirector.c	2006-08-01 08:56:07 UTC (rev 4181)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector/testDirector.c	2006-08-01 08:56:10 UTC (rev 4182)
@@ -19,7 +19,7 @@
 	Director*               director;
 	Particle_Index          lParticle_I;
 	GlobalParticle*         particle;
-	double                  time                   = context->currentTime;
+	double                  time                   = context->currentTime + context->dt;
 	Swarm*                  swarm;
 	double                  error                  = 0.0;
 	double                  alignmentValue;

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml	2006-08-01 08:56:07 UTC (rev 4181)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/testDirector.xml	2006-08-01 08:56:10 UTC (rev 4182)
@@ -97,10 +97,10 @@
 		</struct>
 		<struct name="alignmentDrawingObject">
 			<param name="Type">lucSwarmVectors</param>
-			<param name="Swarm">picIntegrationPoints</param>
+			<param name="Swarm">materialPointsSwarm</param>
 			<param name="ColourVariable">alignment</param>
 			<param name="ColourMap">alignmentColourMap</param>
-			<param name="DirectionVariable">picIntegrationPoints-Director</param>
+			<param name="DirectionVariable">materialPointsSwarm-Director</param>
 			<param name="arrowHeadSize">0.0</param>
 		</struct>	
 		<struct name="AlignmentVP">

More information about the cig-commits mailing list