[cig-commits] r5165 - in long/3D/Gale/trunk: . src/Gale/src
src/StgFEM/Assembly/src src/StgFEM/SLE/LinearAlgebra/Dummy
src/StgFEM/SLE/LinearAlgebra/PETSc
src/StgFEM/SLE/SystemSetup/src src/StgFEM/libStG_FEM/src
src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution
src/StgFEM/plugins/Document
src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS
src/StgFEM/plugins/LevelSetPlugin src/StgFEM/plugins/MultiGrid
src/StgFEM/plugins/Output/CPUTime
src/StgFEM/plugins/Output/FrequentOutput
src/StgFEM/plugins/Output/PeakMemory
src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues
src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox
src/StgFEM/plugins/StandardConditionFunctions
src/Underworld/Rheology/src src/Underworld/Utils/src
src/Underworld/plugins/Output
src/Underworld/plugins/Output/AverageTemperature
src/Underworld/plugins/Output/DumpSwarm
walter at geodynamics.org
walter at geodynamics.org
Tue Oct 31 15:55:30 PST 2006
Author: walter
Date: 2006-10-31 15:55:29 -0800 (Tue, 31 Oct 2006)
New Revision: 5165
Added:
long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/SConscript
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/SConstruct.in
long/3D/Gale/trunk/extension.xml
long/3D/Gale/trunk/shortening.xml
long/3D/Gale/trunk/src/Gale/src/main.c
long/3D/Gale/trunk/src/StgFEM/Assembly/src/SConscript
long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/SConscript
long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/SConscript
long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SConscript
long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/Document/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/SConscript
long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/SConscript
long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript
long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript
long/3D/Gale/trunk/subduction.xml
Log:
r1037 at earth: boo | 2006-10-31 15:54:08 -0800
Change StG_FEM to StgFEM
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1036
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1037
Modified: long/3D/Gale/trunk/SConstruct.in
===================================================================
--- long/3D/Gale/trunk/SConstruct.in 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/SConstruct.in 2006-10-31 23:55:29 UTC (rev 5165)
@@ -216,11 +216,7 @@
else:
source=partial_dir + '/src/'
- # StgFEM is put in a different place for historical reasons.
- if(partial_dir[:6]=='StgFEM'):
- target='StG_FEM' + partial_dir[6:]
- else:
- target=partial_dir
+ target=partial_dir
# Flatten the hierarchy of where plugins header files are
# found.
Modified: long/3D/Gale/trunk/extension.xml
===================================================================
--- long/3D/Gale/trunk/extension.xml 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/extension.xml 2006-10-31 23:55:29 UTC (rev 5165)
@@ -450,7 +450,7 @@
</struct>
</struct>
<list name="plugins">
- <param>StG_FEM_StandardConditionFunctions</param>
+ <param>StgFEM_StandardConditionFunctions</param>
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
</list>
Modified: long/3D/Gale/trunk/shortening.xml
===================================================================
--- long/3D/Gale/trunk/shortening.xml 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/shortening.xml 2006-10-31 23:55:29 UTC (rev 5165)
@@ -469,7 +469,7 @@
</struct>
</struct>
<list name="plugins">
- <param>StG_FEM_StandardConditionFunctions</param>
+ <param>StgFEM_StandardConditionFunctions</param>
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
</list>
Modified: long/3D/Gale/trunk/src/Gale/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/src/main.c 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/Gale/src/main.c 2006-10-31 23:55:29 UTC (rev 5165)
@@ -65,31 +65,31 @@
#include <Gale/Gale.h>
/* BEGIN STATIC PLUGINS */
-Index StG_FEM_FrequentOutput_Register( PluginsManager* pluginsManager );
-Index StG_FEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager );
-Index StG_FEM_CPUTime_Register( PluginsManager* pluginsManager );
+Index StgFEM_FrequentOutput_Register( PluginsManager* pluginsManager );
+Index StgFEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager );
+Index StgFEM_CPUTime_Register( PluginsManager* pluginsManager );
Index Underworld_MovingMesh_Register( PluginsManager* pluginsManager );
Index Underworld_Vrms_Register( PluginsManager* pluginsManager );
Index _Underworld_EulerDeform_Register( PluginsManager* pluginsManager );
-Index StG_FEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager );
+Index StgFEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager );
Index Underworld_DumpSwarm_Register( PluginsManager* pluginsManager );
int nPlugins = 8;
-char* pluginNames[] = {"StG_FEM_FrequentOutput",
- "StG_FEM_StandardConditionFunctions",
- "StG_FEM_CPUTime",
+char* pluginNames[] = {"StgFEM_FrequentOutput",
+ "StgFEM_StandardConditionFunctions",
+ "StgFEM_CPUTime",
"Underworld_MovingMesh",
"Underworld_Vrms",
"Underworld_EulerDeform",
- "StG_FEM_PrintFeVariableDiscreteValues",
+ "StgFEM_PrintFeVariableDiscreteValues",
"Underworld_DumpSwarm"};
-StaticPluginEntry pluginLst[] = {{StG_FEM_FrequentOutput_Register, NULL, NULL, NULL},
- {StG_FEM_StandardConditionFunctions_Register, NULL, NULL, NULL},
- {StG_FEM_CPUTime_Register, NULL, NULL, NULL},
+StaticPluginEntry pluginLst[] = {{StgFEM_FrequentOutput_Register, NULL, NULL, NULL},
+ {StgFEM_StandardConditionFunctions_Register, NULL, NULL, NULL},
+ {StgFEM_CPUTime_Register, NULL, NULL, NULL},
{Underworld_MovingMesh_Register, NULL, NULL, NULL},
{Underworld_Vrms_Register, NULL, NULL, NULL},
{_Underworld_EulerDeform_Register},
- {StG_FEM_PrintFeVariableDiscreteValues_Register},
+ {StgFEM_PrintFeVariableDiscreteValues_Register},
{Underworld_DumpSwarm_Register}};
/* END STATIC PLUGINS */
Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,7 +18,7 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPPATH=["#/build/include/StG_FEM"])
+local_env.Append(CPPPATH=["#/build/include/StgFEM"])
header_groups['StgFEM/Assembly']=["Assembly.h",
"Finalise.h",
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,7 +18,7 @@
Import('env','shared_lib_objects','StgFEM_static_objects')
local_env=env.Copy()
-local_env.Append(CPPPATH=["#/build/include/StG_FEM"])
+local_env.Append(CPPPATH=["#/build/include/StgFEM"])
c_files=Split("""Finalise.c
Init.c
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,8 +18,8 @@
Import('env','shared_lib_objects','StgFEM_static_objects')
local_env=env.Copy()
-local_env.Append(CPPPATH=["#build/include/StG_FEM"])
-local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StG_FEM_SLE_LinearAlgebraPETSc\\"'])
+local_env.Append(CPPPATH=["#build/include/StgFEM"])
+local_env.Append(CPPFLAGS=['-DCURR_MODULE_NAME=\\"StgFEM_SLE_LinearAlgebraPETSc\\"'])
c_files=Split("""Finalise.c
Init.c
Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -19,7 +19,7 @@
local_env=env.Copy()
local_env.Append(CPPFLAGS=["-DLIB_DIR=\\\""+local_env["lib_dir"]+"\\\""])
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_SLE_SystemSetup\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_SLE_SystemSetup\\\""])
header_groups['StgFEM/SLE/SystemSetup']=Split("""Context.h
Modified: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -22,7 +22,7 @@
header_groups['StgFEM']=Split("""Finalise.h
Init.h
-StG_FEM.h""")
+StgFEM.h""")
c_files=Split("""Finalise.c
Init.c""")
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,11 +18,11 @@
Import('env','shared_lib_objects','StgFEM_static_objects')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_CompareFeVariableAgainstReferenceSolution\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_CompareFeVariableAgainstReferenceSolution\\\""])
c_files=Split("""CompareFeVariableAgainstReferenceSolution.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_CompareFeVariableAgainstReferenceSolutionmodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_CompareFeVariableAgainstReferenceSolutionmodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Document/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Document/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Document/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,11 +18,11 @@
Import('env','shared_lib_objects','StgFEM_static_objects')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_Document\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_Document\\\""])
c_files=Split("""Document.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_Documentmodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_Documentmodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,11 +18,11 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_FeVariable_ImportExport_ABAQUS\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_FeVariable_ImportExport_ABAQUS\\\""])
c_files=Split("""FeVariable_ImportExport_ABAQUS.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_FeVariable_ImportExport_ABAQUS',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_FeVariable_ImportExport_ABAQUS',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -36,6 +36,6 @@
c_files+=[local_env.Meta(meta_files)]
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_LevelSetPluginmodule',c_files,SHLIBPREFIX='')]
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_LevelSetPluginmodule',c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,14 +18,14 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_MultiGrid\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_MultiGrid\\\""])
header_groups['StgFEM/plugins/MultiGrid']=Split("""Context.h
MultiGrid.h""")
c_files=Split("""MultiGrid.c Context.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_MultiGridmodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_MultiGridmodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,13 +18,13 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_CPUTime\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_CPUTime\\\""])
header_groups['StgFEM/plugins/Output/CPUTime']=Split("""CPUTime.h""")
c_files=Split("""CPUTime.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_CPUTimemodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_CPUTimemodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,13 +18,13 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_FrequentOutput\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_FrequentOutput\\\""])
header_groups['StgFEM/plugins/Output/FrequentOutput']=Split("""FrequentOutput.h""")
c_files=Split("""FrequentOutput.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_FrequentOutputmodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_FrequentOutputmodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,13 +18,13 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_PeakMemory\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_PeakMemory\\\""])
header_groups['StgFEM/plugins/Output/PeakMemory']=Split("""PeakMemory.h""")
c_files=Split("""PeakMemory.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_PeakMemorymodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_PeakMemorymodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,13 +18,13 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_PrintFeVariableDiscreteValues\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_PrintFeVariableDiscreteValues\\\""])
header_groups['StgFEM/plugins/Output/PrintFeVariableDiscreteValues']=Split("""Plugin.h""")
c_files=Split("""Plugin.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_PrintFeVariableDiscreteValuesmodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_PrintFeVariableDiscreteValuesmodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,13 +18,13 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_PrintFeVariableDiscreteValues_2dBox\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_PrintFeVariableDiscreteValues_2dBox\\\""])
header_groups['StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox']=Split("""Plugin.h""")
c_files=Split("""Plugin.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_PrintFeVariableDiscreteValues_2dBoxmodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_PrintFeVariableDiscreteValues_2dBoxmodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -18,13 +18,13 @@
Import('env','shared_lib_objects','StgFEM_static_objects','header_groups')
local_env=env.Copy()
-local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StG_FEM_StandardConditionFunctions\\\""])
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"StgFEM_StandardConditionFunctions\\\""])
header_groups['StgFEM/plugins/StandardConditionFunctions']=Split("""StandardConditionFunctions.h""")
c_files=Split("""StandardConditionFunctions.c""")
-shared_lib_objects+=[local_env.SharedLibrary('StG_FEM_StandardConditionFunctionsmodule',
+shared_lib_objects+=[local_env.SharedLibrary('StgFEM_StandardConditionFunctionsmodule',
c_files,SHLIBPREFIX='')]
StgFEM_static_objects+=[local_env.StaticObject(c_files)]
Modified: long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/Underworld/Rheology/src/MohrCoulomb.c 2006-10-31 23:55:29 UTC (rev 5165)
@@ -45,7 +45,7 @@
#include <mpi.h>
#include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
#include <PICellerator/PICellerator.h>
#include "types.h"
Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -20,6 +20,7 @@
local_env=env.Copy()
header_groups['Underworld/Utils']=Split("""Context.h
+DVCWeights.h
Finalise.h
Init.h
PressureTemperatureOutput.h
@@ -31,6 +32,7 @@
c_files=Split("""Context.c
+DVCWeights.c
Finalise.c
Init.c
PressureTemperatureOutput.c
@@ -40,6 +42,7 @@
meta_files=Split("""Context.meta
+DVCWeights.meta
PressureTemperatureOutput.meta
RadiogenicHeatingTerm.meta
StressField.meta
Added: long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/AverageTemperature/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -0,0 +1,28 @@
+# Copyright 2006 California Institute of Technology
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+
+Import('env','shared_lib_objects','Underworld_static_objects','header_groups')
+
+local_env=env.Copy()
+local_env.Append(CPPFLAGS=["-DCURR_MODULE_NAME=\\\"Underworld_AverageTemperature\\\""])
+
+c_files=Split("""AverageTemperature.c""")
+
+shared_lib_objects+=[local_env.SharedLibrary('Underworld_AverageTemperaturemodule',
+ c_files,SHLIBPREFIX='')]
+Underworld_static_objects+=[local_env.StaticObject(c_files)]
+
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/DumpSwarm/DumpSwarm.c 2006-10-31 23:55:29 UTC (rev 5165)
@@ -41,7 +41,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 "DumpSwarm.h"
@@ -73,7 +73,7 @@
}
Index Underworld_DumpSwarm_Register( PluginsManager* pluginsManager ) {
- Journal_DPrintf( StG_FEM_Debug, "In: %s( void* )\n", __func__ );
+ Journal_DPrintf( StgFEM_Debug, "In: %s( void* )\n", __func__ );
return PluginsManager_Submit( pluginsManager, Underworld_DumpSwarm_Type, "0", _Underworld_DumpSwarm_DefaultNew );
}
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/SConscript 2006-10-31 23:55:29 UTC (rev 5165)
@@ -15,6 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
+SConscript('AverageTemperature/SConscript')
SConscript('BoundaryLayers/SConscript')
SConscript('Nusselt/SConscript')
SConscript('Vrms/SConscript')
Modified: long/3D/Gale/trunk/subduction.xml
===================================================================
--- long/3D/Gale/trunk/subduction.xml 2006-10-31 23:55:25 UTC (rev 5164)
+++ long/3D/Gale/trunk/subduction.xml 2006-10-31 23:55:29 UTC (rev 5165)
@@ -512,7 +512,7 @@
</struct>
</struct>
<list name="plugins">
- <param>StG_FEM_StandardConditionFunctions</param>
+ <param>StgFEM_StandardConditionFunctions</param>
<param>Underworld_EulerDeform</param>
<param>Underworld_DumpSwarm</param>
</list>
More information about the cig-commits
mailing list