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

walter at geodynamics.org walter at geodynamics.org
Tue Aug 1 01:55:33 PDT 2006 

Author: walter
Date: 2006-08-01 01:55:32 -0700 (Tue, 01 Aug 2006)
New Revision: 4171

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian2D.0of1.output.dat.expected
   long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian3D.0of1.output.dat.expected
Log:
 r420 at earth:  boo | 2006-08-01 01:53:40 -0700
  r400 at earth (orig r271):  JulianGiordani | 2006-07-24 18:39:44 -0700
  
  Just patching these tests. After Pat's change ( rev 263 ) the data structure of the constitutiveMatrix was modified, ie, no longer was there a self->sleHasExecuted instead there was a self->previousSolutionExists. The tests were failing because of this, and only this, diff. Now it's patched and should pass.
   
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:419
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:270
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:420
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:271

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian2D.0of1.output.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian2D.0of1.output.dat.expected	2006-08-01 08:55:29 UTC (rev 4170)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian2D.0of1.output.dat.expected	2006-08-01 08:55:32 UTC (rev 4171)
@@ -1,23 +1,23 @@
 Constitutive Matrix after initialisation.
-constitutiveMatrix = (ptr)0x8082010
-	StiffnessMatrixTerm (ptr): 0x8082010
-	Stg_Component (ptr): 0x8082010
-	Stg_Object (ptr): 0x8082010
-		Stg_Class (ptr): 0x8082010
+constitutiveMatrix = (ptr)0x8075870
+	StiffnessMatrixTerm (ptr): 0x8075870
+	Stg_Component (ptr): 0x8075870
+	Stg_Object (ptr): 0x8075870
+		Stg_Class (ptr): 0x8075870
 			sizeOfSelf: 176
 			_deleteSelf: Yes
 			type: ConstitutiveMatrixCartesian
-			_delete (func ptr): 0xb7f07b35
-			_print (func ptr): 0xb7f07b5e
+			_delete (func ptr): 0x400287be
+			_print (func ptr): 0x400287ea
 			_copy (func ptr): (nil)
 		name: constitutiveMatrix
 		nameAllocationType: NON_GLOBAL
-		_defaultConstructor (func ptr): 0xb7f07b8e
-		_construct (func ptr): 0xb7f07c63
-		_build (func ptr): 0xb7f07c9e
-		_initialise (func ptr): 0xb7f07cce
-		_execute (func ptr): 0xb7f07cfe
-		_destroy (func ptr): 0xb7f07d28
+		_defaultConstructor (func ptr): 0x40028819
+		_construct (func ptr): 0x400288b8
+		_build (func ptr): 0x400288f5
+		_initialise (func ptr): 0x40028924
+		_execute (func ptr): 0x40028953
+		_destroy (func ptr): 0x4002897c
 		isConstructed: True
 		isBuilt: True
 		isInitialised: True
@@ -28,15 +28,15 @@
 		initialise function name: constitutiveMatrix-Initialise
 		execute function name: constitutiveMatrix-Execute
 		destroy function name: constitutiveMatrix-Destroy
-		integrationSwarm (ptr): 0x80822a0
+		integrationSwarm (ptr): 0x8085468
 		extraInfo (ptr): (nil)
-	self->_setValue = (ptr)0xb7f08614
-	self->_getViscosity = (ptr)0xb7f08982
-	self->_isotropicCorrection = (ptr)0xb7f08a1f
-	self->_setSecondViscosity = (ptr)0xb7f08bc0
-	self->_assemble_D_B = (ptr)0xb7f094a5
-	self->_calculateStress = (ptr)0xb7f09d5f
-	self->debug = (ptr)0x80907f0
+	self->_setValue = (ptr)0x40029207
+	self->_getViscosity = (ptr)0x40029769
+	self->_isotropicCorrection = (ptr)0x4002982f
+	self->_setSecondViscosity = (ptr)0x400299e8
+	self->_assemble_D_B = (ptr)0x4002a557
+	self->_calculateStress = (ptr)0x4002ae66
+	self->debug = (ptr)0x8095420
 	matrixData[ 0 ][ 0 ] = 0; 	matrixData[ 0 ][ 1 ] = 0; 	matrixData[ 0 ][ 2 ] = 0; 	
 	matrixData[ 1 ][ 0 ] = 0; 	matrixData[ 1 ][ 1 ] = 0; 	matrixData[ 1 ][ 2 ] = 0; 	
 	matrixData[ 2 ][ 0 ] = 0; 	matrixData[ 2 ][ 1 ] = 0; 	matrixData[ 2 ][ 2 ] = 0; 	
@@ -44,7 +44,7 @@
 	self->dim = 2
 	self->columnSize = 3
 	self->rowSize = 3
-	self->sleHasExecuted = False
+	self->previousSolutionExists = False
 Constitutive Matrix after func 'SetMatrixWithThrees'.
 matrixData[ 0 ][ 0 ] = 3; 	matrixData[ 0 ][ 1 ] = 3; 	matrixData[ 0 ][ 2 ] = 3; 	
 matrixData[ 1 ][ 0 ] = 3; 	matrixData[ 1 ][ 1 ] = 3; 	matrixData[ 1 ][ 2 ] = 3; 	

