[cig-commits] r4902 - in long/3D/Gale/trunk/src/StgFEM: .
Discretisation/tests Discretisation/tests/expected
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:50:26 PDT 2006
Author: walter
Date: 2006-10-11 13:50:25 -0700 (Wed, 11 Oct 2006)
New Revision: 4902
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of3.expected
long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.2of3.expected
long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c
Log:
r788 at earth: boo | 2006-10-11 13:49:37 -0700
r762 at earth (orig r641): AlanLo | 2006-09-18 19:10:06 -0700
Fixed output diff again...this time proper flushing of stream is included to ensure statements are printed in order
expected files patched too
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:787
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:640
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:788
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:641
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of3.expected 2006-10-11 20:50:22 UTC (rev 4901)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.1of3.expected 2006-10-11 20:50:25 UTC (rev 4902)
@@ -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 3799. Copyright (C) 2003-2005 VPAC.
+StGermain Discretisation Library revision 3799. Copyright (C) 2003-2005 VPAC.
+StGermain FEM Discretisation Framework revision 640. 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/ 8][(enodes)0-8]({20} 40, 41, 42,), ({21} 82, 83, 84,), ({23} 85, 86, 87,), ({22} 43, 44, 45,), ({28} 51, 52, 53,), ({29} 93, 94, 95,), ({31} 96, 97, 98,), ({30} 54, 55, 56,),
LM[(g/l el)26/XXX]: on another proc
-LinkedDofInfo (ptr): 0x8072dac
-Stg_Class (ptr): 0x8072dac
- sizeOfSelf: 108
+LinkedDofInfo (ptr): 0x647e80
+Stg_Class (ptr): 0x647e80
+ sizeOfSelf: 232
_deleteSelf: Yes
type: LinkedDofInfo
- _delete (func ptr): 0x4002c22f
- _print (func ptr): 0x4002c269
- _copy (func ptr): 0x4002c50c
+ _delete (func ptr): 0x2aaaaace41f1
+ _print (func ptr): 0x2aaaaace4227
+ _copy (func ptr): 0x2aaaaace44d9
3 Linked dof sets active:
Set 0: has eqNum 0
Set 1: has eqNum 1
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.2of3.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.2of3.expected 2006-10-11 20:50:22 UTC (rev 4901)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/expected/testFeEquationNumber-LinkedDofs.2of3.expected 2006-10-11 20:50:25 UTC (rev 4902)
@@ -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 3799. Copyright (C) 2003-2005 VPAC.
+StGermain Discretisation Library revision 3799. Copyright (C) 2003-2005 VPAC.
+StGermain FEM Discretisation Framework revision 640. Copyright (C) 2003-2005 VPAC.
+Watching rank: 2
Creating Stg_Components from the component-list
@@ -9,7 +10,6 @@
Constructing Stg_Components from the live-component register
Constructing testShape..
-Watching rank: 2
*** 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): 0x8072d44
-Stg_Class (ptr): 0x8072d44
- sizeOfSelf: 108
+LinkedDofInfo (ptr): 0x647d40
+Stg_Class (ptr): 0x647d40
+ sizeOfSelf: 232
_deleteSelf: Yes
type: LinkedDofInfo
- _delete (func ptr): 0x4002c22f
- _print (func ptr): 0x4002c269
- _copy (func ptr): 0x4002c50c
+ _delete (func ptr): 0x2aaaaace41f1
+ _print (func ptr): 0x2aaaaace4227
+ _copy (func ptr): 0x2aaaaace44d9
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:22 UTC (rev 4901)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c 2006-10-11 20:50:25 UTC (rev 4902)
@@ -75,6 +75,7 @@
XML_IO_Handler* io_Handler;
Index elSizes[3];
Stream* feDebugStream;
+ Stream* stream;
DiscretisationContext* context;
/* Initialise MPI, get world info */
@@ -92,13 +93,17 @@
Stream_EnableBranch( feDebugStream, True );
Stream_SetLevelBranch( feDebugStream, 3 );
Stream_EnableBranch( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation" ), True );
+
if( argc >= 2 ) {
procToWatch = atoi( argv[1] );
}
else {
procToWatch = 0;
}
- if( rank == procToWatch ) printf( "Watching rank: %i\n", rank );
+ stream = Journal_Register( Info_Type, __FILE__ );
+ Stream_SetPrintingRank( stream, procToWatch );
+ Stream_SetAutoFlush( stream, True );
+ Journal_Printf( stream, "Watching rank: %i\n", rank );
/* Make sure print statements come in order */
MPI_Barrier( CommWorld );
@@ -135,6 +140,7 @@
componentDict = Dictionary_GetDictionary( dictionary, "components" );
context->CF = Stg_ComponentFactory_New( dictionary, componentDict, context->register_Register );
+ Stream_SetPrintingRank( context->CF->infoStream, procToWatch );
LiveComponentRegister_Add( context->CF->LCRegister, (Stg_Component*) context );
@@ -144,10 +150,9 @@
/* Make sure print statements come in order */
MPI_Barrier( CommWorld );
- if( rank == procToWatch ) printf( "\n*** REGULAR node/element layout tests ***\n" );
+ Journal_Printf( stream, "\n*** REGULAR node/element layout tests ***\n" );
+ Journal_Printf( stream, "\n*** Balanced: 6*1*1 elements ***\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 );
More information about the cig-commits
mailing list