[cig-commits] r4955 - in long/3D/Gale/trunk: .
src/Gale/EulerDeform/src src/Gale/SurfaceProcess/src
src/PICellerator/libPICellerator/src
src/StGermain/Base/Context/src src/StGermain/Base/src
src/StGermain/Discretisation/src src/StgFEM/Assembly/src
src/StgFEM/Discretisation/src
src/StgFEM/SLE/LinearAlgebra/PETSc src/StgFEM/SLE/src
src/StgFEM/libStG_FEM/src src/Underworld/libUnderworld/src
src/Underworld/src
walter at geodynamics.org
walter at geodynamics.org
Thu Oct 12 01:15:54 PDT 2006
Author: walter
Date: 2006-10-12 01:15:53 -0700 (Thu, 12 Oct 2006)
New Revision: 4955
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/extension.xml
long/3D/Gale/trunk/shortening.xml
long/3D/Gale/trunk/src/Gale/EulerDeform/src/Init.c
long/3D/Gale/trunk/src/Gale/SurfaceProcess/src/Init.c
long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c
long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
long/3D/Gale/trunk/src/StGermain/Base/src/Init.c
long/3D/Gale/trunk/src/StGermain/Discretisation/src/Init.c
long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c
long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c
long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Init.c
long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c
long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.c
long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c
long/3D/Gale/trunk/src/Underworld/src/main.c
Log:
r885 at earth: boo | 2006-10-12 01:13:54 -0700
Make Underworld much less chatty
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:883
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:885
Modified: long/3D/Gale/trunk/extension.xml
===================================================================
--- long/3D/Gale/trunk/extension.xml 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/extension.xml 2006-10-12 08:15:53 UTC (rev 4955)
@@ -473,10 +473,6 @@
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
</list>
- <param name="journal-level.info.Stg_ComponentFactory">1</param>
- <param name="journal.debug">True</param>
- <param name="journal-enable-branch.debug.StG_FEM">True</param>
- <param name="journal-level-branch.debug.StG_FEM">1</param>
<param name="maxTimeSteps">500</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
Modified: long/3D/Gale/trunk/shortening.xml
===================================================================
--- long/3D/Gale/trunk/shortening.xml 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/shortening.xml 2006-10-12 08:15:53 UTC (rev 4955)
@@ -501,10 +501,6 @@
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
</list>
- <param name="journal-level.info.Stg_ComponentFactory">1</param>
- <param name="journal.debug">True</param>
- <param name="journal-enable-branch.debug.StG_FEM">True</param>
- <param name="journal-level-branch.debug.StG_FEM">1</param>
<param name="maxTimeSteps">500</param>
<param name="outputEvery">1</param>
<param name="dumpEvery">1</param>
Modified: long/3D/Gale/trunk/src/Gale/EulerDeform/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/EulerDeform/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/Gale/EulerDeform/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -15,7 +15,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( Journal_Register( InfoStream_Type, "Context" ), /* DO NOT CHANGE OR REMOVE */
"StGermain EulerDeform Library. Copyright (C) 2003-2005 VPAC.\n" );
Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
Modified: long/3D/Gale/trunk/src/Gale/SurfaceProcess/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/SurfaceProcess/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/Gale/SurfaceProcess/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -12,7 +12,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( Journal_Register( InfoStream_Type, "Context" ), /* DO NOT CHANGE OR REMOVE */
"Gale SurfaceProcess Library. Copyright (C) 2003-2005 VPAC.\n" );
Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
Modified: long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/PICellerator/libPICellerator/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -63,7 +63,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"Particle-In-Cellerator (FEM/PIC framework) revision %s. Copyright (C) 2005 VPAC & Monash Cluster Computing.\n", VERSION );
Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -767,7 +767,7 @@
* have just synchronised while calculating timestep anyway. */
MPI_Barrier( self->communicator );
Journal_DPrintf( self->debug, "In: %s\n", __func__ );
- Journal_Printf( self->info, "TimeStep = %d, Start time = %.6g + %.6g prev timeStep dt\n",
+ printf("TimeStep = %d, Start time = %.6g + %.6g prev timeStep dt\n",
self->timeStep, self->currentTime, dt );
if (self->loadFromCheckPoint) {
Modified: long/3D/Gale/trunk/src/StGermain/Base/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StGermain/Base/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -49,7 +49,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"StGermain Framework revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -46,7 +46,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"StGermain Discretisation Library revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -58,7 +58,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"StGermain FEM Assembly Library revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -74,7 +74,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"StGermain FEM Discretisation Framework revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -49,7 +49,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"StGermain PETSc-LinearAlgebra Interface revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -59,7 +59,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"StGermain SLE Library revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
Modified: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -55,7 +55,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"StGermain Finite Element Framework revision %s. Copyright (C) 2003-2005 VPAC.\n", VERSION );
Modified: long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/Underworld/libUnderworld/src/Init.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -88,7 +88,7 @@
Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 1 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
Journal_Register( InfoStream_Type, "Context" ),
"Underworld (Geodynamics framework) revision %s. Copyright (C) 2005 Monash Cluster Computing.\n", VERSION );
Modified: long/3D/Gale/trunk/src/Underworld/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/src/main.c 2006-10-11 23:25:56 UTC (rev 4954)
+++ long/3D/Gale/trunk/src/Underworld/src/main.c 2006-10-12 08:15:53 UTC (rev 4955)
@@ -124,6 +124,7 @@
/* Read input */
ioHandler = XML_IO_Handler_New();
IO_Handler_ReadAllFromCommandLine( ioHandler, argc, argv, dictionary );
+ Journal_Enable_TypedStream("info",False);
Journal_ReadFromDictionary( dictionary );
/* Construction phase -----------------------------------------------------------------------------------------------*/
More information about the cig-commits
mailing list