Modified: long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian3D.0of1.output.dat.expected
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian3D.0of1.output.dat.expected	2006-08-01 08:55:29 UTC (rev 4170)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/tests/expected/testConstitutiveMatrixCartesian3D.0of1.output.dat.expected	2006-08-01 08:55:32 UTC (rev 4171)
@@ -1,23 +1,23 @@
 Constitutive Matrix after initialisation.
-constitutiveMatrix = (ptr)0x8078dd0
-	StiffnessMatrixTerm (ptr): 0x8078dd0
-	Stg_Component (ptr): 0x8078dd0
-	Stg_Object (ptr): 0x8078dd0
-		Stg_Class (ptr): 0x8078dd0
+constitutiveMatrix = (ptr)0x807e5b8
+	StiffnessMatrixTerm (ptr): 0x807e5b8
+	Stg_Component (ptr): 0x807e5b8
+	Stg_Object (ptr): 0x807e5b8
+		Stg_Class (ptr): 0x807e5b8
 			sizeOfSelf: 176
 			_deleteSelf: Yes
 			type: ConstitutiveMatrixCartesian
-			_delete (func ptr): 0xb7f43b35
-			_print (func ptr): 0xb7f43b5e
+			_delete (func ptr): 0x400287be
+			_print (func ptr): 0x400287ea
 			_copy (func ptr): (nil)
 		name: constitutiveMatrix
 		nameAllocationType: NON_GLOBAL
-		_defaultConstructor (func ptr): 0xb7f43b8e
-		_construct (func ptr): 0xb7f43c63
-		_build (func ptr): 0xb7f43c9e
-		_initialise (func ptr): 0xb7f43cce
-		_execute (func ptr): 0xb7f43cfe
-		_destroy (func ptr): 0xb7f43d28
+		_defaultConstructor (func ptr): 0x40028819
+		_construct (func ptr): 0x400288b8
+		_build (func ptr): 0x400288f5
+		_initialise (func ptr): 0x40028924
+		_execute (func ptr): 0x40028953
+		_destroy (func ptr): 0x4002897c
 		isConstructed: True
 		isBuilt: True
 		isInitialised: True
@@ -28,15 +28,15 @@
 		initialise function name: constitutiveMatrix-Initialise
 		execute function name: constitutiveMatrix-Execute
 		destroy function name: constitutiveMatrix-Destroy
-		integrationSwarm (ptr): 0x8082c18
+		integrationSwarm (ptr): 0x806b308
 		extraInfo (ptr): (nil)
-	self->_setValue = (ptr)0xb7f44614
-	self->_getViscosity = (ptr)0xb7f44982
-	self->_isotropicCorrection = (ptr)0xb7f44a1f
-	self->_setSecondViscosity = (ptr)0xb7f44bc0
-	self->_assemble_D_B = (ptr)0xb7f454a5
-	self->_calculateStress = (ptr)0xb7f45d5f
-	self->debug = (ptr)0x8091908
+	self->_setValue = (ptr)0x40029207
+	self->_getViscosity = (ptr)0x40029769
+	self->_isotropicCorrection = (ptr)0x4002982f
+	self->_setSecondViscosity = (ptr)0x400299e8
+	self->_assemble_D_B = (ptr)0x4002a557
+	self->_calculateStress = (ptr)0x4002ae66
+	self->debug = (ptr)0x8096520
 	matrixData[ 0 ][ 0 ] = 0; 	matrixData[ 0 ][ 1 ] = 0; 	matrixData[ 0 ][ 2 ] = 0; 	matrixData[ 0 ][ 3 ] = 0; 	matrixData[ 0 ][ 4 ] = 0; 	matrixData[ 0 ][ 5 ] = 0; 	
 	matrixData[ 1 ][ 0 ] = 0; 	matrixData[ 1 ][ 1 ] = 0; 	matrixData[ 1 ][ 2 ] = 0; 	matrixData[ 1 ][ 3 ] = 0; 	matrixData[ 1 ][ 4 ] = 0; 	matrixData[ 1 ][ 5 ] = 0; 	
 	matrixData[ 2 ][ 0 ] = 0; 	matrixData[ 2 ][ 1 ] = 0; 	matrixData[ 2 ][ 2 ] = 0; 	matrixData[ 2 ][ 3 ] = 0; 	matrixData[ 2 ][ 4 ] = 0; 	matrixData[ 2 ][ 5 ] = 0; 	
@@ -47,7 +47,7 @@
 	self->dim = 3
 	self->columnSize = 6
 	self->rowSize = 6
-	self->sleHasExecuted = False
+	self->previousSolutionExists = False
 Constitutive Matrix after func 'SetMatrixWithThrees'.
 matrixData[ 0 ][ 0 ] = 3; 	matrixData[ 0 ][ 1 ] = 3; 	matrixData[ 0 ][ 2 ] = 3; 	matrixData[ 0 ][ 3 ] = 3; 	matrixData[ 0 ][ 4 ] = 3; 	matrixData[ 0 ][ 5 ] = 3; 	
 matrixData[ 1 ][ 0 ] = 3; 	matrixData[ 1 ][ 1 ] = 3; 	matrixData[ 1 ][ 2 ] = 3; 	matrixData[ 1 ][ 3 ] = 3; 	matrixData[ 1 ][ 4 ] = 3; 	matrixData[ 1 ][ 5 ] = 3;

More information about the cig-commits mailing list