[cig-commits] r5123 - in long/3D/Gale/trunk/src/Gale: . Apps/Extension InputFiles src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-31 13:25:07 -0800 (Tue, 31 Oct 2006)
New Revision: 5123

Modified:
   long/3D/Gale/trunk/src/Gale/
   long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml
   long/3D/Gale/trunk/src/Gale/InputFiles/extension.xml
   long/3D/Gale/trunk/src/Gale/src/main.c
Log:
 r51 at earth:  boo | 2006-10-31 13:24:08 -0800
  r48 at earth (orig r59):  SteveQuenette | 2006-10-18 00:03:14 -0700
  StG_FEM renamed to StgFEM
  
 



Property changes on: long/3D/Gale/trunk/src/Gale
___________________________________________________________________
Name: svk:merge
   - 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:58
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:50
   + 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:59
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:51

Modified: long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml
===================================================================
--- long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml	2006-10-31 21:25:04 UTC (rev 5122)
+++ long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml	2006-10-31 21:25:07 UTC (rev 5123)
@@ -8,7 +8,7 @@
 		<param>Underworld_StokesMomentumUzawa</param>
 		<!--param>Underworld_Compressible</param-->
 		<param>Underworld_MovingMesh</param>
-		<param>StG_FEM_StandardConditionFunctions</param>
+		<param>StgFEM_StandardConditionFunctions</param>
 	</list>
 
 	<!-- Component Stuff -->

Modified: long/3D/Gale/trunk/src/Gale/InputFiles/extension.xml
===================================================================
--- long/3D/Gale/trunk/src/Gale/InputFiles/extension.xml	2006-10-31 21:25:04 UTC (rev 5122)
+++ long/3D/Gale/trunk/src/Gale/InputFiles/extension.xml	2006-10-31 21:25:07 UTC (rev 5123)
@@ -15,11 +15,11 @@
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
   <list name="plugins">
     <param>Underworld_MovingMesh</param>
-    <param>StG_FEM_StandardConditionFunctions</param>
+    <param>StgFEM_StandardConditionFunctions</param>
     <param>Underworld_MovingMesh</param>
-    <param>StG_FEM_FrequentOutput</param>
+    <param>StgFEM_FrequentOutput</param>
     <param>Underworld_Vrms</param>
-    <param>StG_FEM_CPUTime</param>
+    <param>StgFEM_CPUTime</param>
   </list>
   <struct name="components">
     <struct name="geometry">
@@ -411,8 +411,8 @@
   <param name="journal.info.Context-verbose">True</param>
   <param name="journal-level.info.Stg_ComponentFactory">2</param>
   <param name="journal.debug">t</param>
-  <param name="journal-enable-branch.debug.StG_FEM">t</param>
-  <param name="journal-level-branch.debug.StG_FEM">2</param>
+  <param name="journal-enable-branch.debug.StgFEM">t</param>
+  <param name="journal-level-branch.debug.StgFEM">2</param>
   <param name="dim">2</param>
   <param name="elementResI">64</param>
 <!--   <param name="elementResI">512</param> -->

Modified: long/3D/Gale/trunk/src/Gale/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/src/main.c	2006-10-31 21:25:04 UTC (rev 5122)
+++ long/3D/Gale/trunk/src/Gale/src/main.c	2006-10-31 21:25:07 UTC (rev 5123)
@@ -59,7 +59,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include <PICellerator/PICellerator.h>
 #include <Underworld/Underworld.h>
 #include <Gale/Gale.h>
@@ -122,7 +122,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Init( &argc, &argv );
+	StgFEM_Init( &argc, &argv );
 	PICellerator_Init( &argc, &argv );
 	Underworld_Init( &argc, &argv );
 	Gale_Init( &argc, &argv );
@@ -190,7 +190,7 @@
 	Py_Finalize();
 	#endif
 	PICellerator_Finalise();
-	StG_FEM_Finalise();
+	StgFEM_Finalise();
 	StGermain_Finalise();
 		
 	/* Close off MPI */