[cig-commits] r4901 - in long/3D/Gale/trunk/src/StgFEM: . Discretisation/tests Discretisation/tests/expected

[walter at geodynamics.org]

Author: walter
Date: 2006-10-11 13:50:22 -0700 (Wed, 11 Oct 2006)
New Revision: 4901

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of2.expected
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c
Log:
 r787 at earth:  boo | 2006-10-11 13:49:36 -0700
  r761 at earth (orig r640):  AlanLo | 2006-09-13 19:22:52 -0700
  
  Fixed print order and expected file for this test to pass
  
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:786
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:639
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:787
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:640

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of2.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of2.expected	2006-10-11 20:50:20 UTC (rev 4900)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of2.expected	2006-10-11 20:50:22 UTC (rev 4901)
@@ -1,6 +1,7 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
-StGermain Discretisation Library. Copyright (C) 2003-2005 VPAC.
-StGermain FEM Discretisation Framework. Copyright (C) 2003-2005 VPAC.
+StGermain Framework revision 3794. Copyright (C) 2003-2005 VPAC.
+StGermain Discretisation Library revision 3794. Copyright (C) 2003-2005 VPAC.
+StGermain FEM Discretisation Framework revision 638. Copyright (C) 2003-2005 VPAC.
+Watching rank: 1
 
 Creating Stg_Components from the component-list
 
@@ -9,7 +10,6 @@
 Constructing Stg_Components from the live-component register
 
 	Constructing testShape..
-Watching rank: 1
 
 ***  REGULAR node/element layout tests ***
 
@@ -119,14 +119,14 @@
 	LM[(g/l el)24/XXX]: on another proc
 	LM[(g/l el)25/XXX]: on another proc
 	LM[(g/l el)26/ 8][(enodes)0-8]({20} 82, 83, 84,), ({21}116,117,  1,), ({23}118,119,  1,), ({22} 85, 86, 87,), ({28} 93, 94, 95,), ({29}123,124,  1,), ({31}125,126,  1,), ({30} 96, 97, 98,), 
-LinkedDofInfo (ptr): 0x425dff94
-Stg_Class (ptr): 0x425dff94
-	sizeOfSelf: 108
+LinkedDofInfo (ptr): 0x6000000000d4f240
+Stg_Class (ptr): 0x6000000000d4f240
+	sizeOfSelf: 232
 	_deleteSelf: Yes
 	type: LinkedDofInfo
-	_delete (func ptr): 0x40030137
-	_print (func ptr): 0x40030171
-	_copy (func ptr): 0x40030414
+	_delete (func ptr): 0x200000000683a0d0
+	_print (func ptr): 0x200000000683a000
+	_copy (func ptr): 0x200000000683a0f0
 3 Linked dof sets active:
 	Set 0: has eqNum 0
 	Set 1: has eqNum 1

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c	2006-10-11 20:50:20 UTC (rev 4900)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c	2006-10-11 20:50:22 UTC (rev 4901)
@@ -100,6 +100,9 @@
 	}
 	if( rank == procToWatch ) printf( "Watching rank: %i\n", rank );
 	
+	/* Make sure print statements come in order */
+	MPI_Barrier( CommWorld );
+
 	/* Read input */
 	dictionary = Dictionary_New();
 	io_Handler = XML_IO_Handler_New();
@@ -138,9 +141,14 @@
 	Stg_ComponentFactory_CreateComponents( context->CF );
 	Stg_ComponentFactory_ConstructComponents( context->CF );
 
+	/* Make sure print statements come in order */
+	MPI_Barrier( CommWorld );
 
 	if( rank == procToWatch ) printf( "\n***  REGULAR node/element layout tests ***\n" );
+	MPI_Barrier( CommWorld );
 	if( rank == procToWatch ) printf( "\n***  Balanced: 6*1*1 elements ***\n" );
+	MPI_Barrier( CommWorld );
+
 	elSizes[I_AXIS] = 3; elSizes[J_AXIS] = 3; elSizes[K_AXIS] = 3;
 	Test_FeEquationNumberRun_Regular( dictionary, context, "corner", elSizes, rank, procToWatch );