[cig-commits] r4154 - in long/3D/Gale/trunk/src/PICellerator: .
Apps/RayleighTaylor/tests/expected MaterialPoints/tests
MaterialPoints/tests/plugins
walter at geodynamics.org
walter at geodynamics.org
Tue Aug 1 01:53:58 PDT 2006
Author: walter
Date: 2006-08-01 01:53:58 -0700 (Tue, 01 Aug 2006)
New Revision: 4154
Modified:
long/3D/Gale/trunk/src/PICellerator/
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay2D.0of1.denseMaterialCentroid.dat.expected
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay3D.0of1.denseMaterialCentroid.dat.expected
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D-invert.0of1.lightMaterialCentroid.dat.expected
long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D.0of1.denseMaterialCentroid.dat.expected
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c
long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testAdvection.xml
Log:
r466 at earth: boo | 2006-08-01 01:52:06 -0700
r461 at earth (orig r364): PatrickSunter | 2006-07-26 18:00:25 -0700
Updating tests in PICellerator as a result of dt calculation update of StgFEM:
* Mostly just needed to offset the expected values by one timestep, given advection occurs
sooner in the new scheme.
Property changes on: long/3D/Gale/trunk/src/PICellerator
___________________________________________________________________
Name: svk:merge
- 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:363
aee11096-cf10-0410-a191-eea5772ba81f:/cig:465
+ 00de75e2-39f1-0310-8538-9683d00a49cc:/trunk:364
aee11096-cf10-0410-a191-eea5772ba81f:/cig:466
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay2D.0of1.denseMaterialCentroid.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay2D.0of1.denseMaterialCentroid.dat.expected 2006-08-01 08:53:57 UTC (rev 4153)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay2D.0of1.denseMaterialCentroid.dat.expected 2006-08-01 08:53:58 UTC (rev 4154)
@@ -1,3 +1,3 @@
# Timestep Time Volume CentroidX CentroidY CentroidZ
- 1 0 0.07 0.498471 0.499386 0
- 2 8.9377 0.0698 0.499859 0.462835 0
+ 1 0 0.0698 0.499859 0.462836 0
+ 2 8.93795 0.0694 0.49841 0.429483 0
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay3D.0of1.denseMaterialCentroid.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay3D.0of1.denseMaterialCentroid.dat.expected 2006-08-01 08:53:57 UTC (rev 4153)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTay3D.0of1.denseMaterialCentroid.dat.expected 2006-08-01 08:53:58 UTC (rev 4154)
@@ -1,3 +1,3 @@
# Timestep Time Volume CentroidX CentroidY CentroidZ
- 1 0 0.01384 0.500577 0.498479 0.499403
- 2 9.45228 0.014038 0.500444 0.468008 0.499153
+ 1 0 0.014038 0.500444 0.468008 0.499153
+ 2 9.45228 0.013806 0.500059 0.433079 0.498888
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D-invert.0of1.lightMaterialCentroid.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D-invert.0of1.lightMaterialCentroid.dat.expected 2006-08-01 08:53:57 UTC (rev 4153)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D-invert.0of1.lightMaterialCentroid.dat.expected 2006-08-01 08:53:58 UTC (rev 4154)
@@ -1,3 +1,3 @@
# Timestep Time Volume CentroidX CentroidY CentroidZ
- 1 0 0.929314 0.500056 0.499954 0
- 2 8.92749 0.929314 0.500049 0.502686 0
+ 1 0 0.929314 0.500049 0.502686 0
+ 2 8.92749 0.929314 0.50005 0.505428 0
Modified: long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D.0of1.denseMaterialCentroid.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D.0of1.denseMaterialCentroid.dat.expected 2006-08-01 08:53:57 UTC (rev 4153)
+++ long/3D/Gale/trunk/src/PICellerator/Apps/RayleighTaylor/tests/expected/testRayTaySuperimposedBall2D.0of1.denseMaterialCentroid.dat.expected 2006-08-01 08:53:58 UTC (rev 4154)
@@ -1,3 +1,3 @@
# Timestep Time Volume CentroidX CentroidY CentroidZ
- 1 0 0.0706858 0.500122 0.50009 0
- 2 8.90839 0.0706858 0.500163 0.464306 0
+ 1 0 0.0706858 0.500163 0.464306 0
+ 2 8.90839 0.0706858 0.500205 0.428504 0
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c 2006-08-01 08:53:57 UTC (rev 4153)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/plugins/testAdvection.c 2006-08-01 08:53:58 UTC (rev 4154)
@@ -102,7 +102,7 @@
double originalRadius;
double originalTheta;
Coord analyticCoord;
- double time = context->currentTime;
+ double time = context->currentTime + context->dt;
Dictionary* dictionary = context->dictionary;
Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
@@ -117,8 +117,8 @@
currentRadius = StGermain_VectorMagnitude( coord, 2 );
originalRadius = StGermain_VectorMagnitude( originalCoord, 2 );
- if ( originalRadius >= 1.0 || currentRadius >= 1.0 )
- continue;
+ //if ( originalRadius >= 1.0 || currentRadius >= 1.0 )
+ // continue;
originalTheta = acos( originalCoord[ I_AXIS ]/originalRadius );
if ( originalCoord[ J_AXIS ] < 0.0 )
Modified: long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testAdvection.xml
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testAdvection.xml 2006-08-01 08:53:57 UTC (rev 4153)
+++ long/3D/Gale/trunk/src/PICellerator/MaterialPoints/tests/testAdvection.xml 2006-08-01 08:53:58 UTC (rev 4154)
@@ -70,12 +70,13 @@
<param name="elementResK"> 1 </param>
<param name="shadowDepth"> 1 </param>
- <param name="minX"> -1.0 </param>
- <param name="minY"> -1.0 </param>
- <param name="minZ"> -1.0 </param>
- <param name="maxX"> 1.0 </param>
- <param name="maxY"> 1.0 </param>
- <param name="maxZ"> 1.0 </param>
+ <!-- Need to allow a little space for error, esp. in the euler case -->
+ <param name="minX"> -1.1 </param>
+ <param name="minY"> -1.1 </param>
+ <param name="minZ"> -1.1 </param>
+ <param name="maxX"> 1.1 </param>
+ <param name="maxY"> 1.1 </param>
+ <param name="maxZ"> 1.1 </param>
<param name="allowUnbalancing"> True </param>
<param name="buildElementNodeTbl"> True </param>
More information about the cig-commits
mailing list