[cig-commits] r5145 - in long/3D/Gale/trunk/src/StgFEM: . Apps/EnergySolver Apps/EnergySolver/tests Apps/EnergySolver/tests/AdvDiffSteadyState1D Apps/EnergySolver/tests/HomogeneousNaturalBCs Apps/StgFEM_Components Apps/StokesMomentumUzawa Apps/StokesMomentumUzawa/tests Apps/StokesMomentumUzawa/tests/LidDrivenIsoviscousAnalytic Apps/StokesMomentumUzawa/tests/SimpleShearAnalytic Apps/TempDiffusion Apps/TempDiffusion/tests Apps/TempDiffusion/tests/LinearTemperatureField Apps/TempDiffusion/tests/expected Apps/ThermalConvection Apps/ThermalConvection/tests Apps/ThermalConvection/tests/ColumnViscosityAnalytic Assembly/src Assembly/tests Assembly/tests/plugins Discretisation/src Discretisation/tests SLE/LinearAlgebra/Dummy SLE/LinearAlgebra/PETSc SLE/LinearAlgebra/src SLE/MultiGrid/src SLE/ProvidedSystems/AdvectionDiffusion/src SLE/ProvidedSystems/AdvectionDiffusion/tests SLE/ProvidedSystems/Energy/src SLE/ProvidedSystems/StokesFlow/src SLE/ProvidedSystems/src SLE/SystemSetup/src SLE/SystemSetup/tests SLE/src libStG_FEM/src libStG_FEM/tests libStG_FEM/tests/expected plugins/Application plugins/CompareFeVariableAgainstReferenceSolution plugins/Document plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS plugins/LevelSetPlugin plugins/MultiGrid plugins/Output/CPUTime plugins/Output/FrequentOutput plugins/Output/FrequentOutput/tests plugins/Output/PeakMemory plugins/Output/PrintFeVariableDiscreteValues plugins/Output/PrintFeVariableDiscreteValues_2dBox plugins/StandardConditionFunctions plugins/VelicAnalyticSolutions/Velic_solA plugins/VelicAnalyticSolutions/Velic_solB plugins/VelicAnalyticSolutions/Velic_solCA plugins/VelicAnalyticSolutions/Velic_solD plugins/VelicAnalyticSolutions/Velic_solKx src

walter at geodynamics.org walter at geodynamics.org
Tue Oct 31 13:31:31 PST 2006 

Author: walter
Date: 2006-10-31 13:31:27 -0800 (Tue, 31 Oct 2006)
New Revision: 5145

Added:
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StgFEM.h
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStgFEM.0of1.expected
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.c
Removed:
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StG_FEM.h
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStG_FEM.0of1.expected
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.c
Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/HomogeneousNaturalBCs/HomogeneousNaturalBCs.c
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-x.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-y.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-x.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-y.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSimpleShear.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSinusoid.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/LidDrivenIsoviscousAnalytic/LidDrivenIsoviscousAnalytic.c
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/SimpleShearAnalytic/SimpleShearAnalytic.c
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of3.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of3.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion3D-MG.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/analyticTemperature.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/LinearTemperatureField/LinearTemperatureField.c
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/expected/testBasicTempDiffusion-Tri.0of1.expected
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D-2D_Decomp.0of4.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-2D_Decomp.0of4.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-3D_Decomp.0of8.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of3.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-Tri.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
   long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/ColumnViscosityAnalytic/ColumnViscosityAnalytic.c
   long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/Assembly.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/shortcuts.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/types.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/src/units.h
   long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStiffnessMatrixCompare.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStressTensor.c
   long/3D/Gale/trunk/src/StgFEM/Assembly/tests/testStressTensor.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Discretisation.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Element.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/shortcuts.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/types.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/src/units.h
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType_Register.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LM.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs2.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFunc.c
   long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFuncLocalDerivs.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Matrix.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/MatrixSolver.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Utils.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Vector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/ErrorChecking.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/MatrixSolver.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Utils.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Vector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/LinearAlgebra.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Utils.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/dummy.c
   long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/types.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.c
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.c
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MultiGrid.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/shortcuts.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/types.h
   long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/units.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusion.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/types.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testUpwindXi.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/types.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/StokesFlow.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/types.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/ProvidedSystems.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/EntryPoint.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemSetup.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/shortcuts.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/types.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/units.h
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testContext.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c
   long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/SLE/src/SLE.h
   long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.c
   long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.h
   long/3D/Gale/trunk/src/StgFEM/SLE/src/types.h
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.c
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.h
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.c
   long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.h
   long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c
   long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.h
   long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c
   long/3D/Gale/trunk/src/StgFEM/plugins/Document/Document.c
   long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/FeVariable_ImportExport_ABAQUS.c
   long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Context.h
   long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
   long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.c
   long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.h
   long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Polynomial.h
   long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Quadrature.h
   long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.c
   long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.h
   long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c
   long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.h
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.c
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.h
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.h
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of1.sh
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of2.sh
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.xml
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.h
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.c
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.h
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.c
   long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.h
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
   long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.h
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.h
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.c
   long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.h
   long/3D/Gale/trunk/src/StgFEM/src/main.c
Log:
 r850 at earth:  boo | 2006-10-31 13:30:34 -0800
  r840 at earth (orig r656):  SteveQuenette | 2006-10-17 23:45:50 -0700
  StG_FEM renamed to StgFEM   (this is going to take a few commits before its all going)
  
 



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

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/EnergySolver2D.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -6,13 +6,13 @@
 	
 	<!-- Load the plugin that sets up the app, plus any others you require -->
 	<list name="plugins">
-		<param>StG_FEM_StandardConditionFunctions</param>
+		<param>StgFEM_StandardConditionFunctions</param>
 	</list>
 	
 	<param name="journal-level.info.Stg_ComponentFactory"> 2 </param>
 	<param name="journal.debug">f</param>
-	<param name="journal-enable-branch.debug.StG_FEM">f</param>
-	<param name="journal-level-branch.debug.StG_FEM"> 1 </param>
+	<param name="journal-enable-branch.debug.StgFEM">f</param>
+	<param name="journal-level-branch.debug.StgFEM"> 1 </param>
 	
 	<!-- Simulation control -->
 	<param name="maxTimeSteps"> 50 </param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,7 +40,7 @@
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include <string.h>
 
 const Type AdvDiffSteadyState1D_Type = "AdvDiffSteadyState1D";
@@ -158,7 +158,7 @@
 }
 
 /* This function is automatically run by StGermain when this plugin is loaded. The name must be "<plugin-name>_Register". */
-Index StG_FEM_AdvDiffSteadyState1D_Register( PluginsManager* pluginsManager ) {
+Index StgFEM_AdvDiffSteadyState1D_Register( PluginsManager* pluginsManager ) {
 	/* A plugin is only properly registered once it returns the handle provided when submitting a codelet to StGermain. */
 	return PluginsManager_Submit( pluginsManager, AdvDiffSteadyState1D_Type, "0", _AdvDiffSteadyState1D_DefaultNew );
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/HomogeneousNaturalBCs/HomogeneousNaturalBCs.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/HomogeneousNaturalBCs/HomogeneousNaturalBCs.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/HomogeneousNaturalBCs/HomogeneousNaturalBCs.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,7 +40,7 @@
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 const Type HomogeneousNaturalBCs_Type = "HomogeneousNaturalBCs";
 
@@ -131,7 +131,7 @@
 }
 
 /* This function is automatically run by StGermain when this plugin is loaded. The name must be "<plugin-name>_Register". */
-Index StG_FEM_HomogeneousNaturalBCs_Register( PluginsManager* pluginsManager ) {
+Index StgFEM_HomogeneousNaturalBCs_Register( PluginsManager* pluginsManager ) {
 	/* A plugin is only properly registered once it returns the handle provided when submitting a codelet to StGermain. */
 	return PluginsManager_Submit( pluginsManager, HomogeneousNaturalBCs_Type, "0", _HomogeneousNaturalBCs_DefaultNew );
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -6,7 +6,7 @@
 	<!-- See Brooks, Hughes 1982 - Section 3.4.2 -->
 
 	<list name="plugins" mergeType="merge">
-		<param>StG_FEM_HomogeneousNaturalBCs</param>
+		<param>StgFEM_HomogeneousNaturalBCs</param>
 	</list>
 
 	<param name="TemperatureField-Tolerance">0.0005</param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml testSteadyState1D-x.xml --defaultDiffusivity=0.5 --A=0.1 --TemperatureField-Tolerance=5e-5" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../EnergySolver2D.xml testSteadyState1D-x.xml --defaultDiffusivity=0.5 --A=0.1 --TemperatureField-Tolerance=5e-5" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-x.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-x.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-x.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml testSteadyState1D-x.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../EnergySolver2D.xml testSteadyState1D-x.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-y.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-y.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-y.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml testSteadyState1D-y.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../EnergySolver2D.xml testSteadyState1D-y.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml ./homogeneousNaturalBCs.xml analyticHomogeneousNaturalBCs.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../EnergySolver2D.xml ./homogeneousNaturalBCs.xml analyticHomogeneousNaturalBCs.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml ./homogeneousNaturalBCs.xml analyticHomogeneousNaturalBCs.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../EnergySolver2D.xml ./homogeneousNaturalBCs.xml analyticHomogeneousNaturalBCs.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-x.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-x.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-x.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -5,7 +5,7 @@
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
 	<list name="plugins" mergeType="merge">
-		<param>StG_FEM_AdvDiffSteadyState1D</param>
+		<param>StgFEM_AdvDiffSteadyState1D</param>
 	</list>
 
 	<param name="defaultDiffusivity"> 1 </param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-y.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-y.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-y.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -5,7 +5,7 @@
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
 	<list name="plugins" mergeType="merge">
-		<param>StG_FEM_AdvDiffSteadyState1D</param>
+		<param>StgFEM_AdvDiffSteadyState1D</param>
 	</list>
 
 	<param name="defaultDiffusivity"> 1 </param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StgFEM_Components/MultiGrid.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -5,7 +5,7 @@
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
 	
 	<list name="plugins" mergeType="merge">
-		<param>StG_FEM_MultiGrid</param>
+		<param>StgFEM_MultiGrid</param>
 	</list>
 	
 	<struct name="MultiGrid">

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSimpleShear.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSimpleShear.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSimpleShear.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -7,7 +7,7 @@
 	<include>LidDrivenConvection.xml</include>
 
 	<list name="plugins" mergeType="merge">
-		<param>StG_FEM_SimpleShearAnalytic</param>
+		<param>StgFEM_SimpleShearAnalytic</param>
 	</list>
 
 	<param name="VelocityField-Tolerance">1e-6</param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSinusoid.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSinusoid.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/AnalyticSinusoid.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -7,7 +7,7 @@
 	<include>LidDrivenConvection.xml</include>
 
 	<list name="plugins" mergeType="merge">
-		<param>StG_FEM_LidDrivenIsoviscousAnalytic</param>
+		<param>StgFEM_LidDrivenIsoviscousAnalytic</param>
 	</list>
 
 	<param name="VelocityField-Tolerance">0.01 </param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/LidDrivenConvection.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -6,13 +6,13 @@
 	
 	<!-- Load the plugin that sets up the app, plus any others you require -->
 	<list name="plugins">
-		<param>StG_FEM_StandardConditionFunctions</param>
+		<param>StgFEM_StandardConditionFunctions</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="journal-enable-branch.debug.StgFEM">True</param>
+	<param name="journal-level-branch.debug.StgFEM"> 1 </param>
 	<!--
 	-->
 	

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/LidDrivenIsoviscousAnalytic/LidDrivenIsoviscousAnalytic.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/LidDrivenIsoviscousAnalytic/LidDrivenIsoviscousAnalytic.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/LidDrivenIsoviscousAnalytic/LidDrivenIsoviscousAnalytic.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,7 +40,7 @@
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 /* This is taken from Mirko Velic's Analytic Stokes Flow solution */
 
@@ -156,7 +156,7 @@
 }
 
 /* This function is automatically run by StGermain when this plugin is loaded. The name must be "<plugin-name>_Register". */
-Index StG_FEM_LidDrivenIsoviscousAnalytic_Register( PluginsManager* pluginsManager ) {
+Index StgFEM_LidDrivenIsoviscousAnalytic_Register( PluginsManager* pluginsManager ) {
 	/* A plugin is only properly registered once it returns the handle provided when submitting a codelet to StGermain. */
 	return PluginsManager_Submit( pluginsManager, LidDrivenIsoviscousAnalytic_Type, "0", _LidDrivenIsoviscousAnalytic_DefaultNew );
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/SimpleShearAnalytic/SimpleShearAnalytic.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/SimpleShearAnalytic/SimpleShearAnalytic.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/SimpleShearAnalytic/SimpleShearAnalytic.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,7 +40,7 @@
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 const Type SimpleShearAnalytic_Type = "SimpleShearAnalytic";
 
@@ -98,7 +98,7 @@
 }
 
 /* This function is automatically run by StGermain when this plugin is loaded. The name must be "<plugin-name>_Register". */
-Index StG_FEM_SimpleShearAnalytic_Register( PluginsManager* pluginsManager ) {
+Index StgFEM_SimpleShearAnalytic_Register( PluginsManager* pluginsManager ) {
 	/* A plugin is only properly registered once it returns the handle provided when submitting a codelet to StGermain. */
 	return PluginsManager_Submit( pluginsManager, SimpleShearAnalytic_Type, "0", _SimpleShearAnalytic_DefaultNew );
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSinusoid.xml ../../Components/MultiGrid.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSinusoid.xml ../../Components/MultiGrid.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D-MG.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSinusoid.xml ../../Components/MultiGrid.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSinusoid.xml ../../Components/MultiGrid.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSinusoid.xml --sinusoidalLidWavenumber=1" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSinusoid.xml --sinusoidalLidWavenumber=1" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-2D.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSinusoid.xml --sinusoidalLidWavenumber=1" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSinusoid.xml --sinusoidalLidWavenumber=1" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSinusoid.xml --dim=3 --sinusoidalLidWavenumber=1" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSinusoid.xml --dim=3 --sinusoidalLidWavenumber=1" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSinusoid.xml --dim=3 --sinusoidalLidWavenumber=1" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSinusoid.xml --dim=3 --sinusoidalLidWavenumber=1" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of3.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of3.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-3D.0of3.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSinusoid.xml --dim=3 --sinusoidalLidWavenumber=1" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSinusoid.xml --dim=3 --sinusoidalLidWavenumber=1" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSimpleShear.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSimpleShear.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSimpleShear.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSimpleShear.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of3.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of3.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear2D.0of3.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSimpleShear.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSimpleShear.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSimpleShear.xml --dim=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSimpleShear.xml --dim=3" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/StokesMomentumUzawa/tests/testStokesMomentum-UzawaSolver-SimpleShear3D.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../AnalyticSimpleShear.xml --dim=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../AnalyticSimpleShear.xml --dim=3" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -6,8 +6,8 @@
 	
 	<!-- Load the plugin that sets up the app, plus any others you require -->
 	<list name="plugins">
-		<param>StG_FEM_PrintFeVariableDiscreteValues</param>
-		<param>StG_FEM_StandardConditionFunctions</param>
+		<param>StgFEM_PrintFeVariableDiscreteValues</param>
+		<param>StgFEM_StandardConditionFunctions</param>
 	</list>
 	
 	<!-- Simulation control -->
@@ -19,8 +19,8 @@
 	<!-- Journal control -->
 	<param name="journal-level.info.Stg_ComponentFactory"> 1 </param>
 	<param name="journal.debug">f</param>
-	<param name="journal-enable-branch.debug.StG_FEM">f</param>
-	<param name="journal-level-branch.debug.StG_FEM"> 1 </param>
+	<param name="journal-enable-branch.debug.StgFEM">f</param>
+	<param name="journal-level-branch.debug.StgFEM"> 1 </param>
 	
 	<!-- Geometry & Mesh setup -->
 	<param name="dim"> 2 </param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion3D-MG.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion3D-MG.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusion3D-MG.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -11,14 +11,14 @@
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
  
 	<param name="journal.debug">True</param>
-	<param name="journal-enable-branch.debug.StG_FEM">True</param>
-	<param name="journal-level-branch.debug.StG_FEM"> 2 </param>
-	<param name="journal-level-branch.debug.StG_FEM.SLE.SystemSetup.SLE_Solver"> 2 </param>
+	<param name="journal-enable-branch.debug.StgFEM">True</param>
+	<param name="journal-level-branch.debug.StgFEM"> 2 </param>
+	<param name="journal-level-branch.debug.StgFEM.SLE.SystemSetup.SLE_Solver"> 2 </param>
 	
 	<!-- Load the plugin that sets up the app, plus any others you require -->
 	<list name="plugins">
-		<param>StG_FEM_ApplyMultiGrid</param>
-		<param>StG_FEM_PrintFeVariableDiscreteValues</param>
+		<param>StgFEM_ApplyMultiGrid</param>
+		<param>StgFEM_PrintFeVariableDiscreteValues</param>
 	</list>
 
 	<!-- Simulation control -->

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/TempDiffusionTri.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -12,15 +12,15 @@
 	
 	<!-- Load the plugin that sets up the app, plus any others you require -->
 	<list name="plugins">
-		<param>StG_FEM_PrintFeVariableDiscreteValues</param>
-		<param>StG_FEM_StandardConditionFunctions</param>
+		<param>StgFEM_PrintFeVariableDiscreteValues</param>
+		<param>StgFEM_StandardConditionFunctions</param>
 	</list>
 
 	<!-- Journal control -->
 	<param name="journal-level.info.Stg_ComponentFactory"> 1 </param>
 	<param name="journal.debug">f</param>
-	<param name="journal-enable-branch.debug.StG_FEM">f</param>
-	<param name="journal-level-branch.debug.StG_FEM"> 1 </param>
+	<param name="journal-enable-branch.debug.StgFEM">f</param>
+	<param name="journal-level-branch.debug.StgFEM"> 1 </param>
 
 	<!-- Simulation control -->
 	<param name="maxTimeSteps"> 1 </param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/analyticTemperature.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/analyticTemperature.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/analyticTemperature.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -6,7 +6,7 @@
 
 
 	<list name="plugins" mergeType="merge">
-		<param>StG_FEM_LinearTemperatureField</param>
+		<param>StgFEM_LinearTemperatureField</param>
 	</list>
 
 	<param name="TemperatureField-Tolerance">1.0e-4</param>

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/LinearTemperatureField/LinearTemperatureField.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/LinearTemperatureField/LinearTemperatureField.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/LinearTemperatureField/LinearTemperatureField.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,7 +40,7 @@
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 const Type LinearTemperatureField_Type = "LinearTemperatureField";
 
@@ -79,7 +79,7 @@
 }
 
 /* This function is automatically run by StGermain when this plugin is loaded. The name must be "<plugin-name>_Register". */
-Index StG_FEM_LinearTemperatureField_Register( PluginsManager* pluginsManager ) {
+Index StgFEM_LinearTemperatureField_Register( PluginsManager* pluginsManager ) {
 	/* A plugin is only properly registered once it returns the handle provided when submitting a codelet to StGermain. */
 	return PluginsManager_Submit( pluginsManager, LinearTemperatureField_Type, "0", _LinearTemperatureField_DefaultNew );
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/expected/testBasicTempDiffusion-Tri.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/expected/testBasicTempDiffusion-Tri.0of1.expected	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/expected/testBasicTempDiffusion-Tri.0of1.expected	2006-10-31 21:31:27 UTC (rev 5145)
@@ -5,7 +5,7 @@
 StGermain SLE Library revision 595. Copyright (C) 2003-2005 VPAC.
 StGermain PETSc-LinearAlgebra Interface revision 595. Copyright (C) 2003-2005 VPAC.
 StGermain FEM Assembly Library revision 595. Copyright (C) 2003-2005 VPAC.
-StG_FEM revision 595. Copyright (C) 2004-2005 VPAC.
+StgFEM revision 595. Copyright (C) 2004-2005 VPAC.
 Constructing context..
 	
 	Creating Stg_Components from the component-list
@@ -65,8 +65,8 @@
 		Constructing laplacian..
 		Constructing energySolver..
 		Constructing energySLE..
-	Constructing StG_FEM_PrintFeVariableDiscreteValues..
-	Constructing StG_FEM_StandardConditionFunctions..
+	Constructing StgFEM_PrintFeVariableDiscreteValues..
+	Constructing StgFEM_StandardConditionFunctions..
 TemperatureField Values (at end of timestep 0):
 In FeVariable_PrintLocalDiscreteValues: for FeVariable "TemperatureField":
 node 0 (global index 0):

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D-2D_Decomp.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D-2D_Decomp.0of4.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D-2D_Decomp.0of4.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml --numPartitionedDims=2" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml --numPartitionedDims=2" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-2D.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-2D_Decomp.0of4.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-2D_Decomp.0of4.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-2D_Decomp.0of4.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3 --numPartitionedDims=2 " "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3 --numPartitionedDims=2 " "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-3D_Decomp.0of8.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-3D_Decomp.0of8.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D-3D_Decomp.0of8.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3 --numPartitionedDims=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3 --numPartitionedDims=3" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of3.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of3.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-3D.0of3.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusion.xml ../analyticTemperature.xml --dim=3" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-Tri.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-Tri.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/TempDiffusion/tests/testBasicTempDiffusion-Tri.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM ../TempDiffusionTri.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM ../TempDiffusionTri.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/ThermalConvection.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -4,10 +4,10 @@
  
 	<!-- Load plugins that provide features you need for this model or your analysis -->
 	<list name="plugins">
-		<param>StG_FEM_StandardConditionFunctions</param>
+		<param>StgFEM_StandardConditionFunctions</param>
 		<!-- Output Plugins -->
-		<param>StG_FEM_FrequentOutput</param>	
-		<param>StG_FEM_CPUTime</param>	
+		<param>StgFEM_FrequentOutput</param>	
+		<param>StgFEM_CPUTime</param>	
 	</list>
 
 	<!-- Include Components that define the basic model -->
@@ -42,8 +42,8 @@
 	<param name="journal.info.Context-verbose">True</param>
 	<param name="journal-level.info.Stg_ComponentFactory"> 2 </param>
 	<param name="journal.debug">f</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>
 
 	<!-- Global physics paramters -->
 	<param name="Ra"> 1e6 </param>	

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/ColumnViscosityAnalytic/ColumnViscosityAnalytic.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/ColumnViscosityAnalytic/ColumnViscosityAnalytic.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/ColumnViscosityAnalytic/ColumnViscosityAnalytic.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,7 +42,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 #include <assert.h>
 
@@ -2614,6 +2614,6 @@
 			name );
 }
 
-Index StG_FEM_ColumnViscosityAnalytic_Register( PluginsManager* pluginsManager ) {
+Index StgFEM_ColumnViscosityAnalytic_Register( PluginsManager* pluginsManager ) {
 	return PluginsManager_Submit( pluginsManager, ColumnViscosityAnalytic_Type, "0", _ColumnViscosityAnalytic_DefaultNew );
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM testAnalytic.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM testAnalytic.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/ThermalConvection/tests/testThermalConvection-Analytic-2D.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM testAnalytic.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM testAnalytic.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/Assembly.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/Assembly.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/Assembly.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Assembly_h__
-#define __StG_FEM_Assembly_h__
+#ifndef __StgFEM_Assembly_h__
+#define __StgFEM_Assembly_h__
 	
 	#include "units.h"
 	#include "types.h"
@@ -65,4 +65,4 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_Assembly_h__ */
+#endif /* __StgFEM_Assembly_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/SLE.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/SLE.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -50,10 +50,10 @@
 
 #include <stdio.h>
 
-Bool StG_FEM_Assembly_Finalise( void ) {
+Bool StgFEM_Assembly_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	Stream_IndentBranch( StG_FEM_Debug );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Assembly_Finalise_h__
-#define __StG_FEM_Assembly_Finalise_h__
+#ifndef __StgFEM_Assembly_Finalise_h__
+#define __StgFEM_Assembly_Finalise_h__
 	
-	Bool StG_FEM_Assembly_Finalise( void );
+	Bool StgFEM_Assembly_Finalise( void );
 	
-#endif /* __StG_FEM_Assembly_Finalise_h__ */
+#endif /* __StgFEM_Assembly_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,8 +42,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/SLE.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/SLE.h>
 
 #include "types.h"
 #include "GradientStiffnessMatrixTerm.h"

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/GradientStiffnessMatrixTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_GradientStiffnessMatrixTerm_h__
-#define __StG_FEM_GradientStiffnessMatrixTerm_h__
+#ifndef __StgFEM_GradientStiffnessMatrixTerm_h__
+#define __StgFEM_GradientStiffnessMatrixTerm_h__
 
 	/** Textual name of this class */
 	extern const Type GradientStiffnessMatrixTerm_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,18 +41,18 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/SLE.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/SLE.h>
 
 #include "Assembly.h"
 
 #include <stdio.h>
 
-Stream* StG_FEM_Assembly_Debug = NULL;
+Stream* StgFEM_Assembly_Debug = NULL;
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_Assembly_Init( int* argc, char** argv[] ) {
+Bool StgFEM_Assembly_Init( int* argc, char** argv[] ) {
 	Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
 	int tmp;
 	
@@ -66,7 +66,7 @@
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
 	
 	/* initialise this level's streams */
-	StG_FEM_Assembly_Debug = Stream_RegisterChild( StG_FEM_Debug, "Assembly" );
+	StgFEM_Assembly_Debug = Stream_RegisterChild( StgFEM_Debug, "Assembly" );
 	
 	Stg_ComponentRegister_Add( componentRegister, ThermalBuoyancyForceTerm_Type, "0", _ThermalBuoyancyForceTerm_DefaultNew );
 	Stg_ComponentRegister_Add( componentRegister, GradientStiffnessMatrixTerm_Type, "0", _GradientStiffnessMatrixTerm_DefaultNew );

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Assembly_Init_h__
-#define __StG_FEM_Assembly_Init_h__
+#ifndef __StgFEM_Assembly_Init_h__
+#define __StgFEM_Assembly_Init_h__
 	
-	Bool StG_FEM_Assembly_Init( int* argc, char** argv[] );
+	Bool StgFEM_Assembly_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_Assembly_Init_h__ */
+#endif /* __StgFEM_Assembly_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,8 +42,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/SLE.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/SLE.h>
 
 #include "types.h"
 #include "IsoviscousStressTensorTerm.h"

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/IsoviscousStressTensorTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_IsoviscousStressTensorTerm_h__
-#define __StG_FEM_IsoviscousStressTensorTerm_h__
+#ifndef __StgFEM_IsoviscousStressTensorTerm_h__
+#define __StgFEM_IsoviscousStressTensorTerm_h__
 
 	/** Textual name of this class */
 	extern const Type IsoviscousStressTensorTerm_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,8 +42,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/SLE.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/SLE.h>
 
 #include "types.h"
 #include "LaplacianStiffnessMatrixTerm.h"

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/LaplacianStiffnessMatrixTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_LaplacianStiffnessMatrixTerm_h__
-#define __StG_FEM_LaplacianStiffnessMatrixTerm_h__
+#ifndef __StgFEM_LaplacianStiffnessMatrixTerm_h__
+#define __StgFEM_LaplacianStiffnessMatrixTerm_h__
 
 	/** Textual name of this class */
 	extern const Type LaplacianStiffnessMatrixTerm_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,8 +42,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/SLE.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/SLE.h>
 
 #include "types.h"
 #include "ThermalBuoyancyForceTerm.h"

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/ThermalBuoyancyForceTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_ThermalBuoyancyForceTerm_h__
-#define __StG_FEM_ThermalBuoyancyForceTerm_h__
+#ifndef __StgFEM_ThermalBuoyancyForceTerm_h__
+#define __StgFEM_ThermalBuoyancyForceTerm_h__
 
 	/** Textual name of this class */
 	extern const Type ThermalBuoyancyForceTerm_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/shortcuts.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/shortcuts.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/shortcuts.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,7 +50,7 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Assembly_shortcuts_h__
-#define __StG_FEM_Assembly_shortcuts_h__
+#ifndef __StgFEM_Assembly_shortcuts_h__
+#define __StgFEM_Assembly_shortcuts_h__
 
-#endif /* __StG_FEM_Assembly_shortcuts_h__ */
+#endif /* __StgFEM_Assembly_shortcuts_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Assembly_types_h__
-#define __StG_FEM_Assembly_types_h__
+#ifndef __StgFEM_Assembly_types_h__
+#define __StgFEM_Assembly_types_h__
 	
 	/* FE types/classes */
 	typedef struct ThermalBuoyancyForceTerm                ThermalBuoyancyForceTerm;
@@ -57,7 +57,7 @@
 	typedef struct LaplacianStiffnessMatrixTerm            LaplacianStiffnessMatrixTerm;
 	typedef struct IsoviscousStressTensorTerm              IsoviscousStressTensorTerm;
 
-	/* output streams: initialised in StG_FEM_Assembly_Init() */
-	extern Stream* StG_SLE_Assembly_Debug;
+	/* output streams: initialised in StgFEM_Assembly_Init() */
+	extern Stream* StgSLE_Assembly_Debug;
 
-#endif /* __StG_FEM_Assembly_types_h__ */
+#endif /* __StgFEM_Assembly_types_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/src/units.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/src/units.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/src/units.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,7 +47,7 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Assembly_units_h__
-#define __StG_FEM_Assembly_units_h__
+#ifndef __StgFEM_Assembly_units_h__
+#define __StgFEM_Assembly_units_h__
 	
-#endif /* __StG_FEM_Assembly_units_h__ */
+#endif /* __StgFEM_Assembly_units_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStiffnessMatrixCompare.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStiffnessMatrixCompare.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStiffnessMatrixCompare.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/SLE.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/SLE.h>
 #include <assert.h>
 
 const Type testStiffnessMatrixCompare_Type = "testStiffnessMatrixCompare";

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStressTensor.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStressTensor.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/tests/plugins/testStressTensor.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,9 +42,9 @@
 #include <mpi.h>
 #include <assert.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/SLE.h>
-#include <StG_FEM/Assembly/Assembly.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/SLE.h>
+#include <StgFEM/Assembly/Assembly.h>
 
 const Type testStressTensor_Type = "testStressTensor";
 typedef struct {

Modified: long/3D/Gale/trunk/src/StgFEM/Assembly/tests/testStressTensor.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Assembly/tests/testStressTensor.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Assembly/tests/testStressTensor.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,4 +49,4 @@
 setUpdateModeFromArg $1
 
 testname="`basename $0 .sh`"
-runAndHandleSystemTestStdLocations "StG_FEM testStressTensor.xml --StiffnessMatrixCompareFilename=./expected/${testname}.matrix --patchtests=${UPDATE_MODE}" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM testStressTensor.xml --StiffnessMatrixCompareFilename=./expected/${testname}.matrix --patchtests=${UPDATE_MODE}" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/AnalyticSolution.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_AnalyticSolution_h__
-#define __StG_FEM_Discretisation_AnalyticSolution_h__
+#ifndef __StgFEM_Discretisation_AnalyticSolution_h__
+#define __StgFEM_Discretisation_AnalyticSolution_h__
 	
 	typedef void (AnalyticSolution_FeVariableSolutionFunction) (void* analyticSolution, FeVariable* analyticFeVariable, double* coord, double* value );
 
@@ -140,4 +140,4 @@
 	FeVariable* AnalyticSolution_GetFeVariableFromAnalyticFeVariable( void* analyticSolution, FeVariable* analyticFeVariable ) ;
 	InterpolationResult AnalyticSolution_InterpolateValueFromNormalFeVariable( void* analyticSolution, FeVariable* analyticFeVariable, double* coord, double* value ) ;
 	
-#endif /* __StG_FEM_Discretisation_AnalyticSolution_h__ */
+#endif /* __StgFEM_Discretisation_AnalyticSolution_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/BilinearElementType.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_BilinearElementType_h__
-#define __StG_FEM_Discretisation_BilinearElementType_h__
+#ifndef __StgFEM_Discretisation_BilinearElementType_h__
+#define __StgFEM_Discretisation_BilinearElementType_h__
 	
 	/* Textual name of this class */
 	extern const Type BilinearElementType_Type;
@@ -128,4 +128,4 @@
 		const Coord**	globalNodeCoordPtrsInElement,
 		const Coord	globalCoord,
 		Coord		elLocalCoord );
-#endif /* __StG_FEM_Discretisation_BilinearElementType_h__ */
+#endif /* __StgFEM_Discretisation_BilinearElementType_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ConstantElementType.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_ConstantElementType_h__
-#define __StG_FEM_Discretisation_ConstantElementType_h__
+#ifndef __StgFEM_Discretisation_ConstantElementType_h__
+#define __StgFEM_Discretisation_ConstantElementType_h__
 	
 	/* Textual name of this class */
 	extern const Type ConstantElementType_Type;
@@ -130,4 +130,4 @@
 		const Coord**	globalNodeCoordPtrsInElement,
 		const Coord	globalCoord,
 		Coord		elLocalCoord );
-#endif /* __StG_FEM_Discretisation_ConstantElementType_h__ */
+#endif /* __StgFEM_Discretisation_ConstantElementType_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Discretisation.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Discretisation.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Discretisation.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_h__
-#define __StG_FEM_Discretisation_h__
+#ifndef __StgFEM_Discretisation_h__
+#define __StgFEM_Discretisation_h__
 	
 	#include "units.h"
 	#include "types.h"
@@ -76,4 +76,4 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_Discretisation_h__ */
+#endif /* __StgFEM_Discretisation_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Element.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Element.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Element.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_Element_h__
-#define __StG_FEM_Discretisation_Element_h__
+#ifndef __StgFEM_Discretisation_Element_h__
+#define __StgFEM_Discretisation_Element_h__
 	
 	/* Element Information */
 	#define __FiniteElement_Element \
@@ -60,4 +60,4 @@
 	/* Print the contents of an Element */
 	void FiniteElement_Element_Print( void* element, Stream* stream );
 	
-#endif /* __StG_FEM_Discretisation_Element_h__ */
+#endif /* __StgFEM_Discretisation_Element_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -109,7 +109,7 @@
 	/* ElementType info */
 	self->isConstructed = True;
 	self->nodeCount = nodeCount;
-	self->debug = Stream_RegisterChild( StG_FEM_Discretisation_Debug, ElementType_Type );
+	self->debug = Stream_RegisterChild( StgFEM_Discretisation_Debug, ElementType_Type );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -51,8 +51,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_ElementType_h__
-#define __StG_FEM_Discretisation_ElementType_h__
+#ifndef __StgFEM_Discretisation_ElementType_h__
+#define __StgFEM_Discretisation_ElementType_h__
 	
 	/** Type of this classes */
 	extern const Type ElementType_Type;
@@ -189,4 +189,4 @@
 		Coord_Index         B_axis, 
 		Coord_Index         C_axis );
 
-#endif /* __StG_FEM_Discretisation_ElementType_h__ */
+#endif /* __StgFEM_Discretisation_ElementType_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -158,14 +158,14 @@
 	self->_delta = 8;
 	self->elementType = Memory_Alloc_Array( ElementType*, self->_size, "ElementType_Register->elementType" );
 	memset( self->elementType, 0, sizeof(ElementType*) * self->_size );
-	self->debug = Stream_RegisterChild( StG_FEM_Discretisation_Debug, ElementType_Register_Type );
+	self->debug = Stream_RegisterChild( StgFEM_Discretisation_Debug, ElementType_Register_Type );
 }
 
 void _ElementType_Register_Delete( void* elementType_Register ) {
 	ElementType_Register* self = (ElementType_Register*)elementType_Register;
 
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* Assumes ownerships of the element types */
 	if( self->elementType ) {
@@ -180,7 +180,7 @@
 	
 	/* Stg_Class_Delete parent */
 	_Stg_Class_Delete( self );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _ElementType_Register_Print( void* elementType_Register, Stream* stream ) {

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/ElementType_Register.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_ElementType_Register_h__
-#define __StG_FEM_Discretisation_ElementType_Register_h__
+#ifndef __StgFEM_Discretisation_ElementType_Register_h__
+#define __StgFEM_Discretisation_ElementType_Register_h__
 	
 	
 	/* Textual name of this class */
@@ -127,4 +127,4 @@
 	#define ElementType_Register_At( elementType_Register, handle )		((elementType_Register)->elementType[(handle)] )
 	ElementType* _ElementType_Register_At( void* elementType_Register, ElementType_Index handle );
 	
-#endif /* __StG_FEM_Discretisation_ElementType_Register_h__ */
+#endif /* __StgFEM_Discretisation_ElementType_Register_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -272,9 +272,9 @@
 	self->linkedDofInfo = linkedDofInfo;
 	self->remappingActivated = False;
 	/* register streams */
-	self->debug = Stream_RegisterChild( StG_FEM_Discretisation_Debug, FeEquationNumber_Type );
+	self->debug = Stream_RegisterChild( StgFEM_Discretisation_Debug, FeEquationNumber_Type );
 	self->debugLM = Stream_RegisterChild( self->debug, "LM" );
-	self->warning = Stream_RegisterChild( StG_FEM_Warning, FeEquationNumber_Type );
+	self->warning = Stream_RegisterChild( StgFEM_Warning, FeEquationNumber_Type );
 	self->removeBCs = True;
 	self->bcEqNums = NULL;
 }
@@ -298,7 +298,7 @@
 	FeEquationNumber* self = (FeEquationNumber*) feEquationNumber;
 
 	Journal_DPrintfL( self->debug, 1, "In %s\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Memory_Free( self->remappedNodeInfos );
 	/* free destination array memory */
@@ -316,7 +316,7 @@
 	
 	/* Stg_Class_Delete parent */
 	_Stg_Class_Delete( self );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -487,7 +487,7 @@
 #endif
 	
 	Journal_DPrintf( self->debug, "In %s:\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* If we have new mesh topology information, do this differently. */
 	if( self->feMesh->topo->domains && self->feMesh->topo->domains[MT_VERTEX] ) {
@@ -506,7 +506,7 @@
 	}
 #endif
 	
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void FeEquationNumber_Initialise( void* feEquationNumber ) {
@@ -564,7 +564,7 @@
 #endif
 	
 	Journal_DPrintfL( self->debug, 1, "In %s:\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	self->remappedNodeInfos = Memory_Alloc_Array( RemappedNodeInfo, nodeDomainCount, 
 						      "FeEquationNumber->remappedNodeInfos" );
@@ -709,7 +709,7 @@
 			Journal_DPrintfL( self->debug, 4, " (a local node.)\n" );
 		}
 
-		Stream_IndentBranch( StG_FEM_Debug );
+		Stream_IndentBranch( StgFEM_Debug );
 		/* Now add the rest, relative to the first */
 		for (dNode_I = 0; dNode_I < nodeDomainCount; dNode_I++ ) {
 			gNode_I = mesh->nodeD2G[dNode_I];
@@ -720,7 +720,7 @@
 			Journal_DPrintfL( self->debug, 4, "Processing domain node %d: original global = %d, remaps to %d.\n",
 					  dNode_I, gNode_I, currRemappedGNode_I );
 		}	
-		Stream_UnIndentBranch( StG_FEM_Debug );
+		Stream_UnIndentBranch( StgFEM_Debug );
 	}
 
 #if DEBUG
@@ -734,7 +734,7 @@
 		Journal_DPrintf( self->debug, "}\n");
 	}
 #endif
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }	
 
 
@@ -749,7 +749,7 @@
 	Stream* errorStream = Journal_Register( Error_Type, self->type );
 
 	Journal_DPrintfL( self->debug, 1, "In %s:\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Journal_Firewall( ( nodeDomainCount == self->dofLayout->_numItemsInLayout ),
 			  errorStream, "Error: In %s: DofLayout's size is %d, which isn't equal to "
@@ -856,7 +856,7 @@
 
 	Memory_Free( critPointsIHave );
 	Memory_Free( critPointsToSend );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -877,7 +877,7 @@
 	MeshDecomp* meshDecomp = self->feMesh->layout->decomp;
 
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	if ( self->remappingActivated ) {
 		/* if remapping has been done, the only possible crit points are the first and last
@@ -895,7 +895,7 @@
 					  (*mySetEndsTotal), remappedGlobal_I );
 			mySetEnds[(*mySetEndsTotal)++].index = remappedGlobal_I;
 		}
-		Stream_UnIndentBranch( StG_FEM_Debug );
+		Stream_UnIndentBranch( StgFEM_Debug );
 		return;
 	}
 	
@@ -947,7 +947,7 @@
 		Journal_DPrintf( self->debug, "]\n" );
 	}
 #endif
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -970,7 +970,7 @@
 	PartitionIndex myRank = meshDecomp->rank;
 
 	Journal_DPrintf( self->debug, "In %s\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Journal_DPrintfL( self->debug, 2, "Globally sharing locally known wanted C.N. lists:\n",  __func__ );
 	_FeEquationNumber_ShareCriticalPoints( self, myWantedCriticalPointsPtr, myWantedCriticalPointsTotal,
@@ -1073,7 +1073,7 @@
 	Memory_Free( procWantedCritPointsTotals );
 	Memory_Free( allHaveCriticalPoints );
 	Memory_Free( procHaveCritPointsTotals );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -1129,7 +1129,7 @@
 #endif
 
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	(*maxCritPointsPerProc) = 0;
 	
@@ -1188,7 +1188,7 @@
 	}
 	Journal_DPrintfL( self->debug, 2, ")\n");
 #endif
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -1212,7 +1212,7 @@
 #endif
 
 	Journal_DPrintfL( self->debug, 1, "In %s\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	(*maxCritPointInfoPerProc) = 0;
 
 	// allgather the totals (to save allocating unnecessary memory)
@@ -1267,7 +1267,7 @@
 		Journal_DPrintf( self->debug, ")\n");
 	}	
 #endif
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -1287,7 +1287,7 @@
 	Dof_EquationNumber currSubTotalEqNum = 0;
 
 	Journal_DPrintf( self->debug, "In %s:\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	while ( (rNodeInfo_I < nodeDomainCount) ) {
 		remappedGlobal_I = self->remappedNodeInfos[rNodeInfo_I].remappedGlobal;
@@ -1335,7 +1335,7 @@
 		Journal_Printf( self->debug, "]\n" );
 	}
 #endif
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -1370,7 +1370,7 @@
 #define NEXT_PROCESSOR_SECTION_START ( maxSubTotalsPerProc * (proc_I) + procCritPointInfoTotals[proc_I] )
 
 	Journal_DPrintfL( self->debug, 1, "In %s:\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	gNode_I += 0;
 	
@@ -1557,7 +1557,7 @@
 		Memory_Free( haveUpdatedLinkedDofSetTbl );
 	}	
 	Memory_Free( procCritPointInfo_Is );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -1792,11 +1792,11 @@
 	Element_LocalIndex elementLocalCount = self->feMesh->elementLocalCount;
 
 	Journal_DPrintf( self->debug, "In %s():\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	if (self->locationMatrixBuilt) {
 		Journal_DPrintf( self->debugLM, "In %s: LM already built, so just returning.\n",  __func__ );
-		Stream_UnIndentBranch( StG_FEM_Debug );
+		Stream_UnIndentBranch( StgFEM_Debug );
 		return;
 	}
 		
@@ -1826,7 +1826,7 @@
 	}	
 
 	self->locationMatrixBuilt = True;
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -1985,12 +1985,12 @@
 	MeshDecomp* meshDecomp = self->feMesh->layout->decomp;
 	
 	Journal_DPrintfL( self->debug, 1, "In %s:\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	MPI_Allreduce( &self->_highestLocalEqNum, &globalSumUnconstrainedDofs, 1, MPI_INT, MPI_MAX, meshDecomp->communicator );
 	self->globalSumUnconstrainedDofs = (unsigned)(globalSumUnconstrainedDofs+1);
 	
 	Journal_DPrintf( self->debug, "Calculated total (across all processors) unconstrained dofs as:%d\n", self->globalSumUnconstrainedDofs  );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -2001,7 +2001,7 @@
 	Partition_Index		nProc = meshDecomp->nproc;
 
 	Journal_DPrintfL( self->debug, 1, "In %s:\n",  __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	if ( (self->remappingActivated) && ( (self->linkedDofInfo == NULL) || (self->linkedDofInfo->linkedDofSetsCount == 0 ) ) ) {
 		/* If the remapping is activated, and things aren't complicated by periodic BCs,
@@ -2068,7 +2068,7 @@
 	Journal_DPrintfL( self->debug, 1, "(Range of eqNums on local mesh segment is %d to %d)\n",
 			  self->_lowestLocalEqNum, self->_highestLocalEqNum );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeEquationNumber.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -71,8 +71,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_EquationNumber_h__
-#define __StG_FEM_Discretisation_EquationNumber_h__
+#ifndef __StgFEM_Discretisation_EquationNumber_h__
+#define __StgFEM_Discretisation_EquationNumber_h__
 	#include <mpi.h>
 	
 	typedef void			(FeEquationNumber_BuildFunction)	( void* feEquationNumber, void *data );
@@ -283,4 +283,4 @@
 
 	void FeEquationNumber_BuildWithTopology( FeEquationNumber* self );
 
-#endif /* __StG_FEM_Discretisation_EquationNumber_h__ */
+#endif /* __StgFEM_Discretisation_EquationNumber_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -327,7 +327,7 @@
 	
 	/* FeVariable info */
 	self->isConstructed = True;
-	self->debug = Stream_RegisterChild( StG_FEM_Discretisation_Debug, self->type );
+	self->debug = Stream_RegisterChild( StgFEM_Discretisation_Debug, self->type );
 	self->feMesh = Stg_CheckType( feMesh, FiniteElement_Mesh );
 	/* Set pointer for geometry mesh - if none is provided then it'll use the feMesh */
 	self->geometryMesh = ( geometryMesh ? 
@@ -390,7 +390,7 @@
 	FeVariable* self = (FeVariable*)variable;
 	
 	Journal_DPrintf( self->debug, "In %s- for \"%s\":\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	if( self->eqNum && ( NULL == self->templateFeVariable ) ) {
 		Stg_Class_Delete( self->eqNum );
 	}
@@ -400,7 +400,7 @@
 
 	/* Stg_Class_Delete parent*/
 	_Stg_Component_Delete( self );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -517,7 +517,7 @@
 		self->isBuilt = True;
 	
 		Journal_DPrintf( self->debug, "In %s- for %s:\n", __func__, self->name );
-		Stream_IndentBranch( StG_FEM_Debug );
+		Stream_IndentBranch( StgFEM_Debug );
 
 		/* build the BCs */
 		Build( self->feMesh, data, False );
@@ -537,7 +537,7 @@
 		/* build the e.q. number array */
 		FeEquationNumber_Build( self->eqNum );
 		
-		Stream_UnIndentBranch( StG_FEM_Debug );
+		Stream_UnIndentBranch( StgFEM_Debug );
 	}
 }
 
@@ -578,7 +578,7 @@
 	DiscretisationContext*   context = (DiscretisationContext*)data;
 	
 	Journal_DPrintf( self->debug, "In %s- for %s:\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	/* do basic mesh initialisation */
 	Initialise( self->feMesh, data, False );
@@ -633,7 +633,7 @@
 		VariableCondition_Apply( self->bcs, data );
 	}
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/FeVariable.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_FeVariable_h__
-#define __StG_FEM_Discretisation_FeVariable_h__
+#ifndef __StgFEM_Discretisation_FeVariable_h__
+#define __StgFEM_Discretisation_FeVariable_h__
 	
 	/** Textual name of this class */
 	extern const Type FeVariable_Type;
@@ -369,4 +369,4 @@
 	void _FeVariable_PrintLocalOrDomainValues( void* variable, Index localOrDomainCount, Stream* stream );
 
 
-#endif /* __StG_FEM_Discretisation_FeVariable_h__ */
+#endif /* __StgFEM_Discretisation_FeVariable_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,14 +50,14 @@
 
 #include <stdio.h>
 
-Bool StG_FEM_Discretisation_Finalise( void ) {
+Bool StgFEM_Discretisation_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Stg_ObjectList_DeleteAllObjects( FeVariable_FileFormatImportExportList );
 	Stg_Class_Delete( FeVariable_FileFormatImportExportList );
 	
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_Finalise_h__
-#define __StG_FEM_Discretisation_Finalise_h__
+#ifndef __StgFEM_Discretisation_Finalise_h__
+#define __StgFEM_Discretisation_Finalise_h__
 	
-	Bool StG_FEM_Discretisation_Finalise( void );
+	Bool StgFEM_Discretisation_Finalise( void );
 	
-#endif /* __StG_FEM_Discretisation_Finalise_h__ */
+#endif /* __StgFEM_Discretisation_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -61,13 +61,13 @@
 #include "LinkedDofInfo.h"
 #include <stdio.h>
 
-Stream* StG_FEM_Debug = NULL;
-Stream* StG_FEM_Warning = NULL;
-Stream* StG_FEM_Discretisation_Debug = NULL;
+Stream* StgFEM_Debug = NULL;
+Stream* StgFEM_Warning = NULL;
+Stream* StgFEM_Discretisation_Debug = NULL;
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_Discretisation_Init( int* argc, char** argv[] ) {
+Bool StgFEM_Discretisation_Init( int* argc, char** argv[] ) {
 	Stg_ComponentRegister*          componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
 	FeVariable_ImportExportInfo*    stgFEM_NativeImportExportInfo = NULL;
 	int tmp;
@@ -82,9 +82,9 @@
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
 	
 	/* initialise this level's streams */
-	StG_FEM_Debug = Journal_Register( DebugStream_Type, "StG_FEM" );
-	StG_FEM_Discretisation_Debug = Stream_RegisterChild( StG_FEM_Debug, "Discretisation" );
-	StG_FEM_Warning = Journal_Register( ErrorStream_Type, "StG_FEM" );
+	StgFEM_Debug = Journal_Register( DebugStream_Type, "StgFEM" );
+	StgFEM_Discretisation_Debug = Stream_RegisterChild( StgFEM_Debug, "Discretisation" );
+	StgFEM_Warning = Journal_Register( ErrorStream_Type, "StgFEM" );
 	
 	Stg_ComponentRegister_Add( componentRegister, FeVariable_Type,         "0", FeVariable_DefaultNew );
 	Stg_ComponentRegister_Add( componentRegister, LinkedDofInfo_Type,      "0", LinkedDofInfo_DefaultNew );

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_Init_h__
-#define __StG_FEM_Discretisation_Init_h__
+#ifndef __StgFEM_Discretisation_Init_h__
+#define __StgFEM_Discretisation_Init_h__
 	
-	Bool StG_FEM_Discretisation_Init( int* argc, char** argv[] );
+	Bool StgFEM_Discretisation_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_Discretisation_Init_h__ */
+#endif /* __StgFEM_Discretisation_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinearTriangleElementType.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_LinearTriangleElementType_h__
-#define __StG_FEM_Discretisation_LinearTriangleElementType_h__
+#ifndef __StgFEM_Discretisation_LinearTriangleElementType_h__
+#define __StgFEM_Discretisation_LinearTriangleElementType_h__
 	
 	/* Textual name of this class */
 	extern const Type LinearTriangleElementType_Type;
@@ -118,4 +118,4 @@
 	void _LinearTriangleElementType_SF_allLocalDerivs_allNodes( void* elementType, const double localCoord[],
 		double** const evaluatedDerivatives );
 	
-#endif /* __StG_FEM_Discretisation_LinearTriangleElementType_h__ */
+#endif /* __StgFEM_Discretisation_LinearTriangleElementType_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/LinkedDofInfo.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_LinkedDofInfo_h__
-#define __StG_FEM_Discretisation_LinkedDofInfo_h__
+#ifndef __StgFEM_Discretisation_LinkedDofInfo_h__
+#define __StgFEM_Discretisation_LinkedDofInfo_h__
 
 	extern const Type LinkedDofInfo_Type;
 	

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -218,7 +218,7 @@
 	self->isConstructed = True;
 	self->elementType_Register = (ElementType_Register*)elementType_Register;
 
-	self->debug = Stream_RegisterChild( StG_FEM_Discretisation_Debug, self->type );
+	self->debug = Stream_RegisterChild( StgFEM_Discretisation_Debug, self->type );
 
 	/* Check the mesh is appropriately configured for F.E. problems */
 	Mesh_ActivateElementNodeTbl( self );
@@ -315,7 +315,7 @@
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
 	_Mesh_Initialise( self, data );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* TODO: generalise into an entry point so it can easily be over-ridden */
 	_FiniteElement_Mesh_SetupElementTypes_Default( self );
@@ -325,7 +325,7 @@
 		_Mesh_PrintCoords( (Mesh*) self, self->debug );
 	}
 	#endif
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -339,7 +339,7 @@
 	Stream*            error                 = Journal_Register( ErrorStream_Type, self->type );
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* TODO: this will need to be generalised when we allow meshes that are composed of different elements */
 
@@ -390,7 +390,7 @@
 		/* TODO: stick to default FE cell index till we sort that design issue out... */
 		FeMesh_ElementAt( self, element_I )->cell_I = 0;
 	}
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 
 }
 

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/Mesh.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -58,8 +58,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_FiniteElement_Mesh_h__
-#define __StG_FEM_Discretisation_FiniteElement_Mesh_h__
+#ifndef __StgFEM_Discretisation_FiniteElement_Mesh_h__
+#define __StgFEM_Discretisation_FiniteElement_Mesh_h__
 	
 	/** Textual name of this class */
 	extern const Type FiniteElement_Mesh_Type;
@@ -210,4 +210,4 @@
 		Coord elLocalCoord );
 
 	
-#endif /* __StG_FEM_Discretisation_FiniteElement_Mesh_h__ */
+#endif /* __StgFEM_Discretisation_FiniteElement_Mesh_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/TrilinearElementType.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_TrilinearElementType_h__
-#define __StG_FEM_Discretisation_TrilinearElementType_h__
+#ifndef __StgFEM_Discretisation_TrilinearElementType_h__
+#define __StgFEM_Discretisation_TrilinearElementType_h__
 	
 	/* Textual name of this class */
 	extern const Type TrilinearElementType_Type;
@@ -129,4 +129,4 @@
 		const Coord	globalCoord,
 		Coord		elLocalCoord );
 	
-#endif /* __StG_FEM_Discretisation_TrilinearElementType_h__ */
+#endif /* __StgFEM_Discretisation_TrilinearElementType_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/shortcuts.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/shortcuts.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/shortcuts.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,12 +50,12 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_shortcuts_h__
-#define __StG_FEM_Discretisation_shortcuts_h__
+#ifndef __StgFEM_Discretisation_shortcuts_h__
+#define __StgFEM_Discretisation_shortcuts_h__
 
 	/* FE shortcuts */
 	#define FeMesh_NodeAt		FiniteElement_Mesh_NodeAt
 	#define FeMesh_ElementAt	FiniteElement_Mesh_ElementAt
 	#define FeMesh_ElementTypeAt	FiniteElement_Mesh_ElementTypeAt
 
-#endif /* __StG_FEM_Discretisation_shortcuts_h__ */
+#endif /* __StgFEM_Discretisation_shortcuts_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_types_h__
-#define __StG_FEM_Discretisation_types_h__
+#ifndef __StgFEM_Discretisation_types_h__
+#define __StgFEM_Discretisation_types_h__
 	
 	/* FE types/classes */
 	typedef struct ElementType               ElementType;
@@ -86,10 +86,10 @@
 	typedef Index					ElementType_Index;
 
 	/* output streams: initialised in Init() */
-	/* Let's give this library responsiblity for setting up the StG_FEM stream, as it's the first to be compiled...  */
-	extern Stream* StG_FEM_Debug;
-	extern Stream* StG_FEM_Warning;
+	/* Let's give this library responsiblity for setting up the StgFEM stream, as it's the first to be compiled...  */
+	extern Stream* StgFEM_Debug;
+	extern Stream* StgFEM_Warning;
 
-	extern Stream* StG_FEM_Discretisation_Debug;
+	extern Stream* StgFEM_Discretisation_Debug;
 
-#endif /* __StG_FEM_Discretisation_types_h__ */
+#endif /* __StgFEM_Discretisation_types_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/src/units.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/src/units.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/src/units.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,7 +48,7 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_units_h__
-#define __StG_FEM_Discretisation_units_h__
+#ifndef __StgFEM_Discretisation_units_h__
+#define __StgFEM_Discretisation_units_h__
 	
-#endif /* __StG_FEM_Discretisation_units_h__ */
+#endif /* __StgFEM_Discretisation_units_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -95,7 +95,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -207,7 +207,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType_Register.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType_Register.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testElementType_Register.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -62,7 +62,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -138,7 +138,7 @@
 	/* Destroy stuff */
 	Stg_Class_Delete( elementType_Register );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LM.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LM.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LM.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -93,17 +93,17 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 
 	Journal_Enable_TypedStream( DebugStream_Type, False );
-	feDebugStream = Journal_Register( DebugStream_Type, "StG_FEM" );
+	feDebugStream = Journal_Register( DebugStream_Type, "StgFEM" );
 	Stream_SetLevelBranch( feDebugStream, 2 );
 	Stream_EnableBranch( feDebugStream, True );
 	#if 0
 	Stream_SetLevelBranch( feDebugStream, 1 );
 	Stream_Enable( feDebugStream, True );
-	Stream_EnableBranch( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation" ), True );
+	Stream_EnableBranch( Journal_Register( DebugStream_Type, "StgFEM.StgFEM_Discretisation" ), True );
 	file = CFile_New();
 	if ( JournalFile_Open( file, "debugInfo" ) )
 	{
@@ -111,8 +111,8 @@
 	}
 	Stream_SetFile( Journal_GetTypedStream( DebugStream_Type ), file );
 	Stream_SetFile( feDebugStream, file );
-	Stream_SetFile( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation.FeEquationNumber" ), file );
-	Stream_SetFile( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation.FeEquationNumber.LM" ), file );
+	Stream_SetFile( Journal_Register( DebugStream_Type, "StgFEM.StgFEM_Discretisation.FeEquationNumber" ), file );
+	Stream_SetFile( Journal_Register( DebugStream_Type, "StgFEM.StgFEM_Discretisation.FeEquationNumber.LM" ), file );
 	#endif
 	
 	if( argc >= 2 ) {
@@ -204,7 +204,7 @@
 	Stg_Class_Delete( geomIO_Handler );
 	//if( rank == procToWatch ) Memory_Print();
 
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 
 	/* Close off MPI */

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-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -85,14 +85,14 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 
 	Journal_Enable_TypedStream( DebugStream_Type, False );
-	feDebugStream = Journal_Register( DebugStream_Type, "StG_FEM" );
+	feDebugStream = Journal_Register( DebugStream_Type, "StgFEM" );
 	Stream_EnableBranch( feDebugStream, True );
 	Stream_SetLevelBranch( feDebugStream, 3 );
-	Stream_EnableBranch( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation" ), True );
+	Stream_EnableBranch( Journal_Register( DebugStream_Type, "StgFEM.StgFEM_Discretisation" ), True );
 
 	if( argc >= 2 ) {
 		procToWatch = atoi( argv[1] );
@@ -161,7 +161,7 @@
 	Stg_Class_Delete( dictionary );
 	Stg_Class_Delete( io_Handler );
 
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs2.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs2.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeEquationNumber-LinkedDofs2.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -86,14 +86,14 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 
 	Journal_Enable_TypedStream( DebugStream_Type, False );
-	feDebugStream = Journal_Register( DebugStream_Type, "StG_FEM" );
+	feDebugStream = Journal_Register( DebugStream_Type, "StgFEM" );
 	Stream_EnableBranch( feDebugStream, True );
 	Stream_SetLevelBranch( feDebugStream, 3 );
-	Stream_EnableBranch( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation" ), True );
+	Stream_EnableBranch( Journal_Register( DebugStream_Type, "StgFEM.StgFEM_Discretisation" ), True );
 	#if 0
 	file = CFile_New();
 	if ( JournalFile_Open( file, "debugInfo" ) )
@@ -102,8 +102,8 @@
 	}
 	Stream_SetFile( Journal_GetTypedStream( DebugStream_Type ), file );
 	Stream_SetFile( feDebugStream, file );
-	Stream_SetFile( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation.FeEquationNumber" ), file );
-	Stream_SetFile( Journal_Register( DebugStream_Type, "StG_FEM.StG_FEM_Discretisation.FeEquationNumber.LM" ), file );
+	Stream_SetFile( Journal_Register( DebugStream_Type, "StgFEM.StgFEM_Discretisation.FeEquationNumber" ), file );
+	Stream_SetFile( Journal_Register( DebugStream_Type, "StgFEM.StgFEM_Discretisation.FeEquationNumber.LM" ), file );
 	#endif
 	
 	if( argc >= 2 ) {
@@ -158,7 +158,7 @@
 	Stg_Class_Delete( geomIO_Handler );
 	//if( rank == procToWatch ) Memory_Print();
 
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-saveAndLoad.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -91,7 +91,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -248,7 +248,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable-shadowing.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -93,7 +93,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -135,8 +135,8 @@
 	Dictionary_Add( dictionary, "boundaryCondition", currBC );
 
 	Journal_Enable_TypedStream( DebugStream_Type, False );
-	Stream_EnableBranch( StG_FEM_Debug, True );
-	Stream_SetLevelBranch( StG_FEM_Debug, 2 );
+	Stream_EnableBranch( StgFEM_Debug, True );
+	Stream_SetLevelBranch( StgFEM_Debug, 2 );
 
 	/* Create Context */
 	context = _DiscretisationContext_New( 
@@ -254,7 +254,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testFeVariable.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -94,7 +94,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -388,7 +388,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testIntegration.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <assert.h>
@@ -106,7 +106,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -322,7 +322,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFunc.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFunc.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFunc.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -101,7 +101,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	if( argc >= 2 ) {
@@ -286,7 +286,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFuncLocalDerivs.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFuncLocalDerivs.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/Discretisation/tests/testTrilinearShapeFuncLocalDerivs.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -94,7 +94,7 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	/* debugging stuff */
@@ -262,7 +262,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,10 +41,10 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
-Bool StG_FEM_SLE_LinearAlgebra_Finalise( void ) {
+Bool StgFEM_SLE_LinearAlgebra_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	return True;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,10 +41,10 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
-Bool StG_FEM_SLE_LinearAlgebra_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_LinearAlgebra_Init( int* argc, char** argv[] ) {
 	int tmp;
 	
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Matrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Matrix.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Matrix.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 Matrix* Matrix_New( 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/MatrixSolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/MatrixSolver.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/MatrixSolver.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Utils.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Utils.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Utils.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Vector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Vector.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/Dummy/Vector.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 Vector* Vector_New( MPI_Comm comm, Index size ) {

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/ErrorChecking.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/ErrorChecking.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/ErrorChecking.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -37,8 +37,8 @@
 **
 */
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_PETSc_ErrorChecking_h__
-#define __StG_FEM_SLE_LinearAlgebra_PETSc_ErrorChecking_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_PETSc_ErrorChecking_h__
+#define __StgFEM_SLE_LinearAlgebra_PETSc_ErrorChecking_h__
 	
 	#define CheckPETScError( errorFlag ) \
 		do {								\
@@ -49,4 +49,4 @@
 			}						\
 		} while (0)
 
-#endif	/* __StG_FEM_SLE_LinearAlgebra_PETSc_ErrorChecking_h__ */
+#endif	/* __StgFEM_SLE_LinearAlgebra_PETSc_ErrorChecking_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -44,7 +44,7 @@
 
 #include <petsc.h>
 
-Bool StG_FEM_SLE_LinearAlgebra_Finalise( void ) {
+Bool StgFEM_SLE_LinearAlgebra_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	return PetscFinalize();

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-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -44,7 +44,7 @@
 
 #include <petsc.h>
 
-Bool StG_FEM_SLE_LinearAlgebra_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_LinearAlgebra_Init( int* argc, char** argv[] ) {
 	int tmp;
 	
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Matrix.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,7 +42,7 @@
 #include <assert.h>
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 #include <petsc.h>

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/MatrixSolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/MatrixSolver.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/MatrixSolver.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 #include <petsc.h>

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Utils.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Utils.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Utils.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,7 +42,7 @@
 #include <assert.h>
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 #include <petsc.h>

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Vector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Vector.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/PETSc/Vector.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
+#include <StgFEM/Discretisation/Discretisation.h>
 #include "SLE/LinearAlgebra/LinearAlgebra.h"
 
 #include <petsc.h>

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,9 +49,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_Finalise_h__
-#define __StG_FEM_SLE_LinearAlgebra_Finalise_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_Finalise_h__
+#define __StgFEM_SLE_LinearAlgebra_Finalise_h__
 	
-	Bool StG_FEM_SLE_LinearAlgebra_Finalise( void );
+	Bool StgFEM_SLE_LinearAlgebra_Finalise( void );
 	
-#endif /* __StG_FEM_SLE_LinearAlgebra_Finalise_h__ */
+#endif /* __StgFEM_SLE_LinearAlgebra_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_Init_h__
-#define __StG_FEM_SLE_LinearAlgebra_Init_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_Init_h__
+#define __StgFEM_SLE_LinearAlgebra_Init_h__
 	
-	Bool StG_FEM_SLE_LinearAlgebra_Init( int* argc, char** argv[] );
+	Bool StgFEM_SLE_LinearAlgebra_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_SLE_LinearAlgebra_Init_h__ */
+#endif /* __StgFEM_SLE_LinearAlgebra_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/LinearAlgebra.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/LinearAlgebra.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/LinearAlgebra.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_h__
-#define __StG_FEM_SLE_LinearAlgebra_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_h__
+#define __StgFEM_SLE_LinearAlgebra_h__
 	
 	#include "types.h"
 	#include "Utils.h"
@@ -61,5 +61,5 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_SLE_LinearAlgebra_h__ */
+#endif /* __StgFEM_SLE_LinearAlgebra_h__ */
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Matrix.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_Matrix_h__
-#define __StG_FEM_SLE_LinearAlgebra_Matrix_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_Matrix_h__
+#define __StgFEM_SLE_LinearAlgebra_Matrix_h__
 	
 	Matrix* Matrix_New( 
 		MPI_Comm			comm,
@@ -125,4 +125,4 @@
 	void Matrix_GetRow( Matrix* mat, unsigned rowInd, unsigned* nEntries, unsigned** cols, double** entries );
 	void Matrix_RestoreRow( Matrix* mat, unsigned rowInd, unsigned nEntries, unsigned** cols, double** entries );
 
-#endif /* __StG_FEM_SLE_LinearAlgebra_Matrix_h__ */
+#endif /* __StgFEM_SLE_LinearAlgebra_Matrix_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/MatrixSolver.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_MatrixSolver_h__
-#define __StG_FEM_SLE_LinearAlgebra_MatrixSolver_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_MatrixSolver_h__
+#define __StgFEM_SLE_LinearAlgebra_MatrixSolver_h__
 
 	MatrixSolver* MatrixSolver_Build( MPI_Comm comm, void* matrix );
 	void MatrixSolver_Setup( void* matSolver, void* matrix );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Utils.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Utils.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Utils.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,11 +47,11 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_Utils_h__
-#define __StG_FEM_SLE_LinearAlgebra_Utils_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_Utils_h__
+#define __StgFEM_SLE_LinearAlgebra_Utils_h__
 
 
 size_t LinearAlgebra_GetMemoryUsage( void );
 
 
-#endif /* __StG_FEM_SLE_LinearAlgebra_Utils_h__ */
+#endif /* __StgFEM_SLE_LinearAlgebra_Utils_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/Vector.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgebra_Vector_h__
-#define __StG_FEM_SLE_LinearAlgebra_Vector_h__
+#ifndef __StgFEM_SLE_LinearAlgebra_Vector_h__
+#define __StgFEM_SLE_LinearAlgebra_Vector_h__
 	
 	Vector* Vector_New_SpecifyLocalSize( MPI_Comm comm, Index size );
 	Vector* Vector_New_SpecifyGlobalSize( MPI_Comm comm, Index size );
@@ -106,4 +106,4 @@
 
 	void Vector_Reciprocal( Vector* vec );
 
-#endif /* __StG_FEM_SLE_LinearAlgebra_Vector_h__ */
+#endif /* __StgFEM_SLE_LinearAlgebra_Vector_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/dummy.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/dummy.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/dummy.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,5 +42,5 @@
 /* exists only such that MM doesn't fail to create an empty ".a" */
  
 /* dummy function so that Tru64 CC doesn't complain about doing nothing */
-const int StG_SLE_LinearAlgebraSrcDummy = 0;
+const int StgSLE_LinearAlgebraSrcDummy = 0;
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/LinearAlgebra/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_LinearAlgrebra_types_h__
-#define __StG_FEM_SLE_LinearAlgrebra_types_h__
+#ifndef __StgFEM_SLE_LinearAlgrebra_types_h__
+#define __StgFEM_SLE_LinearAlgrebra_types_h__
 	
 	/* Types user needs to define */
 	typedef struct _Matrix          Matrix;
@@ -73,5 +73,5 @@
 	} MatrixSolver_PC;
 
 
-#endif /* __StG_FEM_SLE_LinearAlgrebra_types_h__ */
+#endif /* __StgFEM_SLE_LinearAlgrebra_types_h__ */
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,13 +41,13 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
+#include "StgFEM/Discretisation/Discretisation.h"
 #include "Finalise.h"
 
 #include <stdio.h>
 
 
-Bool StG_FEM_MultiGrid_Finalise( void ) {
+Bool StgFEM_MultiGrid_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 
 	return True;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_MultiGrid_Finalise_h__
-#define __StG_FEM_MultiGrid_Finalise_h__
+#ifndef __StgFEM_MultiGrid_Finalise_h__
+#define __StgFEM_MultiGrid_Finalise_h__
 	
-	Bool StG_FEM_MultiGrid_Finalise( void );
+	Bool StgFEM_MultiGrid_Finalise( void );
 	
-#endif /* __StG_FEM_MultiGrid_Finalise_h__ */
+#endif /* __StgFEM_MultiGrid_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,16 +41,16 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "Init.h"
 
 #include "MultiGrid.h"
 
 #include <stdio.h>
 
-Bool StG_FEM_MultiGrid_Init( int* argc, char** argv[] ) {
+Bool StgFEM_MultiGrid_Init( int* argc, char** argv[] ) {
 	int tmp;
 	
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_MultiGrid_Init_h__
-#define __StG_FEM_MultiGrid_Init_h__
+#ifndef __StgFEM_MultiGrid_Init_h__
+#define __StgFEM_MultiGrid_Init_h__
 	
-	Bool StG_FEM_MultiGrid_Init( int* argc, char** argv[] );
+	Bool StgFEM_MultiGrid_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_MultiGrid_Init_h__ */
+#endif /* __StgFEM_MultiGrid_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,9 +47,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include "units.h"
 #include "types.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_plugins_MultiGrid_MGCoarsener_h__
-#define __StG_FEM_plugins_MultiGrid_MGCoarsener_h__
+#ifndef __StgFEM_plugins_MultiGrid_MGCoarsener_h__
+#define __StgFEM_plugins_MultiGrid_MGCoarsener_h__
 	
 
 	/* Textual name of this class */
@@ -130,4 +130,4 @@
 	void _MGCoarsener_SetMesh( void* coarsener, void* mesh );
 	
 	
-#endif /* __StG_FEM_plugins_MultiGrid_MGCoarsener_h__ */
+#endif /* __StgFEM_plugins_MultiGrid_MGCoarsener_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,9 +47,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include "units.h"
 #include "types.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MGCoarsener_RegCartesian.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_plugins_MultiGrid_MGCoarsener_RegCartesian_h__
-#define __StG_FEM_plugins_MultiGrid_MGCoarsener_RegCartesian_h__
+#ifndef __StgFEM_plugins_MultiGrid_MGCoarsener_RegCartesian_h__
+#define __StgFEM_plugins_MultiGrid_MGCoarsener_RegCartesian_h__
 	
 
 	/* Textual name of this class */
@@ -125,4 +125,4 @@
 	void _MGCoarsener_RegCartesian_Coarsen( void* coarsener, unsigned level, MGMapping* dstMap );
 	
 	
-#endif /* __StG_FEM_plugins_MultiGrid_MGCoarsener_RegCartesian_h__ */
+#endif /* __StgFEM_plugins_MultiGrid_MGCoarsener_RegCartesian_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MultiGrid.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MultiGrid.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/MultiGrid.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_MultiGrid_h__
-#define __StG_FEM_MultiGrid_h__
+#ifndef __StgFEM_MultiGrid_h__
+#define __StgFEM_MultiGrid_h__
 	
 	
 	#include "units.h"
@@ -65,4 +65,4 @@
 	#include "Finalise.h"
 	
 	
-#endif /* __StG_FEM_MultiGrid_h__ */
+#endif /* __StgFEM_MultiGrid_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,9 +47,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include "units.h"
 #include "types.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/_MultiGrid.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_MultiGrid_MultiGrid_h__
-#define __StG_FEM_MultiGrid_Multigrid_h__
+#ifndef __StgFEM_MultiGrid_MultiGrid_h__
+#define __StgFEM_MultiGrid_Multigrid_h__
 	
 	
 	void MultiGrid_SetContext( MGContext* ctx );
@@ -74,4 +74,4 @@
 	void MultiGrid_DeleteContext( MGContext* ctx );
 	
 
-#endif /* __StG_FEM_MultiGrid_MultiGrid_h__ */
+#endif /* __StgFEM_MultiGrid_MultiGrid_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/shortcuts.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/shortcuts.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/shortcuts.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Discretisation_shortcuts_h__
-#define __StG_FEM_Discretisation_shortcuts_h__
+#ifndef __StgFEM_Discretisation_shortcuts_h__
+#define __StgFEM_Discretisation_shortcuts_h__
 
 
-#endif /* __StG_FEM_Discretisation_shortcuts_h__ */
+#endif /* __StgFEM_Discretisation_shortcuts_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_MultiGrid_types_h__
-#define __StG_FEM_SLE_MultiGrid_types_h__
+#ifndef __StgFEM_SLE_MultiGrid_types_h__
+#define __StgFEM_SLE_MultiGrid_types_h__
 	
 	
 	/* 
@@ -125,4 +125,4 @@
 	typedef struct MGCoarsener_RegCartesian	MGCoarsener_RegCartesian;
 	
 	
-#endif /* __StG_FEM_SLE_MultiGrid_types_h__ */
+#endif /* __StgFEM_SLE_MultiGrid_types_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/units.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/units.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/MultiGrid/src/units.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,9 +47,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_plugins_MultiGrid_units_h__
-#define __StG_FEM_plugins_MultiGrid_units_h__
+#ifndef __StgFEM_plugins_MultiGrid_units_h__
+#define __StgFEM_plugins_MultiGrid_units_h__
 	
 	
 	
-#endif /* __StG_FEM_plugins_MultiGrid_units_h__ */
+#endif /* __StgFEM_plugins_MultiGrid_units_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusion.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusion.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusion.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_h__
-#define __StG_FEM_AdvectionDiffusion_h__
+#ifndef __StgFEM_AdvectionDiffusion_h__
+#define __StgFEM_AdvectionDiffusion_h__
 
 #include "types.h"
 #include "AdvectionDiffusionSLE.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -44,9 +44,9 @@
 
 #include "mpi.h"
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include "types.h"
 #include "AdvectionDiffusionSLE.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/AdvectionDiffusionSLE.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_AdvectionDiffusionSLE_h__
-#define __StG_FEM_AdvectionDiffusion_AdvectionDiffusionSLE_h__
+#ifndef __StgFEM_AdvectionDiffusion_AdvectionDiffusionSLE_h__
+#define __StgFEM_AdvectionDiffusion_AdvectionDiffusionSLE_h__
 
 	extern const Type AdvectionDiffusionSLE_Type;
 	

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,15 +41,15 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Finalise.h"
 
 #include <stdio.h>
 
-Bool StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise( void ) {
+Bool StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	return True;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise_h__
-#define __StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise_h__
+#define __StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise( void );
+	Bool StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise( void );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,26 +41,26 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Init.h"
 #include "AdvectionDiffusion.h"
 
 #include <stdio.h>
 
-Stream* StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Debug = NULL;
+Stream* StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Debug = NULL;
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( int* argc, char** argv[] ) {
 	Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
 
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	/* initialise this level's streams */
-	StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Debug = Stream_RegisterChild( StG_FEM_SLE_Debug,
+	StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Debug = Stream_RegisterChild( StgFEM_SLE_Debug,
 		"ProvidedSystems_AdvectionDiffusion" );
 
 	Stg_ComponentRegister_Add( componentRegister, AdvectionDiffusionSLE_Type, "0", _AdvectionDiffusionSLE_DefaultNew );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init_h__
-#define __StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init_h__
+#define __StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( int* argc, char** argv[] );
+	Bool StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,9 +42,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include <StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h>
-#include <StG_FEM/SLE/SystemSetup/SystemSetup.h>
+#include "StgFEM/Discretisation/Discretisation.h"
+#include <StgFEM/SLE/LinearAlgebra/LinearAlgebra.h>
+#include <StgFEM/SLE/SystemSetup/SystemSetup.h>
 
 #include "types.h"
 #include "LumpedMassMatrixForceTerm.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/LumpedMassMatrixForceTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_LumpedMassMatrixForceTerm_h__
-#define __StG_FEM_LumpedMassMatrixForceTerm_h__
+#ifndef __StgFEM_LumpedMassMatrixForceTerm_h__
+#define __StgFEM_LumpedMassMatrixForceTerm_h__
 
 	/** Textual name of this class */
 	extern const Type LumpedMassMatrixForceTerm_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include <StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h>
-#include <StG_FEM/SLE/SystemSetup/SystemSetup.h>
+#include "StgFEM/Discretisation/Discretisation.h"
+#include <StgFEM/SLE/LinearAlgebra/LinearAlgebra.h>
+#include <StgFEM/SLE/SystemSetup/SystemSetup.h>
 
 #include "types.h"
 #include "AdvectionDiffusionSLE.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/MassMatrix_Assembly.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_MassMatrix_Assembly_h__
-#define __StG_FEM_AdvectionDiffusion_MassMatrix_Assembly_h__
+#ifndef __StgFEM_AdvectionDiffusion_MassMatrix_Assembly_h__
+#define __StgFEM_AdvectionDiffusion_MassMatrix_Assembly_h__
 	
 	void MassMatrix_Assembly_Lumped( void* forceTerm, ForceVector* forceVector ,Element_LocalIndex lElement_I, double* elForceVector ) ;
 	void MassMatrix_Assembly_Lumped_Box( void* forceTerm, ForceVector* forceVector ,Element_LocalIndex lElement_I, double* elForceVector ) ;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h>
-#include <StG_FEM/SLE/SystemSetup/SystemSetup.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/LinearAlgebra/LinearAlgebra.h>
+#include <StgFEM/SLE/SystemSetup/SystemSetup.h>
 
 #include "types.h"
 #include "AdvectionDiffusionSLE.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Multicorrector.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_Multicorrector_h__
-#define __StG_FEM_AdvectionDiffusion_Multicorrector_h__
+#ifndef __StgFEM_AdvectionDiffusion_Multicorrector_h__
+#define __StgFEM_AdvectionDiffusion_Multicorrector_h__
 	
 	/** Textual name of this class */
 	extern const Type AdvDiffMulticorrector_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,9 +42,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h>
-#include <StG_FEM/SLE/SystemSetup/SystemSetup.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/LinearAlgebra/LinearAlgebra.h>
+#include <StgFEM/SLE/SystemSetup/SystemSetup.h>
 
 #include "types.h"
 #include "AdvectionDiffusionSLE.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Residual.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_Residual_h__
-#define __StG_FEM_AdvectionDiffusion_Residual_h__
+#ifndef __StgFEM_AdvectionDiffusion_Residual_h__
+#define __StgFEM_AdvectionDiffusion_Residual_h__
 
 	typedef double (AdvDiffResidualForceTerm_UpwindParamFunction)( void* residual, double pecletNumber );
 	

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,9 +42,9 @@
 #include <mpi.h>
 #include <StGermain/StGermain.h>
 
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include "types.h"
 #include "AdvectionDiffusionSLE.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/ShapeFunctions.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_ShapeFunctions_h__
-#define __StG_FEM_AdvectionDiffusion_ShapeFunctions_h__
+#ifndef __StgFEM_AdvectionDiffusion_ShapeFunctions_h__
+#define __StgFEM_AdvectionDiffusion_ShapeFunctions_h__
 
 double** AdvDiffResidualForceTerm_BuildSUPGShapeFunctions( AdvDiffResidualForceTerm* residual, AdvectionDiffusionSLE* sle, Swarm* swarm, Element_LocalIndex lElement_I, Dimension_Index dim ) ;
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,9 +40,9 @@
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 #include "mpi.h"
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Timestep.h"
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/Timestep.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -39,8 +39,8 @@
 
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_Timestep_h__
-#define __StG_FEM_AdvectionDiffusion_Timestep_h__
+#ifndef __StgFEM_AdvectionDiffusion_Timestep_h__
+#define __StgFEM_AdvectionDiffusion_Timestep_h__
 
 double AdvectionDiffusionSLE_CalculateDt( void* advectionDiffusionSLE, FiniteElementContext* context ) ;
 double AdvectionDiffusionSLE_DiffusiveTimestep( void* _advectionDiffusionSolver ) ;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,9 +43,9 @@
 
 #include "mpi.h"
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include "types.h"
 #include "AdvectionDiffusionSLE.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/UpwindParameter.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_AdvectionDiffusion_UpwindParameter_h__
-#define __StG_FEM_AdvectionDiffusion_UpwindParameter_h__
+#ifndef __StgFEM_AdvectionDiffusion_UpwindParameter_h__
+#define __StgFEM_AdvectionDiffusion_UpwindParameter_h__
 
 	double AdvDiffResidualForceTerm_UpwindDiffusivity( AdvDiffResidualForceTerm* self, Element_LocalIndex lElement_I, double diffusivity, Dimension_Index dim );
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -37,8 +37,8 @@
 **
 */
 
-#ifndef __StG_FEM_AdvectionDiffusion_types_h__
-#define __StG_FEM_AdvectionDiffusion_types_h__
+#ifndef __StgFEM_AdvectionDiffusion_types_h__
+#define __StgFEM_AdvectionDiffusion_types_h__
 
 	/* Classes */
 	typedef	struct AdvectionDiffusionSLE         AdvectionDiffusionSLE; 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testLumpedMassMatrix.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,10 +41,10 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
-#include "StG_FEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -106,10 +106,10 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
-	StG_FEM_SLE_LinearAlgebra_Init( &argc, &argv );
-	StG_FEM_SLE_SystemSetup_Init( &argc, &argv );
-	StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
+	StgFEM_SLE_LinearAlgebra_Init( &argc, &argv );
+	StgFEM_SLE_SystemSetup_Init( &argc, &argv );
+	StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -155,8 +155,8 @@
 	context = FiniteElementContext_New( "context", 0,0, MPI_COMM_WORLD, dictionary );
 	dim = context->dim = Dictionary_GetUnsignedInt_WithDefault( dictionary, "dim", 2 );
 	Journal_Enable_TypedStream( DebugStream_Type, True );
-	Stream_SetLevelBranch( StG_FEM_Debug, 3 );
-	Stream_EnableBranch( StG_FEM_Debug, True );
+	Stream_SetLevelBranch( StgFEM_Debug, 3 );
+	Stream_EnableBranch( StgFEM_Debug, True );
 	
 	/* create the layout, dof and mesh to use */
 	nTopology = (Topology*)IJK6Topology_New( "IJK6Topology", dictionary );
@@ -263,7 +263,7 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testSUPGShapeFunc.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,10 +41,10 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
-#include "StG_FEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -138,9 +138,9 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
-	StG_FEM_SLE_SystemSetup_Init( &argc, &argv );
-	StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
+	StgFEM_SLE_SystemSetup_Init( &argc, &argv );
+	StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
@@ -353,8 +353,8 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_SLE_SystemSetup_Finalise();
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_SLE_SystemSetup_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testUpwindXi.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testUpwindXi.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/tests/testUpwindXi.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,10 +42,10 @@
 #include <mpi.h>
 #include <StGermain/StGermain.h>
 
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
-#include "StG_FEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
 
 int main( int argc, char* argv[] ) {
 	Stream* dataStream;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_Energy_h__
-#define __StG_FEM_SLE_ProvidedSystems_Energy_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_Energy_h__
+#define __StgFEM_SLE_ProvidedSystems_Energy_h__
 	
 	#include "types.h"
 		
@@ -61,4 +61,4 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_SLE_ProvidedSystems_Energy_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_Energy_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Energy_SLE.h"
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Energy_SLE_Solver.h"
 
@@ -189,10 +189,10 @@
 	StiffnessMatrix*	stiffMat = (StiffnessMatrix*)sle->stiffnessMatrices->data[0];
 
 	Journal_DPrintf( self->debug, "In %s()\n", __func__ );
-	Stream_IndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_IndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
 	Journal_DPrintf( self->debug, "building a standard L.A. solver for the \"%s\" matrix.\n", stiffMat->name );
 	self->matrixSolver = MatrixSolver_Build( sle->comm, stiffMat->matrix );
-	Stream_UnIndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_UnIndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
 
 	Vector_Duplicate( ((ForceVector**)sle->forceVectors->data)[0]->vector, &self->residual );
 }
@@ -228,11 +228,11 @@
 	StiffnessMatrix*	stiffMat = (StiffnessMatrix*)sle->stiffnessMatrices->data[0];
 	
 	Journal_DPrintf( self->debug, "In %s()\n", __func__ );
-	Stream_IndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_IndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
 	
 	Journal_DPrintf( self->debug, "Initialising the L.A. solver for the \"%s\" matrix.\n", stiffMat->name );
 	MatrixSolver_Setup( self->matrixSolver, stiffMat->matrix );
-	Stream_UnIndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_UnIndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
 	
 	if( !sle->mgEnabled ) {
 		if( self->maxIterations > 0 ) {
@@ -249,17 +249,17 @@
 
 	
 	Journal_DPrintf( self->debug, "In %s - for standard SLE solver\n", __func__ );
-	Stream_IndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_IndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
 	
 	if ( (sle->stiffnessMatrices->count > 1 ) ||
 		(sle->forceVectors->count > 1 ) )
 	{
-		Stream* warning = Stream_RegisterChild( StG_FEM_Warning, self->type );
+		Stream* warning = Stream_RegisterChild( StgFEM_Warning, self->type );
 		Journal_Printf( warning, "Warning: Energy solver unable to solve more that one matrix/vector.\n" );
 	}
 
 	if ( sle->solutionVectors->count > 1 ) {
-		Stream* warning = Stream_RegisterChild( StG_FEM_Warning, self->type );
+		Stream* warning = Stream_RegisterChild( StgFEM_Warning, self->type );
 		Journal_Printf( warning, "Warning: More than 1 solution vector provided to standard sle. Ignoring second and subsequent"
 			" solution vectors.\n" );
 	}
@@ -283,7 +283,7 @@
 								   ((ForceVector*) sle->forceVectors->data[0])->vector );
 	}
 	Journal_DPrintf( self->debug, "Solved after %u iterations.\n", iterations );
-	Stream_UnIndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_UnIndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
 	
 	/* calculate the residual */
 	/* TODO: need to make this optional */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Energy_SLE_Solver.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -51,8 +51,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_Energy_Energy_SLE_Solver_h__
-#define __StG_FEM_SLE_ProvidedSystems_Energy_Energy_SLE_Solver_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_Energy_Energy_SLE_Solver_h__
+#define __StgFEM_SLE_ProvidedSystems_Energy_Energy_SLE_Solver_h__
 
 	/** Textual name of this class */
 	extern const Type Energy_SLE_Solver_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,18 +41,18 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Finalise.h"
 
 #include <stdio.h>
 
-Bool StG_FEM_SLE_ProvidedSystems_Energy_Finalise( void ) {
+Bool StgFEM_SLE_ProvidedSystems_Energy_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	Stream_IndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
-	Stream_UnIndentBranch( StG_FEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_IndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
+	Stream_UnIndentBranch( StgFEM_SLE_ProvidedSystems_Energy_Debug );
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_Energy_Finalise_h__
-#define __StG_FEM_SLE_ProvidedSystems_Energy_Finalise_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_Energy_Finalise_h__
+#define __StgFEM_SLE_ProvidedSystems_Energy_Finalise_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_Energy_Finalise( void );
+	Bool StgFEM_SLE_ProvidedSystems_Energy_Finalise( void );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_Energy_Finalise_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_Energy_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Init.h"
 
@@ -51,16 +51,16 @@
 #include "Energy_SLE.h"
 #include <stdio.h>
 
-Stream* StG_FEM_SLE_ProvidedSystems_Energy_Debug = NULL;
+Stream* StgFEM_SLE_ProvidedSystems_Energy_Debug = NULL;
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_SLE_ProvidedSystems_Energy_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_ProvidedSystems_Energy_Init( int* argc, char** argv[] ) {
 
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	/* initialise this level's streams */
-	StG_FEM_SLE_ProvidedSystems_Energy_Debug = Stream_RegisterChild( StG_FEM_SLE_Debug, "ProvidedSystems_Energy" );
+	StgFEM_SLE_ProvidedSystems_Energy_Debug = Stream_RegisterChild( StgFEM_SLE_Debug, "ProvidedSystems_Energy" );
 	
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Energy_SLE_Solver_Type , "0", Energy_SLE_Solver_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Energy_SLE_Type , "0", _Energy_SLE_DefaultNew );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 **	Initialises the FE library ready for use.
 **
 ** Assumptions:
-**	The StG_FEM_SLE_ProvidedSystems_Energy_Init() function will be run before any other function in the FE library.
+**	The StgFEM_SLE_ProvidedSystems_Energy_Init() function will be run before any other function in the FE library.
 **
 ** Comments:
 **	None as yet.
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_Energy_Init_h__
-#define __StG_FEM_SLE_ProvidedSystems_Energy_Init_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_Energy_Init_h__
+#define __StgFEM_SLE_ProvidedSystems_Energy_Init_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_Energy_Init( int* argc, char** argv[] );
+	Bool StgFEM_SLE_ProvidedSystems_Energy_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_Energy_Init_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_Energy_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/Energy/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,14 +48,14 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_Energy_types_h__
-#define __StG_FEM_SLE_ProvidedSystems_Energy_types_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_Energy_types_h__
+#define __StgFEM_SLE_ProvidedSystems_Energy_types_h__
 	
 	/* FE types/classes */
 	typedef struct Energy_SLE_Solver  Energy_SLE_Solver;
 	typedef struct Energy_SLE         Energy_SLE;
 
-	/* output streams: initialised in StG_FEM_SLE_ProvidedSystems_Energy_Init() */
-	extern Stream* StG_FEM_SLE_ProvidedSystems_Energy_Debug;
+	/* output streams: initialised in StgFEM_SLE_ProvidedSystems_Energy_Init() */
+	extern Stream* StgFEM_SLE_ProvidedSystems_Energy_Debug;
 
-#endif /* __StG_FEM_SLE_ProvidedSystems_Energy_types_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_Energy_types_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,18 +41,18 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Finalise.h"
 
 #include <stdio.h>
 
-Bool StG_FEM_SLE_ProvidedSystems_StokesFlow_Finalise( void ) {
+Bool StgFEM_SLE_ProvidedSystems_StokesFlow_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	Stream_IndentBranch( StG_FEM_SLE_ProvidedSystems_StokesFlow_Debug );
-	Stream_UnIndentBranch( StG_FEM_SLE_ProvidedSystems_StokesFlow_Debug );
+	Stream_IndentBranch( StgFEM_SLE_ProvidedSystems_StokesFlow_Debug );
+	Stream_UnIndentBranch( StgFEM_SLE_ProvidedSystems_StokesFlow_Debug );
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_StokesFlow_Finalise_h__
-#define __StG_FEM_SLE_ProvidedSystems_StokesFlow_Finalise_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_StokesFlow_Finalise_h__
+#define __StgFEM_SLE_ProvidedSystems_StokesFlow_Finalise_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_StokesFlow_Finalise( void );
+	Bool StgFEM_SLE_ProvidedSystems_StokesFlow_Finalise( void );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_StokesFlow_Finalise_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_StokesFlow_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,24 +41,24 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include "StokesFlow.h"
 
 #include <stdio.h>
 
-Stream* StG_FEM_SLE_ProvidedSystems_StokesFlow_Debug = NULL;
+Stream* StgFEM_SLE_ProvidedSystems_StokesFlow_Debug = NULL;
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_SLE_ProvidedSystems_StokesFlow_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_ProvidedSystems_StokesFlow_Init( int* argc, char** argv[] ) {
 
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	/* initialise this level's streams */
-	StG_FEM_SLE_ProvidedSystems_StokesFlow_Debug = Stream_RegisterChild( StG_FEM_SLE_Debug,
+	StgFEM_SLE_ProvidedSystems_StokesFlow_Debug = Stream_RegisterChild( StgFEM_SLE_Debug,
 		"ProvidedSystems_StokesFlow" );
 
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), Stokes_SLE_Type , "0", _Stokes_SLE_DefaultNew );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_StokesFlow_Init_h__
-#define __StG_FEM_SLE_ProvidedSystems_StokesFlow_Init_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_StokesFlow_Init_h__
+#define __StgFEM_SLE_ProvidedSystems_StokesFlow_Init_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_StokesFlow_Init( int* argc, char** argv[] );
+	Bool StgFEM_SLE_ProvidedSystems_StokesFlow_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_StokesFlow_Init_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_StokesFlow_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/StokesFlow.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/StokesFlow.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/StokesFlow.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_StokesFlow_h__
-#define __StG_FEM_SLE_ProvidedSystems_StokesFlow_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_StokesFlow_h__
+#define __StgFEM_SLE_ProvidedSystems_StokesFlow_h__
 	
 	#include "types.h"
 		
@@ -64,4 +64,4 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_SLE_ProvidedSystems_StokesFlow_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_StokesFlow_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Stokes_SLE.h"
 #include "UpdateDt.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_PenaltySolver.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Stokes_SLE_PenaltySolver.h"
 
@@ -156,9 +156,9 @@
 		
 	Journal_DPrintf( self->debug, "In: %s \n", __func__);
 
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }       
 
 
@@ -183,8 +183,8 @@
 	Stokes_SLE_PenaltySolver*	self  = (Stokes_SLE_PenaltySolver*)solver;
 
  	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _Stokes_SLE_PenaltySolver_Construct( void* solver, Stg_ComponentFactory* cf, void* data ) {
@@ -214,8 +214,8 @@
 	Stokes_SLE_PenaltySolver* self = (Stokes_SLE_PenaltySolver*) solver;
 	
  	Journal_DPrintf( self->debug, "In %s:\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/Stokes_SLE_UzawaSolver.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Stokes_SLE_UzawaSolver.h"
 
@@ -175,7 +175,7 @@
 		
 	Journal_DPrintf( self->debug, "In: %s \n", __func__);
 
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	Journal_DPrintfL( self->debug, 2, "Deleting Solver contexts.\n" );
 	MatrixSolver_Destroy( self->velSolver );
 	if ( self->pcSolver )
@@ -187,7 +187,7 @@
 	Vector_Destroy( self->sVec );
 	Vector_Destroy( self->fTempVec );
 	Vector_Destroy( self->vStarVec );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }       
 
 
@@ -228,7 +228,7 @@
 	Stokes_SLE*             sle   = (Stokes_SLE*)stokesSLE;
 
  	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
  	Journal_DPrintfL( self->debug, 2, "building a standard solver for the velocity system.\n" );
 	self->velSolver = MatrixSolver_Build( sle->comm, sle->kStiffMat->matrix );
@@ -251,7 +251,7 @@
 	
 	Vector_Duplicate( sle->fForceVec->vector, &self->fTempVec );
 	Vector_Duplicate( sle->fForceVec->vector, &self->vStarVec );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _Stokes_SLE_UzawaSolver_Construct( void* solver, Stg_ComponentFactory* cf, void* data ) {
@@ -308,7 +308,7 @@
 	Stokes_SLE*             sle  = (Stokes_SLE*)             stokesSLE;
 	
  	Journal_DPrintf( self->debug, "In %s:\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Journal_DPrintfL( self->debug, 1, "Setting up MatrixSolver for the velocity eqn.\n" );
 	MatrixSolver_Setup( self->velSolver, sle->kStiffMat->matrix );
@@ -329,7 +329,7 @@
 		MultiGrid_UpdateMatrixSolver( sle->mgHandles[0], self->velSolver, (SLE_Solver*)self );
 	}
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -426,7 +426,7 @@
  	Journal_DPrintf( self->debug, "In %s:\n", __func__ );
 	Journal_PrintfL( self->debug, 2, "Conjugate Gradient Uzawa solver with:\n");
 	
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	Journal_PrintfL( self->debug, 2, "Compressibility %s\n", (sle->cStiffMat)? "on" : "off");
 	Journal_PrintfL( self->debug, 2, "Preconditioning %s\n", (pcSolver)? "on" : "off" );   
@@ -578,7 +578,7 @@
 	iteration_I = 0;
 	do{	
 		Journal_DPrintfL( self->debug, 2, "Beginning solve '%u'.\n", iteration_I );
-		Stream_IndentBranch( StG_FEM_Debug );
+		Stream_IndentBranch( StgFEM_Debug );
 		
 		/* STEP 4.1: Preconditioner
 		//	Solve:
@@ -684,7 +684,7 @@
 		absResidual = Vector_L2_Norm( rVec ) * qReciprocalGlobalProblemScale;  
 		relResidual = absResidual / uzawaRhsScale;
 		
-		Stream_UnIndentBranch( StG_FEM_Debug );
+		Stream_UnIndentBranch( StgFEM_Debug );
 		
 		if( iteration_I % outputInterval == 0 ) {
 			Journal_PrintfL( self->info, 2, "\tLoop = %u, absResidual = %.8e, relResidual = %.8e\n", 
@@ -777,7 +777,7 @@
 		Vector_View( qVec, self->debug );
 	}
 	#endif
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 #include "types.h"
 #include "Stokes_SLE.h"
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UpdateDt.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_StokesFlow_UpdateDt_h__
-#define __StG_FEM_SLE_ProvidedSystems_StokesFlow_UpdateDt_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_StokesFlow_UpdateDt_h__
+#define __StgFEM_SLE_ProvidedSystems_StokesFlow_UpdateDt_h__
 
 	double Stokes_SLE_UpdateDt( Stokes_SLE* self, FiniteElementContext* context ) ;
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,9 +42,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include <StG_FEM/SLE/SystemSetup/SystemSetup.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include <StgFEM/SLE/SystemSetup/SystemSetup.h>
 
 #include "types.h"
 #include "UzawaPreconditionerTerm.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/UzawaPreconditionerTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,8 +38,8 @@
 */
 
 
-#ifndef __StG_FEM_UzawaPreconditionerTerm_h__
-#define __StG_FEM_UzawaPreconditionerTerm_h__
+#ifndef __StgFEM_UzawaPreconditionerTerm_h__
+#define __StgFEM_UzawaPreconditionerTerm_h__
 
 	/** Textual name of this class */
 	extern const Type UzawaPreconditionerTerm_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/StokesFlow/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_StokesFlow_types_h__
-#define __StG_FEM_SLE_ProvidedSystems_StokesFlow_types_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_StokesFlow_types_h__
+#define __StgFEM_SLE_ProvidedSystems_StokesFlow_types_h__
 	
 	/* types/classes */
 	typedef struct Stokes_SLE                   Stokes_SLE;
@@ -58,6 +58,6 @@
 	typedef struct UzawaPreconditionerTerm      UzawaPreconditionerTerm;
 
 	/* output streams: initialised in Init() */
-	extern Stream* StG_FEM_SLE_ProvidedSystems_StokesFlow_Debug;
+	extern Stream* StgFEM_SLE_ProvidedSystems_StokesFlow_Debug;
 
-#endif /* __StG_FEM_SLE_ProvidedSystems_StokesFlow_types_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_StokesFlow_types_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,22 +41,22 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
-#include "StG_FEM/SLE/ProvidedSystems/Energy/Energy.h"
-#include "StG_FEM/SLE/ProvidedSystems/StokesFlow/StokesFlow.h"
-#include "StG_FEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/SLE/ProvidedSystems/Energy/Energy.h"
+#include "StgFEM/SLE/ProvidedSystems/StokesFlow/StokesFlow.h"
+#include "StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
 #include "Finalise.h"
 
 #include <stdio.h>
 
-Bool StG_FEM_SLE_ProvidedSystems_Finalise( void ) {
+Bool StgFEM_SLE_ProvidedSystems_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	StG_FEM_SLE_ProvidedSystems_Energy_Finalise();
-	StG_FEM_SLE_ProvidedSystems_StokesFlow_Finalise();
-	StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise();
+	StgFEM_SLE_ProvidedSystems_Energy_Finalise();
+	StgFEM_SLE_ProvidedSystems_StokesFlow_Finalise();
+	StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Finalise();
 
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_Finalise_h__
-#define __StG_FEM_SLE_ProvidedSystems_Finalise_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_Finalise_h__
+#define __StgFEM_SLE_ProvidedSystems_Finalise_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_Finalise( void );
+	Bool StgFEM_SLE_ProvidedSystems_Finalise( void );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_Finalise_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,24 +41,24 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
-#include "StG_FEM/SLE/ProvidedSystems/Energy/Energy.h"
-#include "StG_FEM/SLE/ProvidedSystems/StokesFlow/StokesFlow.h"
-#include "StG_FEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/SLE/ProvidedSystems/Energy/Energy.h"
+#include "StgFEM/SLE/ProvidedSystems/StokesFlow/StokesFlow.h"
+#include "StgFEM/SLE/ProvidedSystems/AdvectionDiffusion/AdvectionDiffusion.h"
 #include "Init.h"
 
 #include <stdio.h>
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_SLE_ProvidedSystems_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_ProvidedSystems_Init( int* argc, char** argv[] ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	StG_FEM_SLE_ProvidedSystems_Energy_Init( argc, argv );
-	StG_FEM_SLE_ProvidedSystems_StokesFlow_Init( argc, argv );
-	StG_FEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( argc, argv );
+	StgFEM_SLE_ProvidedSystems_Energy_Init( argc, argv );
+	StgFEM_SLE_ProvidedSystems_StokesFlow_Init( argc, argv );
+	StgFEM_SLE_ProvidedSystems_AdvectionDiffusion_Init( argc, argv );
 	
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_Init_h__
-#define __StG_FEM_SLE_ProvidedSystems_Init_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_Init_h__
+#define __StgFEM_SLE_ProvidedSystems_Init_h__
 	
-	Bool StG_FEM_SLE_ProvidedSystems_Init( int* argc, char** argv[] );
+	Bool StgFEM_SLE_ProvidedSystems_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_SLE_ProvidedSystems_Init_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/ProvidedSystems.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/ProvidedSystems.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/ProvidedSystems/src/ProvidedSystems.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_ProvidedSystems_h__
-#define __StG_FEM_SLE_ProvidedSystems_h__
+#ifndef __StgFEM_SLE_ProvidedSystems_h__
+#define __StgFEM_SLE_ProvidedSystems_h__
 	
 	#include "Energy/Energy.h"
 	#include "StokesFlow/StokesFlow.h"
@@ -60,4 +60,4 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_SLE_ProvidedSystems_h__ */
+#endif /* __StgFEM_SLE_ProvidedSystems_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -174,7 +174,7 @@
 	Stream*  errorStream = Journal_Register( Error_Type, self->type );
 
 	/* Set up stream preferences */
-	Journal_Enable_NamedStream( InfoStream_Type, "StG_FEM_VerboseConfig", False );
+	Journal_Enable_NamedStream( InfoStream_Type, "StgFEM_VerboseConfig", False );
 
 	PluginsManager_AddDirectory( self->plugins, "StgFEM", LIB_DIR );
 		
@@ -182,7 +182,7 @@
 	/* register this current stream (the context) as a child of the FE stream */
 	/* TODO: Want to be able to recombine this with the Abs context's debug stream at some stage */
 	self->isConstructed = True;
-	self->debug = Stream_RegisterChild( StG_FEM_Debug, FiniteElementContext_Type );
+	self->debug = Stream_RegisterChild( StgFEM_Debug, FiniteElementContext_Type );
 	
 	self->dt = 0.0f;
 	self->prevTimestepDt = 0.0;
@@ -258,13 +258,13 @@
 	
 	Journal_DPrintf( self->debug, "In: %s()\n", __func__ );
 
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	Journal_DPrintfL( self->debug, 2, "Deleting the element type register (and hence all element types).\n" );
 	Stg_Class_Delete( self->elementType_Register );
 	Journal_DPrintfL( self->debug, 2, "Deleting all SLEs and the SLE list.\n" );
 	Stg_ObjectList_DeleteAllObjects( self->slEquations ); 
 	Stg_Class_Delete( self->slEquations ); 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 
 	/* Stg_Class_Delete parent */
 	_DiscretisationContext_Delete( self );
@@ -340,7 +340,7 @@
 	FiniteElementContext* self = (FiniteElementContext*)context;
 	SystemLinearEquations_Index sle_I;
 	
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	Journal_DPrintf( self->debug, "In: %s()\n", __func__ );
 
 	/* build all the systems of linear equations */
@@ -357,7 +357,7 @@
 	*/
 	Variable_Register_BuildAll( self->variable_Register );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -365,7 +365,7 @@
 	FiniteElementContext* self = (FiniteElementContext*)context;
 	SystemLinearEquations_Index sle_I;
 	
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	Journal_DPrintf( self->debug, "In: %s()\n", __func__ );
 
 	/* initialise all the systems of linear equations */
@@ -373,7 +373,7 @@
 		Initialise( self->slEquations->data[sle_I], self, False );
 	}
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -382,7 +382,7 @@
 	SystemLinearEquations_Index sle_I;
 	
 	Journal_DPrintf( self->debug, "In: %s()\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* solve all the systems of linear equations */
 	for ( sle_I = 0; sle_I < self->slEquations->count; sle_I++ ) {
@@ -394,18 +394,18 @@
 		Execute( currentSLE, self, True );
 	}
 	
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _FiniteElementContext_PostSolve( void* context ) {
 	FiniteElementContext* self = (FiniteElementContext*)context;
 
 	Journal_DPrintf( self->debug, "In: %s()\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	FiniteElementContext_CalcNewDt( self ) ;
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 double _FiniteElementContext_GetDt( void* context ) {

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -51,8 +51,8 @@
 *
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_Context_h__
-#define __StG_FEM_SLE_SystemSetup_Context_h__
+#ifndef __StgFEM_SLE_SystemSetup_Context_h__
+#define __StgFEM_SLE_SystemSetup_Context_h__
 	
 	/* Textual name of this class */
 	extern const Type FiniteElementContext_Type;
@@ -185,4 +185,4 @@
 	gauss integration swarms may need to be saved and reloaded) */
 	void _FiniteElementContext_SaveSwarms( void* context );
 
-#endif /* __StG_FEM_SLE_SystemSetup_Context_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_Context_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/EntryPoint.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/EntryPoint.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/EntryPoint.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -50,10 +50,10 @@
 
 #include <stdio.h>
 
-Bool StG_FEM_SLE_SystemSetup_Finalise( void ) {
+Bool StgFEM_SLE_SystemSetup_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	Stream_IndentBranch( StG_FEM_Debug );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -51,9 +51,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_Finalise_h__
-#define __StG_FEM_SLE_SystemSetup_Finalise_h__
+#ifndef __StgFEM_SLE_SystemSetup_Finalise_h__
+#define __StgFEM_SLE_SystemSetup_Finalise_h__
 	
-	Bool StG_FEM_SLE_SystemSetup_Finalise( void );
+	Bool StgFEM_SLE_SystemSetup_Finalise( void );
 	
-#endif /* __StG_FEM_SLE_SystemSetup_Finalise_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 
 #include "units.h"
 #include "types.h"
@@ -123,7 +123,7 @@
 	
 	self->isConstructed    = True;
 
-	self->debug            = Stream_RegisterChild( StG_FEM_SLE_SystemSetup_Debug, self->type );
+	self->debug            = Stream_RegisterChild( StgFEM_SLE_SystemSetup_Debug, self->type );
 	self->extraInfo        = extraInfo;	
 	self->integrationSwarm = integrationSwarm;	
 
@@ -228,7 +228,7 @@
 	ForceTerm* self = (ForceTerm*)forceTerm;
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	/* ensure integrationSwarm is built */
 	Stg_Component_Build( self->integrationSwarm, data, False );
@@ -236,7 +236,7 @@
 	if ( self->extraInfo ) 
 		Stg_Component_Build( self->extraInfo, data, False );
 		
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -244,13 +244,13 @@
 	ForceTerm* self = (ForceTerm*)forceTerm;
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Stg_Component_Initialise( self->integrationSwarm, data, False );
 	if ( self->extraInfo ) 
 		Stg_Component_Initialise( self->extraInfo, data, False );
 	
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _ForceTerm_Execute( void* forceTerm, void* data ) {

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_ForceTerm_h__
-#define __StG_FEM_SLE_SystemSetup_ForceTerm_h__
+#ifndef __StgFEM_SLE_SystemSetup_ForceTerm_h__
+#define __StgFEM_SLE_SystemSetup_ForceTerm_h__
 
 	typedef void (ForceTerm_AssembleElementFunction)	(
 			void*                             forceTerm, 
@@ -139,4 +139,4 @@
 
 	void ForceTerm_SetAssembleElementFunction( void* forceTerm, ForceTerm_AssembleElementFunction* assembleElementFunction ) ;
 
-#endif /* __StG_FEM_SLE_SystemSetup_ForceTerm_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_ForceTerm_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -172,7 +172,7 @@
 	self->entryPoint_Register        = entryPoint_Register;
 	
 	/* Create Stream */
-	self->debug = Stream_RegisterChild( StG_FEM_SLE_SystemSetup_Debug, self->type );
+	self->debug = Stream_RegisterChild( StgFEM_SLE_SystemSetup_Debug, self->type );
 	
 	/* Create Entry Point for assembleForceVector */
 	Stg_asprintf( &self->_assembleForceVectorEPName, "%s-%s", self->name, ForceVector_assembleForceVectorStr );
@@ -292,7 +292,7 @@
 	ForceVector* self = (ForceVector*)forceVector;
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	/* ensure feVariable is built */
 	if( self->feVariable ) {
 		Stg_Component_Build( self->feVariable, data, False );
@@ -304,7 +304,7 @@
 	/* Allocate the vector */
 	Journal_DPrintfL( self->debug, 2, "Allocating the L.A. Force Vector with %d local entries.\n", self->localSize );
 	self->vector = Vector_New_SpecifyLocalSize( self->comm, self->localSize );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -312,12 +312,12 @@
 	ForceVector* self = (ForceVector*)forceVector;
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	/* ensure feVariable is initialised */
 	if( self->feVariable )
 		Stg_Component_Initialise( self->feVariable, data, False );
 	
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _ForceVector_Execute( void* forceVector, void* data ) {
@@ -387,11 +387,11 @@
 
 	Journal_DPrintf( self->debug, "In %s - for vector \"%s\"\n", __func__, self->name );
 	
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	if ( Stg_ObjectList_Count( self->forceTermList ) == 0 ) {
 		Journal_DPrintf( self->debug, "No ForceTerms registered - returning.\n" );
-		Stream_UnIndentBranch( StG_FEM_Debug );
+		Stream_UnIndentBranch( StgFEM_Debug );
 		return;
 	}
 
@@ -467,7 +467,7 @@
 	}
 	#endif
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 		
 void ForceVector_AssembleElement( void* forceVector, Element_LocalIndex element_lI, double* elForceVecToAdd ) {

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/ForceVector.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_ForceVector_h__
-#define __StG_FEM_SLE_SystemSetup_ForceVector_h__
+#ifndef __StgFEM_SLE_SystemSetup_ForceVector_h__
+#define __StgFEM_SLE_SystemSetup_ForceVector_h__
 	
 	
 	/* Textual name of this class */
@@ -139,4 +139,4 @@
 	void ForceVector_AssembleElement( void* forceVector, Element_LocalIndex element_lI, double* elForceVecToAdd ) ;
 	void ForceVector_AddForceTerm( void* forceVector, ForceTerm* forceTerm ) ;
 
-#endif /* __StG_FEM_SLE_SystemSetup_ForceVector_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_ForceVector_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -58,17 +58,17 @@
 #include "Context.h"
 #include <stdio.h>
 
-Stream* StG_FEM_SLE_Debug = NULL;
-Stream* StG_FEM_SLE_SystemSetup_Debug = NULL;
+Stream* StgFEM_SLE_Debug = NULL;
+Stream* StgFEM_SLE_SystemSetup_Debug = NULL;
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_SLE_SystemSetup_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_SystemSetup_Init( int* argc, char** argv[] ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
 	/* initialise this level's streams */
-	StG_FEM_SLE_Debug = Stream_RegisterChild( StG_FEM_Debug, "SLE" );
-	StG_FEM_SLE_SystemSetup_Debug = Stream_RegisterChild( StG_FEM_SLE_Debug, "SystemSetup" );
+	StgFEM_SLE_Debug = Stream_RegisterChild( StgFEM_Debug, "SLE" );
+	StgFEM_SLE_SystemSetup_Debug = Stream_RegisterChild( StgFEM_SLE_Debug, "SystemSetup" );
 	
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), FiniteElementContext_Type, "0", FiniteElementContext_DefaultNew );
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), ForceVector_Type, "0", _ForceVector_DefaultNew );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_Init_h__
-#define __StG_FEM_SLE_SystemSetup_Init_h__
+#ifndef __StgFEM_SLE_SystemSetup_Init_h__
+#define __StgFEM_SLE_SystemSetup_Init_h__
 	
-	Bool StG_FEM_SLE_SystemSetup_Init( int* argc, char** argv[] );
+	Bool StgFEM_SLE_SystemSetup_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_SLE_SystemSetup_Init_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -94,7 +94,7 @@
 	self->isConstructed = True;
 	self->extensionManager = ExtensionManager_New_OfExistingObject( self->name, self );
 	
-	self->debug         = Stream_RegisterChild( StG_FEM_SLE_SystemSetup_Debug, self->type );
+	self->debug         = Stream_RegisterChild( StgFEM_SLE_SystemSetup_Debug, self->type );
 	self->info          = Journal_MyStream( Info_Type, self );
 	self->maxIterations = 0;
 	
@@ -194,10 +194,10 @@
 
 	Journal_DPrintf( self->debug, "In %s()\n", __func__ );
 
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	SLE_Solver_SolverSetup( self, data );
 	SLE_Solver_Solve( self, data );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _SLE_Solver_Destroy( void* sleSolver, void* data ) {

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SLE_Solver.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 	
-#ifndef __StG_FEM_SLE_SystemSetup_SLE_Solver_h__
-#define __StG_FEM_SLE_SystemSetup_SLE_Solver_h__
+#ifndef __StgFEM_SLE_SystemSetup_SLE_Solver_h__
+#define __StgFEM_SLE_SystemSetup_SLE_Solver_h__
 	
 	/*
 	** Unfortunately, these forward declarations are required for multi-grid.

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,8 +42,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -184,7 +184,7 @@
 	
 	/* SolutionVector info */
 	self->isConstructed = True;
-	self->debug = Stream_RegisterChild( StG_FEM_SLE_SystemSetup_Debug, self->type );
+	self->debug = Stream_RegisterChild( StgFEM_SLE_SystemSetup_Debug, self->type );
 	self->comm = comm;
 	self->feVariable = feVariable;
 }
@@ -194,14 +194,14 @@
 	SolutionVector* self = (SolutionVector*)solutionVector;
 	
 	Journal_DPrintf( self->debug, "In %s - for soln. vector %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	if ( self->vector ) {
 		Vector_Destroy(self->vector);
 	}
 	
 	/* Stg_Class_Delete parent*/
 	_Stg_Component_Delete( self );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -274,7 +274,7 @@
 	SolutionVector* self = (SolutionVector*)solutionVector;
 	
 	Journal_DPrintf( self->debug, "In %s - for \"%s\"\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* ensure variables are built */
 	if( self->feVariable )
@@ -283,7 +283,7 @@
 	/* Allocate the vector */
 	self->vector = Vector_New_SpecifyLocalSize( self->comm, self->feVariable->eqNum->localEqNumsOwnedCount );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -292,13 +292,13 @@
 	DiscretisationContext*   context = (DiscretisationContext*)data;
 	
 	Journal_DPrintf( self->debug, "In %s - for \"%s\"\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	/* ensure variables are initialised */
 	if( self->feVariable ) {
 		Initialise( self->feVariable, 0, False );
 	}
 		
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -340,7 +340,7 @@
 	Index			newReqFromOthersSize;
 	
 	Journal_DPrintf( self->debug, "In %s - for \"%s\"\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	#if DEBUG
 	if ( Stream_IsPrintableLevel( self->debug, 3 ) ) {
@@ -449,7 +449,7 @@
 
 	Vector_Restore( self->vector, &localSolnVecValues );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -484,7 +484,7 @@
 	Dof_EquationNumber   totalRequestedFromMe = 0;
 
 	Journal_DPrintf( self->debug, "In %s - for \"%s\"\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	reqFromMeCounts = Memory_Alloc_Array( Index, nProc, "reqFromMeCounts" );
 	reqFromOthersHandles = Memory_Alloc_Array_Unnamed( MPI_Request*, nProc );
@@ -544,7 +544,7 @@
 		Memory_Free( reqValuesFromMeHandles );
 		Memory_Free( reqValuesFromOthers ); 
 		Memory_Free( reqValuesFromOthersReceived );
-		Stream_UnIndentBranch( StG_FEM_Debug );
+		Stream_UnIndentBranch( StgFEM_Debug );
 		return;
 	}
 
@@ -752,7 +752,7 @@
 	Memory_Free( reqValuesFromOthersHandles );
 	Memory_Free( reqValuesFromMeHandles );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 	return;
 }
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SolutionVector.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_SolutionVector_h__
-#define __StG_FEM_SLE_SystemSetup_SolutionVector_h__
+#ifndef __StgFEM_SLE_SystemSetup_SolutionVector_h__
+#define __StgFEM_SLE_SystemSetup_SolutionVector_h__
 	
 	/* Textual name of this class */
 	extern const Type SolutionVector_Type;
@@ -154,4 +154,4 @@
 	/** Loads the current value at each dof of the feVariable related to this solution vector onto the vector itself */
 	void SolutionVector_LoadCurrentFeVariableValuesOntoVector( void* solutionVector );
 	
-#endif /* __StG_FEM_SLE_SystemSetup_SolutionVector_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_SolutionVector_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -42,8 +42,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -210,7 +210,7 @@
 	
 	/* StiffnessMatrix info */
 	self->isConstructed = True;
-	self->debug = Stream_RegisterChild( StG_FEM_SLE_SystemSetup_Debug, self->type );
+	self->debug = Stream_RegisterChild( StgFEM_SLE_SystemSetup_Debug, self->type );
 	Journal_Firewall( (rowVariable != NULL), error, "Error: NULL row FeVariable provided to \"%s\" %s.\n",
 		self->name, self->type );
 	self->rowVariable = (FeVariable*)rowVariable;
@@ -436,7 +436,7 @@
 	StiffnessMatrix* self = (StiffnessMatrix*)stiffnessMatrix;
 
 	Journal_DPrintf( self->debug, "In %s - for matrix %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	/* ensure variables are built */
 	if( self->rowVariable )
@@ -487,7 +487,7 @@
 
 	Journal_DPrintf( self->debug, "Matrix allocated.\n" );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -530,7 +530,7 @@
 	#endif
 
 	Journal_DPrintf( self->debug, "In %s - for matrix %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	assert ( self->rowVariable );
 	assert ( self->columnVariable );
@@ -573,7 +573,7 @@
 			totalNonZeroEntries, totalNonZeroEntries * sizeof(double) );
 	#endif	
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -838,7 +838,7 @@
 	startTime = MPI_Wtime();
 
 	Journal_DPrintf( self->debug, "In %s - for matrix \"%s\"\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Journal_Firewall( Stg_ObjectList_Count( self->stiffnessMatrixTermList ) != 0,
 			Journal_Register(Error_Type, self->type),
@@ -1151,7 +1151,7 @@
 	Journal_DPrintfL( self->debug, 2, "Total time used by %s: %.5g s\n", __func__, totalTime );
 	Journal_DPrintfL( self->debug, 2, "Of which %.5g s spend building elStiffMats\n", elStiffMatBuildTime );
 	Journal_DPrintfL( self->debug, 2, "And %.5g s spend adding to global matrix\n", matAddingTime );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrix.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -53,8 +53,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_StiffnessMatrix_h__
-#define __StG_FEM_SLE_SystemSetup_StiffnessMatrix_h__
+#ifndef __StgFEM_SLE_SystemSetup_StiffnessMatrix_h__
+#define __StgFEM_SLE_SystemSetup_StiffnessMatrix_h__
 	
 
 	/* typedefs for virtual functions: Other than  */
@@ -264,4 +264,4 @@
 	
 	void StiffnessMatrix_AddStiffnessMatrixTerm( void* stiffnessMatrixVector, StiffnessMatrixTerm* stiffnessMatrixTerm ) ;
 	
-#endif /* __StG_FEM_SLE_SystemSetup_StiffnessMatrix_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_StiffnessMatrix_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,8 +41,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 
 #include "units.h"
 #include "types.h"
@@ -229,7 +229,7 @@
 	StiffnessMatrixTerm* self = (StiffnessMatrixTerm*)stiffnessMatrixTerm;
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	/* ensure integrationSwarm is built */
 	Stg_Component_Build( self->integrationSwarm, data, False );
@@ -237,7 +237,7 @@
 	if ( self->extraInfo ) 
 		Stg_Component_Build( self->extraInfo, data, False );
 		
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -245,13 +245,13 @@
 	StiffnessMatrixTerm* self = (StiffnessMatrixTerm*)stiffnessMatrixTerm;
 	
 	Journal_DPrintf( self->debug, "In %s - for %s\n", __func__, self->name );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	Stg_Component_Initialise( self->integrationSwarm, data, False );
 	if ( self->extraInfo ) 
 		Stg_Component_Initialise( self->extraInfo, data, False );
 	
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void _StiffnessMatrixTerm_Execute( void* stiffnessMatrixTerm, void* data ) {

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/StiffnessMatrixTerm.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_StiffnessMatrixTerm_h__
-#define __StG_FEM_SLE_SystemSetup_StiffnessMatrixTerm_h__
+#ifndef __StgFEM_SLE_SystemSetup_StiffnessMatrixTerm_h__
+#define __StgFEM_SLE_SystemSetup_StiffnessMatrixTerm_h__
 
 	typedef void (StiffnessMatrixTerm_AssembleElementFunction)	(
 			void*                             stiffnessMatrixTerm, 
@@ -138,4 +138,4 @@
 
 	void StiffnessMatrixTerm_SetAssembleElementFunction( void* stiffnessMatrixTerm, StiffnessMatrixTerm_AssembleElementFunction* assembleElementFunction ) ;
 
-#endif /* __StG_FEM_SLE_SystemSetup_StiffnessMatrixTerm_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_StiffnessMatrixTerm_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -31,8 +31,8 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
 #include "units.h"
 #include "types.h"
 #include "shortcuts.h"
@@ -149,7 +149,7 @@
 	self->isConstructed = True;
 	self->extensionManager = ExtensionManager_New_OfExistingObject( self->name, self );
 	
-	self->debug = Stream_RegisterChild( StG_FEM_SLE_SystemSetup_Debug, self->type );
+	self->debug = Stream_RegisterChild( StgFEM_SLE_SystemSetup_Debug, self->type );
 	self->info =  Journal_MyStream( Info_Type, self );
     /* Note: currently we're sending self->info to the master proc only so there's not too much
 	   identical timing info printed. May want to fine-tune later so that some info does get 
@@ -247,7 +247,7 @@
 	SystemLinearEquations*					self = (SystemLinearEquations*)sle;
 	
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	
 	Memory_Free( self->executeEPName );
 	
@@ -259,7 +259,7 @@
 
 	// delete parent
 	_Stg_Component_Delete( self );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -302,7 +302,7 @@
 	newSLE->_vectorSetup = self->_vectorSetup;
 	newSLE->_mgSelectStiffMats = self->_mgSelectStiffMats;
 	
-	newSLE->debug = Stream_RegisterChild( StG_FEM_SLE_SystemSetup_Debug, newSLE->type );
+	newSLE->debug = Stream_RegisterChild( StgFEM_SLE_SystemSetup_Debug, newSLE->type );
 	newSLE->comm = self->comm;
 	
 	if( deep ) {
@@ -398,7 +398,7 @@
 	Index				index;
 	
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* build the matrices */
 	for ( index = 0; index < self->stiffnessMatrices->count; index++ ) {
@@ -421,7 +421,7 @@
 	/* lastly, the solver */
 	Build( self->solver, self, False );
 
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -430,7 +430,7 @@
 	Index						index;
 	
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	/* initialise the matrices */
 	for ( index = 0; index < self->stiffnessMatrices->count; index++ ) {
@@ -458,7 +458,7 @@
 
 	/* lastly, the solver */
 	Initialise( self->solver, self, False );
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -466,11 +466,11 @@
 	SystemLinearEquations*	self = (SystemLinearEquations*)sle;
 	
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 
 	_EntryPoint_Run_2VoidPtr( self->executeEP, sle, data );
 	
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -523,7 +523,7 @@
 	Index						index;
 
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	/* For each feVariable of each stiffness matrix, build the LM  */
 	for ( index = 0; index < self->stiffnessMatrices->count; index++ ) {
 		StiffnessMatrix*				sm = (StiffnessMatrix*)self->stiffnessMatrices->data[index];
@@ -531,7 +531,7 @@
 		FeEquationNumber_BuildLocationMatrix( sm->rowVariable->eqNum );
 		FeEquationNumber_BuildLocationMatrix( sm->columnVariable->eqNum );
 	}
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 void SystemLinearEquations_MatrixSetup( void* sle, void* data ) {
@@ -545,11 +545,11 @@
 	Index						index;
 	
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	for ( index = 0; index < self->stiffnessMatrices->count; index++ ) {
 		StiffnessMatrix_Assemble( self->stiffnessMatrices->data[index], self->bcRemoveQuery, self );
 	}
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -564,11 +564,11 @@
 	Index						index;
 	
 	Journal_DPrintf( self->debug, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 	for ( index = 0; index < self->forceVectors->count; index++ ) {
 		ForceVector_Assemble( self->forceVectors->data[index] );
 	}
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 }
 
 
@@ -653,7 +653,7 @@
 	Iteration_Index         minIterations   = self->nonLinearMinIterations;
 
 	Journal_Printf( self->info, "In %s\n", __func__ );
-	Stream_IndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
 		
 	wallTime = MPI_Wtime();		
 		
@@ -713,7 +713,7 @@
 		}
 	}
 			
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_UnIndentBranch( StgFEM_Debug );
 
 	Vector_Destroy( previousVector );
 }

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemLinearEquations.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -55,8 +55,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_SystemLinearEquations_h__
-#define __StG_FEM_SLE_SystemSetup_SystemLinearEquations_h__
+#ifndef __StgFEM_SLE_SystemSetup_SystemLinearEquations_h__
+#define __StgFEM_SLE_SystemSetup_SystemLinearEquations_h__
 
 	/** Textual name of this class */
 	extern const Type SystemLinearEquations_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemSetup.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemSetup.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/SystemSetup.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_h__
-#define __StG_FEM_SLE_SystemSetup_h__
+#ifndef __StgFEM_SLE_SystemSetup_h__
+#define __StgFEM_SLE_SystemSetup_h__
 	
 	#include "units.h"
 	#include "types.h"
@@ -73,4 +73,4 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_SLE_SystemSetup_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/shortcuts.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/shortcuts.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/shortcuts.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,7 +50,7 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_shortcuts_h__
-#define __StG_FEM_SLE_SystemSetup_shortcuts_h__
+#ifndef __StgFEM_SLE_SystemSetup_shortcuts_h__
+#define __StgFEM_SLE_SystemSetup_shortcuts_h__
 
-#endif /* __StG_FEM_SLE_SystemSetup_shortcuts_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_shortcuts_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,8 +48,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_types_h__
-#define __StG_FEM_SLE_SystemSetup_types_h__
+#ifndef __StgFEM_SLE_SystemSetup_types_h__
+#define __StgFEM_SLE_SystemSetup_types_h__
 	
 	/* FE types/classes */
 	typedef struct FeEntryPoint                 FeEntryPoint;
@@ -79,8 +79,8 @@
 	typedef SystemLinearEquations*      SystemLinearEquationsPtr;
 	typedef Stg_ObjectList              SystemLinearEquationList;
 
-	/* output streams: initialised in StG_FEM_SLE_SystemSetup_Init() */
-	extern Stream* StG_FEM_SLE_Debug;
-	extern Stream* StG_FEM_SLE_SystemSetup_Debug;
+	/* output streams: initialised in StgFEM_SLE_SystemSetup_Init() */
+	extern Stream* StgFEM_SLE_Debug;
+	extern Stream* StgFEM_SLE_SystemSetup_Debug;
 
-#endif /* __StG_FEM_SLE_SystemSetup_types_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_types_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/units.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/units.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/units.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,7 +47,7 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_SystemSetup_units_h__
-#define __StG_FEM_SLE_SystemSetup_units_h__
+#ifndef __StgFEM_SLE_SystemSetup_units_h__
+#define __StgFEM_SLE_SystemSetup_units_h__
 	
-#endif /* __StG_FEM_SLE_SystemSetup_units_h__ */
+#endif /* __StgFEM_SLE_SystemSetup_units_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testContext.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testContext.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testContext.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,9 +47,9 @@
 #endif
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -94,9 +94,9 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
-	StG_FEM_SLE_LinearAlgebra_Init( &argc, &argv );
-	StG_FEM_SLE_SystemSetup_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
+	StgFEM_SLE_LinearAlgebra_Init( &argc, &argv );
+	StgFEM_SLE_SystemSetup_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register( Info_Type, "test" );
@@ -171,9 +171,9 @@
 	Stg_Class_Delete( context );
 	Stg_Class_Delete( dictionary );
 
-	StG_FEM_SLE_SystemSetup_Finalise();
-	StG_FEM_SLE_LinearAlgebra_Finalise();
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_SLE_SystemSetup_Finalise();
+	StgFEM_SLE_LinearAlgebra_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 		
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testSolutionVector.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -97,16 +97,16 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
-	StG_FEM_SLE_LinearAlgebra_Init( &argc, &argv );
-	StG_FEM_SLE_SystemSetup_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
+	StgFEM_SLE_LinearAlgebra_Init( &argc, &argv );
+	StgFEM_SLE_SystemSetup_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
 	/* set line below to true to True to activate outputting */
 	Journal_Enable_TypedStream( DebugStream_Type, False );
-	Stream_SetLevelBranch( StG_FEM_Debug, 2 );
-	Stream_EnableBranch( StG_FEM_Debug, True );
+	Stream_SetLevelBranch( StgFEM_Debug, 2 );
+	Stream_EnableBranch( StgFEM_Debug, True );
 	Stream_SetLevel( Journal_Register( DebugStream_Type, "FE.FE_Vectors.SolutionVector" ), 3 );
 	Stream_SetLevel( Journal_Register( DebugStream_Type, "FE.FE_Matrices.FeEquationNumber.LM" ), 1 );
 
@@ -269,9 +269,9 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_SLE_SystemSetup_Finalise();
-	StG_FEM_SLE_LinearAlgebra_Finalise();
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_SLE_SystemSetup_Finalise();
+	StgFEM_SLE_LinearAlgebra_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation-linkedDofs.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -109,18 +109,18 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
-	StG_FEM_SLE_LinearAlgebra_Init( &argc, &argv );
-	StG_FEM_SLE_SystemSetup_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
+	StgFEM_SLE_LinearAlgebra_Init( &argc, &argv );
+	StgFEM_SLE_SystemSetup_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
 	/* set line below to true to True to activate outputting */
 	Journal_Enable_TypedStream( DebugStream_Type, False );
-	Stream_SetLevelBranch( StG_FEM_Debug, 2 );
-	Stream_EnableBranch( StG_FEM_Debug, True );
-	Stream_SetLevel( Journal_Register( DebugStream_Type, "StG_FEM.SLE.SystemSetup.StiffnessMatrix" ), 3 );
-	Stream_SetLevel( Journal_Register( DebugStream_Type, "StG_FEM.Discretisation.FeEquationNumber" ), 1 );
+	Stream_SetLevelBranch( StgFEM_Debug, 2 );
+	Stream_EnableBranch( StgFEM_Debug, True );
+	Stream_SetLevel( Journal_Register( DebugStream_Type, "StgFEM.SLE.SystemSetup.StiffnessMatrix" ), 3 );
+	Stream_SetLevel( Journal_Register( DebugStream_Type, "StgFEM.Discretisation.FeEquationNumber" ), 1 );
 
 	if( argc >= 2 ) {
 		procToWatch = atoi( argv[1] );
@@ -312,9 +312,9 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_SLE_SystemSetup_Finalise();
-	StG_FEM_SLE_LinearAlgebra_Finalise();
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_SLE_SystemSetup_Finalise();
+	StgFEM_SLE_LinearAlgebra_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/tests/testStiffnessMatrix-nonZeroCalculation.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,9 +41,9 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -106,18 +106,18 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Discretisation_Init( &argc, &argv );
-	StG_FEM_SLE_LinearAlgebra_Init( &argc, &argv );
-	StG_FEM_SLE_SystemSetup_Init( &argc, &argv );
+	StgFEM_Discretisation_Init( &argc, &argv );
+	StgFEM_SLE_LinearAlgebra_Init( &argc, &argv );
+	StgFEM_SLE_SystemSetup_Init( &argc, &argv );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
 	stream = Journal_Register (Info_Type, "myStream");
 	/* set line below to true to True to activate outputting */
 	Journal_Enable_TypedStream( DebugStream_Type, False );
-	Stream_SetLevelBranch( StG_FEM_Debug, 2 );
-	Stream_EnableBranch( StG_FEM_Debug, True );
-	Stream_SetLevel( Journal_Register( DebugStream_Type, "StG_FEM.SLE.SystemSetup.StiffnessMatrix" ), 3 );
-	Stream_SetLevel( Journal_Register( DebugStream_Type, "StG_FEM.Discretisation.FeEquationNumber" ), 1 );
+	Stream_SetLevelBranch( StgFEM_Debug, 2 );
+	Stream_EnableBranch( StgFEM_Debug, True );
+	Stream_SetLevel( Journal_Register( DebugStream_Type, "StgFEM.SLE.SystemSetup.StiffnessMatrix" ), 3 );
+	Stream_SetLevel( Journal_Register( DebugStream_Type, "StgFEM.Discretisation.FeEquationNumber" ), 1 );
 
 	if( argc >= 2 ) {
 		procToWatch = atoi( argv[1] );
@@ -300,9 +300,9 @@
 	Stg_Class_Delete( nTopology );
 	Stg_Class_Delete( dictionary );
 	
-	StG_FEM_SLE_SystemSetup_Finalise();
-	StG_FEM_SLE_LinearAlgebra_Finalise();
-	StG_FEM_Discretisation_Finalise();
+	StgFEM_SLE_SystemSetup_Finalise();
+	StgFEM_SLE_LinearAlgebra_Finalise();
+	StgFEM_Discretisation_Finalise();
 	StGermain_Finalise();
 	
 	/* Close off MPI */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,20 +41,20 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
-#include "StG_FEM/SLE/ProvidedSystems/ProvidedSystems.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/SLE/ProvidedSystems/ProvidedSystems.h"
 #include "Finalise.h"
 
 #include <stdio.h>
 
-Bool StG_FEM_SLE_Finalise( void ) {
+Bool StgFEM_SLE_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	StG_FEM_SLE_LinearAlgebra_Finalise();
-	StG_FEM_SLE_SystemSetup_Finalise();
-	StG_FEM_SLE_ProvidedSystems_Finalise();
+	StgFEM_SLE_LinearAlgebra_Finalise();
+	StgFEM_SLE_SystemSetup_Finalise();
+	StgFEM_SLE_ProvidedSystems_Finalise();
 
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_Finalise_h__
-#define __StG_FEM_SLE_Finalise_h__
+#ifndef __StgFEM_SLE_Finalise_h__
+#define __StgFEM_SLE_Finalise_h__
 	
-	Bool StG_FEM_SLE_Finalise( void );
+	Bool StgFEM_SLE_Finalise( void );
 	
-#endif /* __StG_FEM_SLE_Finalise_h__ */
+#endif /* __StgFEM_SLE_Finalise_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,10 +41,10 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h"
-#include "StG_FEM/SLE/SystemSetup/SystemSetup.h"
-#include "StG_FEM/SLE/ProvidedSystems/ProvidedSystems.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/LinearAlgebra/LinearAlgebra.h"
+#include "StgFEM/SLE/SystemSetup/SystemSetup.h"
+#include "StgFEM/SLE/ProvidedSystems/ProvidedSystems.h"
 
 #include "types.h"
 #include "StiffRemesher.h"
@@ -54,7 +54,7 @@
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_SLE_Init( int* argc, char** argv[] ) {
+Bool StgFEM_SLE_Init( int* argc, char** argv[] ) {
 	int tmp;
 	
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
@@ -66,9 +66,9 @@
 	Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
 	
-	StG_FEM_SLE_LinearAlgebra_Init( argc, argv );
-	StG_FEM_SLE_SystemSetup_Init( argc, argv );
-	StG_FEM_SLE_ProvidedSystems_Init( argc, argv );
+	StgFEM_SLE_LinearAlgebra_Init( argc, argv );
+	StgFEM_SLE_SystemSetup_Init( argc, argv );
+	StgFEM_SLE_ProvidedSystems_Init( argc, argv );
 
 	Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), StiffRemesher_Type, "0", _StiffRemesher_DefaultNew );
 

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_Init_h__
-#define __StG_FEM_SLE_Init_h__
+#ifndef __StgFEM_SLE_Init_h__
+#define __StgFEM_SLE_Init_h__
 	
-	Bool StG_FEM_SLE_Init( int* argc, char** argv[] );
+	Bool StgFEM_SLE_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_SLE_Init_h__ */
+#endif /* __StgFEM_SLE_Init_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/SLE.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/SLE.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/SLE.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_h__
-#define __StG_FEM_SLE_h__
+#ifndef __StgFEM_SLE_h__
+#define __StgFEM_SLE_h__
 	
 	#include "LinearAlgebra/LinearAlgebra.h"
 	#include "SystemSetup/SystemSetup.h"
@@ -64,4 +64,4 @@
 	#include "Init.h"
 	#include "Finalise.h"
 
-#endif /* __StG_FEM_SLE_h__ */
+#endif /* __StgFEM_SLE_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,8 +46,8 @@
 #include <assert.h>
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/SLE/LinearAlgebra/LinearAlgebra.h>
 
 #include "types.h"
 #include "StiffRemesher.h"

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/StiffRemesher.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,8 +49,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_StiffRemesher_h__
-#define __StG_FEM_SLE_StiffRemesher_h__
+#ifndef __StgFEM_SLE_StiffRemesher_h__
+#define __StgFEM_SLE_StiffRemesher_h__
 
 	/* Textual name of this class. */
 	extern const Type StiffRemesher_Type;

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/src/types.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/src/types.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/src/types.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,8 +50,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_SLE_types_h__
-#define __StG_FEM_SLE_types_h__
+#ifndef __StgFEM_SLE_types_h__
+#define __StgFEM_SLE_types_h__
 
 	/* Classes */
 	typedef struct StiffRemesher	StiffRemesher;

Modified: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,20 +41,20 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/SLE.h"
-#include "StG_FEM/Assembly/Assembly.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/SLE.h"
+#include "StgFEM/Assembly/Assembly.h"
 #include "Finalise.h"
 
 #include <stdio.h>
 
-Bool StG_FEM_Finalise( void ) {
+Bool StgFEM_Finalise( void ) {
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
 	
-	Stream_IndentBranch( StG_FEM_Debug );
-	StG_FEM_Discretisation_Finalise();
-	StG_FEM_SLE_Finalise();
-	StG_FEM_Assembly_Finalise();
-	Stream_UnIndentBranch( StG_FEM_Debug );
+	Stream_IndentBranch( StgFEM_Debug );
+	StgFEM_Discretisation_Finalise();
+	StgFEM_SLE_Finalise();
+	StgFEM_Assembly_Finalise();
+	Stream_UnIndentBranch( StgFEM_Debug );
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Finalise.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Finalise_h__
-#define __StG_FEM_Finalise_h__
+#ifndef __StgFEM_Finalise_h__
+#define __StgFEM_Finalise_h__
 	
-	Bool StG_FEM_Finalise( void );
+	Bool StgFEM_Finalise( void );
 	
-#endif /* __StG_FEM_Finalise_h__ */
+#endif /* __StgFEM_Finalise_h__ */

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-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,16 +41,16 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/SLE.h"
-#include "StG_FEM/Assembly/Assembly.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/SLE.h"
+#include "StgFEM/Assembly/Assembly.h"
 #include "Init.h"
 
 #include <stdio.h>
 
 /** Initialises the Linear Algebra package, then any init for this package
 such as streams etc */
-Bool StG_FEM_Init( int* argc, char** argv[] ) {
+Bool StgFEM_Init( int* argc, char** argv[] ) {
 	int tmp;
 	
 	Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
@@ -62,9 +62,9 @@
 	Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
 	
-	StG_FEM_Discretisation_Init( argc, argv );
-	StG_FEM_SLE_Init( argc, argv );
-	StG_FEM_Assembly_Init( argc, argv );
+	StgFEM_Discretisation_Init( argc, argv );
+	StgFEM_SLE_Init( argc, argv );
+	StgFEM_Assembly_Init( argc, argv );
 	
 	return True;
 }

Modified: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/Init.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -50,9 +50,9 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Init_h__
-#define __StG_FEM_Init_h__
+#ifndef __StgFEM_Init_h__
+#define __StgFEM_Init_h__
 	
-	Bool StG_FEM_Init( int* argc, char** argv[] );
+	Bool StgFEM_Init( int* argc, char** argv[] );
 	
-#endif /* __StG_FEM_Init_h__ */
+#endif /* __StgFEM_Init_h__ */

Deleted: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StG_FEM.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StG_FEM.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StG_FEM.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -1,63 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-**
-** Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-**	Melbourne, 3053, Australia.
-**
-** Primary Contributing Organisations:
-**	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-**	Australian Computational Earth Systems Simulator - http://www.access.edu.au
-**	Monash Cluster Computing - http://www.mcc.monash.edu.au
-**	Computational Infrastructure for Geodynamics - http://www.geodynamics.org
-**
-** Contributors:
-**	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-**	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-**	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-**	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-**	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-**	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-**	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-**	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-**	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-**	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-**
-**  This library 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 library 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
-**  Lesser General Public License for more details.
-**
-**  You should have received a copy of the GNU Lesser General Public
-**  License along with this library; if not, write to the Free Software
-**  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-**
-*/
-/** \file
-**  Role:
-**	External header file to this library
-**
-** Assumptions:
-**	None so far.
-**
-** Comments:
-**	None so far.
-**
-** $Id$
-**
-**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-#ifndef __StG_FEM_h__
-#define __StG_FEM_h__
-	
-	#include "Discretisation/Discretisation.h"
-	#include "SLE/SLE.h"
-	#include "Assembly/Assembly.h"
-
-	#include "Init.h"
-	#include "Finalise.h"
-
-#endif /* __StG_FEM_h__ */

Added: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StgFEM.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StgFEM.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StgFEM.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -0,0 +1,63 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**
+** Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
+**	Melbourne, 3053, Australia.
+**
+** Primary Contributing Organisations:
+**	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
+**	Australian Computational Earth Systems Simulator - http://www.access.edu.au
+**	Monash Cluster Computing - http://www.mcc.monash.edu.au
+**	Computational Infrastructure for Geodynamics - http://www.geodynamics.org
+**
+** Contributors:
+**	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
+**	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
+**	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+**	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
+**	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
+**	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
+**	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+**	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+**	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
+**	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
+**
+**  This library 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 library 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
+**  Lesser General Public License for more details.
+**
+**  You should have received a copy of the GNU Lesser General Public
+**  License along with this library; if not, write to the Free Software
+**  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+**
+*/
+/** \file
+**  Role:
+**	External header file to this library
+**
+** Assumptions:
+**	None so far.
+**
+** Comments:
+**	None so far.
+**
+** $Id$
+**
+**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+#ifndef __StgFEM_h__
+#define __StgFEM_h__
+	
+	#include "Discretisation/Discretisation.h"
+	#include "SLE/SLE.h"
+	#include "Assembly/Assembly.h"
+
+	#include "Init.h"
+	#include "Finalise.h"
+
+#endif /* __StgFEM_h__ */


Property changes on: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/src/StgFEM.h
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate Author Id
Name: svn:eol-style
   + native

Deleted: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStG_FEM.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStG_FEM.0of1.expected	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStG_FEM.0of1.expected	2006-10-31 21:31:27 UTC (rev 5145)
@@ -1,8 +0,0 @@
-StGermain Framework. Copyright (C) 2003-2005 VPAC.
-StGermain Discretisation Library. Copyright (C) 2003-2005 VPAC.
-StGermain Finite Element Framework. Copyright (C) 2003-2005 VPAC.
-StGermain FEM Discretisation Framework. Copyright (C) 2003-2005 VPAC.
-StGermain SLE Library. Copyright (C) 2003-2005 VPAC.
-StGermain PETSc-LinearAlgebra Interface. Copyright (C) 2003-2005 VPAC.
-StGermain FEM Assembly Library. Copyright (C) 2003-2005 VPAC.
-Watching rank: 0

Added: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStgFEM.0of1.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStgFEM.0of1.expected	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/expected/testLibStgFEM.0of1.expected	2006-10-31 21:31:27 UTC (rev 5145)
@@ -0,0 +1,8 @@
+StGermain Framework. Copyright (C) 2003-2005 VPAC.
+StGermain Discretisation Library. Copyright (C) 2003-2005 VPAC.
+StGermain Finite Element Framework. Copyright (C) 2003-2005 VPAC.
+StGermain FEM Discretisation Framework. Copyright (C) 2003-2005 VPAC.
+StGermain SLE Library. Copyright (C) 2003-2005 VPAC.
+StGermain PETSc-LinearAlgebra Interface. Copyright (C) 2003-2005 VPAC.
+StGermain FEM Assembly Library. Copyright (C) 2003-2005 VPAC.
+Watching rank: 0

Deleted: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -1,49 +0,0 @@
-#!/bin/sh
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-##
-## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-##	Melbourne, 3053, Australia.
-##
-## Primary Contributing Organisations:
-##	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-##	Australian Computational Earth Systems Simulator - http://www.access.edu.au
-##	Monash Cluster Computing - http://www.mcc.monash.edu.au
-##	Computational Infrastructure for Geodynamics - http://www.geodynamics.org
-##
-## Contributors:
-##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-##	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-##	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-##	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-##	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-##	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-##
-##  This library 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 library 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
-##  Lesser General Public License for more details.
-##
-##  You should have received a copy of the GNU Lesser General Public
-##  License along with this library; if not, write to the Free Software
-##  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-##
-## $Id$
-##
-##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-TEST_SCRIPT=./VMake/executableTester.sh
-until test -r ${TEST_SCRIPT} ; do
-        TEST_SCRIPT=../${TEST_SCRIPT}
-done
-. ${TEST_SCRIPT}
-
-runAndHandleSystemTestStdLocations "testLibStG_FEM " "$0" "$@"

Deleted: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStG_FEM.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -1,85 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-**
-** Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
-**	Melbourne, 3053, Australia.
-**
-** Primary Contributing Organisations:
-**	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
-**	Australian Computational Earth Systems Simulator - http://www.access.edu.au
-**	Monash Cluster Computing - http://www.mcc.monash.edu.au
-**	Computational Infrastructure for Geodynamics - http://www.geodynamics.org
-**
-** Contributors:
-**	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
-**	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
-**	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
-**	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
-**	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
-**	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
-**	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
-**	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
-**	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
-**	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
-**
-**  This library 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 library 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
-**  Lesser General Public License for more details.
-**
-**  You should have received a copy of the GNU Lesser General Public
-**  License along with this library; if not, write to the Free Software
-**  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-**
-** $Id$
-**
-**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-#include <mpi.h>
-#include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-
-int main( int argc, char* argv[] ) {
-	MPI_Comm		CommWorld;
-	int			rank;
-	int			numProcessors;
-	int			procToWatch;
-	
-	/* Initialise MPI, get world info */
-	MPI_Init( &argc, &argv );
-	MPI_Comm_dup( MPI_COMM_WORLD, &CommWorld );
-	MPI_Comm_size( CommWorld, &numProcessors );
-	MPI_Comm_rank( CommWorld, &rank );
-	/* Read input */
-
-	if( !StGermain_Init( &argc, &argv ) ) {
-		fprintf( stderr, "Error initialising StGermain, exiting.\n" );
-		exit( EXIT_FAILURE );
-	}
-	StG_FEM_Init( &argc, &argv );
-	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
-
-	if( argc >= 2 ) {
-		procToWatch = atoi( argv[1] );
-	}
-	else {
-		procToWatch = 0;
-	}
-	if( rank == procToWatch ) printf( "Watching rank: %i\n", rank );
-	
-	StG_FEM_Finalise();
-	StGermain_Finalise();
-	
-	/* Close off MPI */
-	MPI_Finalize();
-
-	return 0; /* success */
-}

Added: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -0,0 +1,49 @@
+#!/bin/sh
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##
+## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
+##	Melbourne, 3053, Australia.
+##
+## Primary Contributing Organisations:
+##	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
+##	Australian Computational Earth Systems Simulator - http://www.access.edu.au
+##	Monash Cluster Computing - http://www.mcc.monash.edu.au
+##	Computational Infrastructure for Geodynamics - http://www.geodynamics.org
+##
+## Contributors:
+##	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
+##	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
+##	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+##	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
+##	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
+##	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
+##	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+##	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+##	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
+##	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
+##
+##  This library 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 library 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
+##  Lesser General Public License for more details.
+##
+##  You should have received a copy of the GNU Lesser General Public
+##  License along with this library; if not, write to the Free Software
+##  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+##
+## $Id$
+##
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+runAndHandleSystemTestStdLocations "testLibStgFEM " "$0" "$@"


Property changes on: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.0of1.sh
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + LastChangedDate Author Id
Name: svn:eol-style
   + native

Added: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -0,0 +1,85 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**
+** Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
+**	Melbourne, 3053, Australia.
+**
+** Primary Contributing Organisations:
+**	Victorian Partnership for Advanced Computing Ltd, Computational Software Development - http://csd.vpac.org
+**	Australian Computational Earth Systems Simulator - http://www.access.edu.au
+**	Monash Cluster Computing - http://www.mcc.monash.edu.au
+**	Computational Infrastructure for Geodynamics - http://www.geodynamics.org
+**
+** Contributors:
+**	Patrick D. Sunter, Software Engineer, VPAC. (pds at vpac.org)
+**	Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
+**	Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+**	David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
+**	Louis Moresi, Associate Professor, Monash University. (louis.moresi at sci.monash.edu.au)
+**	Luke J. Hodkinson, Computational Engineer, VPAC. (lhodkins at vpac.org)
+**	Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+**	Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+**	Julian Giordani, Research Assistant, Monash University. (julian.giordani at sci.monash.edu.au)
+**	Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
+**
+**  This library 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 library 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
+**  Lesser General Public License for more details.
+**
+**  You should have received a copy of the GNU Lesser General Public
+**  License along with this library; if not, write to the Free Software
+**  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+**
+** $Id$
+**
+**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+
+#include <mpi.h>
+#include <StGermain/StGermain.h>
+#include <StgFEM/StgFEM.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+
+int main( int argc, char* argv[] ) {
+	MPI_Comm		CommWorld;
+	int			rank;
+	int			numProcessors;
+	int			procToWatch;
+	
+	/* Initialise MPI, get world info */
+	MPI_Init( &argc, &argv );
+	MPI_Comm_dup( MPI_COMM_WORLD, &CommWorld );
+	MPI_Comm_size( CommWorld, &numProcessors );
+	MPI_Comm_rank( CommWorld, &rank );
+	/* Read input */
+
+	if( !StGermain_Init( &argc, &argv ) ) {
+		fprintf( stderr, "Error initialising StGermain, exiting.\n" );
+		exit( EXIT_FAILURE );
+	}
+	StgFEM_Init( &argc, &argv );
+	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
+
+	if( argc >= 2 ) {
+		procToWatch = atoi( argv[1] );
+	}
+	else {
+		procToWatch = 0;
+	}
+	if( rank == procToWatch ) printf( "Watching rank: %i\n", rank );
+	
+	StgFEM_Finalise();
+	StGermain_Finalise();
+	
+	/* Close off MPI */
+	MPI_Finalize();
+
+	return 0; /* success */
+}


Property changes on: long/3D/Gale/trunk/src/StgFEM/libStG_FEM/tests/testLibStgFEM.c
___________________________________________________________________
Name: svn:keywords
   + LastChangedDate Author Id
Name: svn:eol-style
   + native

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,16 +43,16 @@
 #include <mpi.h>
 #include <StGermain/StGermain.h>
 //EP_APPLICATIONS_FINALISE defined in StGermain.h
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include "Application.h"
 
 #include <stdio.h>
 //For strcmp
 #include <string.h>
 
-const Type StG_FEM_Application_Type = "StG_FEM_Application";
+const Type StgFEM_Application_Type = "StgFEM_Application";
 
-void _StG_FEM_Application_Construct( void* component, Stg_ComponentFactory* cf, void* data ) 
+void _StgFEM_Application_Construct( void* component, Stg_ComponentFactory* cf, void* data ) 
 {
 	AbstractContext* currAbstractContext;
 	FiniteElementContext* context;
@@ -110,26 +110,26 @@
 	//Change to append -> THESE plugins are now CONSTRUCTED IN REVERSE ORDER!!!
 	EntryPoint_Append( 
 			Context_GetEntryPoint( context, EP_APPLICATIONS_FINALISE ),
-			"StG_FEM App Finalise",
-			StG_FEM_Application_Finalise, 
-			"StG_FEM_App_Construct");
+			"StgFEM App Finalise",
+			StgFEM_Application_Finalise, 
+			"StgFEM_App_Construct");
 }
 
 
-//StG_FEM finalise entry point -> needs to be called if this plugin was loaded.
-void StG_FEM_Application_Finalise()
+//StgFEM finalise entry point -> needs to be called if this plugin was loaded.
+void StgFEM_Application_Finalise()
 {
 	Stream* finaliseStream=Journal_Register(Info_Type,"StgFEM_Application");
 	Journal_Printf(finaliseStream, "Finalised: StGermain FEM Framework.\n");
 
-	StG_FEM_Finalise();
+	StgFEM_Finalise();
 }
 
-void* _StG_FEM_Application_DefaultNew( Name name ) {
+void* _StgFEM_Application_DefaultNew( Name name ) {
 	return Codelet_New(
-			StG_FEM_Application_Type,
-			_StG_FEM_Application_DefaultNew,
-			_StG_FEM_Application_Construct,
+			StgFEM_Application_Type,
+			_StgFEM_Application_DefaultNew,
+			_StgFEM_Application_Construct,
 			_Codelet_Build,
 			_Codelet_Initialise,
 			_Codelet_Execute,
@@ -137,11 +137,11 @@
 			name );
 }
 
-Index StG_FEM_Application_Register( PluginsManager* pluginsManager ) 
+Index StgFEM_Application_Register( PluginsManager* pluginsManager ) 
 {
-	//Initialise StG_FEM context.
-	StG_FEM_Init(NULL, NULL);
+	//Initialise StgFEM context.
+	StgFEM_Init(NULL, NULL);
 
-	return PluginsManager_Submit( pluginsManager, StG_FEM_Application_Type, "0", _StG_FEM_Application_DefaultNew );
+	return PluginsManager_Submit( pluginsManager, StgFEM_Application_Type, "0", _StgFEM_Application_DefaultNew );
 }
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Application/Application.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,17 +48,17 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_Application_h__
-#define __StG_FEM_Application_h__
+#ifndef __StgFEM_Application_h__
+#define __StgFEM_Application_h__
 
-extern const Type StG_FEM_Application_Type;
+extern const Type StgFEM_Application_Type;
 
 typedef struct {
 	__Codelet
-} StG_FEM_Application;
+} StgFEM_Application;
 
-Index StG_FEM_Application_Register( PluginsManager* pluginsManager );
+Index StgFEM_Application_Register( PluginsManager* pluginsManager );
 
-void StG_FEM_Application_Finalise();
+void StgFEM_Application_Finalise();
 
 #endif	

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/CompareFeVariableAgainstReferenceSolution/CompareFeVariableAgainstReferenceSolution.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,11 +43,11 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 #include <string.h>
 
-const Type CompareFeVariableAgainstReferenceSolution_Type = "StG_FEM_CompareFeVariableAgainstReferenceSolution";
+const Type CompareFeVariableAgainstReferenceSolution_Type = "StgFEM_CompareFeVariableAgainstReferenceSolution";
 
 void CompareFeVariableAgainstReferenceSolution_TestAll( void* compareFeVariable, void* data );
 void CompareFeVariableAgainstReferenceSolution_TestVariable( void* compareFeVariable, FeVariable* feVarToTest, double tolerance );
@@ -187,7 +187,7 @@
 }
 
 
-Index _StG_FEM_CompareFeVariableAgainstReferenceSolution_Register( PluginsManager* pluginsManager ) {
+Index _StgFEM_CompareFeVariableAgainstReferenceSolution_Register( PluginsManager* pluginsManager ) {
 	return PluginsManager_Submit( 
 			pluginsManager, 
 			CompareFeVariableAgainstReferenceSolution_Type, 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Document/Document.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Document/Document.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Document/Document.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,7 +41,7 @@
 
 #include <StGermain/StGermain.h>
 
-void StG_FEM_Document_Register( AbstractContext* context ) {
+void StgFEM_Document_Register( AbstractContext* context ) {
 	DocumentationComponentFactory* cf;
 	Stream* componentListStream;
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/FeVariable_ImportExport_ABAQUS.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/FeVariable_ImportExport_ABAQUS.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/FeVariableImportExporters/FeVariable_ImportExport_ABAQUS/FeVariable_ImportExport_ABAQUS.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,11 +41,11 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 #include <string.h>
 
-const Type   StG_FEM_FeVariable_ImportExport_ABAQUS_Type = "StG_FEM_FeVariable_ImportExport_ABAQUS";
+const Type   StgFEM_FeVariable_ImportExport_ABAQUS_Type = "StgFEM_FeVariable_ImportExport_ABAQUS";
 const char*  ABAQUS_ImportExportType = "ABAQUS";
 
 
@@ -68,7 +68,7 @@
 	Index              currentFileLine = 0;
 	Coord              localGeometryMin;
 	Coord              localGeometryMax;
-	Stream*            debugStream = Journal_Register( Debug_Type, StG_FEM_FeVariable_ImportExport_ABAQUS_Type );
+	Stream*            debugStream = Journal_Register( Debug_Type, StgFEM_FeVariable_ImportExport_ABAQUS_Type );
 	
 	Journal_DPrintf( debugStream, "In %s(): for FeVariable \"%s\"\n", __func__, feVariable->name );
 	Stream_Indent( debugStream );
@@ -209,14 +209,14 @@
 
 void FeVariable_SaveNodalValuesToFile_ABAQUS( void* _feVariable, const char* prefixStr, unsigned int timeStep ) {
 	FeVariable*      feVariable = (FeVariable*)_feVariable;
-	Stream*          errorStream = Journal_Register( Error_Type, StG_FEM_FeVariable_ImportExport_ABAQUS_Type );
+	Stream*          errorStream = Journal_Register( Error_Type, StgFEM_FeVariable_ImportExport_ABAQUS_Type );
 
 	Journal_Firewall( 0, errorStream, "Error - in %s(), for FeVariable \"%s\": function not implemented yet.\n",
 		__func__, feVariable->name );
 }
 
 
-void _StG_FEM_FeVariable_ImportExport_ABAQUS_Construct( void* componment, Stg_ComponentFactory* cf, void* data ) {
+void _StgFEM_FeVariable_ImportExport_ABAQUS_Construct( void* componment, Stg_ComponentFactory* cf, void* data ) {
 	AbstractContext* context;
 	FeVariable_ImportExportInfo*    abaqusImportExportInfo = NULL;
 
@@ -235,15 +235,15 @@
 		FeVariable_ImportExportInfo_Copy );
 }
 
-void* _StG_FEM_FeVariable_ImportExport_ABAQUS_DefaultNew( Name name ) {
+void* _StgFEM_FeVariable_ImportExport_ABAQUS_DefaultNew( Name name ) {
 	return _Codelet_New(
 			sizeof( Codelet ),
-			StG_FEM_FeVariable_ImportExport_ABAQUS_Type,
+			StgFEM_FeVariable_ImportExport_ABAQUS_Type,
 			_Codelet_Delete,
 			_Codelet_Print,
 			_Codelet_Copy,
-			_StG_FEM_FeVariable_ImportExport_ABAQUS_DefaultNew,
-			_StG_FEM_FeVariable_ImportExport_ABAQUS_Construct,
+			_StgFEM_FeVariable_ImportExport_ABAQUS_DefaultNew,
+			_StgFEM_FeVariable_ImportExport_ABAQUS_Construct,
 			_Codelet_Build,
 			_Codelet_Initialise,
 			_Codelet_Execute,
@@ -251,8 +251,8 @@
 			name );
 }
    
-Index StG_FEM_FeVariable_ImportExport_ABAQUS_Register( PluginsManager* pluginsManager ) {
-	return PluginsManager_Submit( pluginsManager, StG_FEM_FeVariable_ImportExport_ABAQUS_Type, "0", _StG_FEM_FeVariable_ImportExport_ABAQUS_DefaultNew );
+Index StgFEM_FeVariable_ImportExport_ABAQUS_Register( PluginsManager* pluginsManager ) {
+	return PluginsManager_Submit( pluginsManager, StgFEM_FeVariable_ImportExport_ABAQUS_Type, "0", _StgFEM_FeVariable_ImportExport_ABAQUS_DefaultNew );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Context.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Context.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Context.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,8 +47,8 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_LevelSetPlugin_Context_h__
-#define __StG_FEM_LevelSetPlugin_Context_h__
+#ifndef __StgFEM_LevelSetPlugin_Context_h__
+#define __StgFEM_LevelSetPlugin_Context_h__
 
 	extern ExtensionInfo_Index	LevelSetPlugin_ContextHandle;
 
@@ -58,4 +58,4 @@
 		LevelSet**	lSets;
 	};
 
-#endif /* __StG_FEM_LevelSetPlugin_Context_h__ */
+#endif /* __StgFEM_LevelSetPlugin_Context_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSet.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -47,9 +47,9 @@
 #include <mpi.h>
 
 #include "StGermain/StGermain.h"
-#include "StG_FEM/Discretisation/Discretisation.h"
-#include "StG_FEM/SLE/SLE.h"
-#include "StG_FEM/Assembly/Assembly.h"
+#include "StgFEM/Discretisation/Discretisation.h"
+#include "StgFEM/SLE/SLE.h"
+#include "StgFEM/Assembly/Assembly.h"
 
 #include "types.h"
 #include "Polynomial.h"

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,7 +46,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 #include "types.h"
 #include "Polynomial.h"
@@ -56,13 +56,13 @@
 #include "LevelSetPlugin.h"
 
 
-const Type		StG_FEM_LevelSetPlugin_Type = "LevelSetPlugin";
+const Type		StgFEM_LevelSetPlugin_Type = "LevelSetPlugin";
 ExtensionInfo_Index	LevelSetPlugin_ContextHandle;
 
 const char*	LEVELSET_PLUGIN_TAG = "LevelSet";
 
 
-Index _StG_FEM_LevelSetPlugin_Register( PluginsManager* pluginsMgr ) {
+Index _StgFEM_LevelSetPlugin_Register( PluginsManager* pluginsMgr ) {
 	/*
 	** Register the level set component.
 	*/
@@ -76,29 +76,29 @@
 
 	/* Complete plugin bit. */
 	return PluginsManager_Submit( pluginsMgr, 
-				      StG_FEM_LevelSetPlugin_Type, 
+				      StgFEM_LevelSetPlugin_Type, 
 				      "0", 
-				      _StG_FEM_LevelSetPlugin_DefaultNew );
+				      _StgFEM_LevelSetPlugin_DefaultNew );
 }
 
 
-void* _StG_FEM_LevelSetPlugin_DefaultNew( Name name ) {
+void* _StgFEM_LevelSetPlugin_DefaultNew( Name name ) {
 	return _Codelet_New( sizeof(Codelet), 
-			     StG_FEM_LevelSetPlugin_Type, 
+			     StgFEM_LevelSetPlugin_Type, 
 			     _Codelet_Delete, 
 			     _Codelet_Print, 
 			     _Codelet_Copy, 
-			     _StG_FEM_LevelSetPlugin_DefaultNew, 
-			     _StG_FEM_LevelSetPlugin_Construct, 
-			     _StG_FEM_LevelSetPlugin_Build, 
+			     _StgFEM_LevelSetPlugin_DefaultNew, 
+			     _StgFEM_LevelSetPlugin_Construct, 
+			     _StgFEM_LevelSetPlugin_Build, 
 			     _Codelet_Initialise, 
 			     _Codelet_Execute, 
-			     _StG_FEM_LevelSetPlugin_Destroy, 
+			     _StgFEM_LevelSetPlugin_Destroy, 
 			     name );
 }
 
 
-void _StG_FEM_LevelSetPlugin_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
+void _StgFEM_LevelSetPlugin_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
 	FiniteElementContext*	feCtx;
 	LevelSetPlugin_Context*	lsCtx;
 
@@ -113,7 +113,7 @@
 		True,
 		data );
 
-	Journal_DPrintf( StG_FEM_Debug, "In: %s( void* )\n", __func__ );
+	Journal_DPrintf( StgFEM_Debug, "In: %s( void* )\n", __func__ );
 
 
 	/*
@@ -121,7 +121,7 @@
 	*/
 
 	LevelSetPlugin_ContextHandle = ExtensionManager_Add( feCtx->extensionMgr,
-							     StG_FEM_LevelSetPlugin_Type,
+							     StgFEM_LevelSetPlugin_Type,
 							     sizeof(LevelSetPlugin_Context) );
 	lsCtx = ExtensionManager_Get( feCtx->extensionMgr,
 				      feCtx, 
@@ -136,12 +136,12 @@
 
 	EntryPoint_Append( Context_GetEntryPoint( feCtx, AbstractContext_EP_Solve ),
 			   "default", 
-			   _StG_FEM_LevelSetPlugin_Solve, 
-			   StG_FEM_LevelSetPlugin_Type );
+			   _StgFEM_LevelSetPlugin_Solve, 
+			   StgFEM_LevelSetPlugin_Type );
 }
 
 
-void _StG_FEM_LevelSetPlugin_Build( void* component, void* data ) {
+void _StgFEM_LevelSetPlugin_Build( void* component, void* data ) {
 	FiniteElementContext*	feCtx;
 
 	assert( component );
@@ -152,7 +152,7 @@
 }
 
 
-void _StG_FEM_LevelSetPlugin_Destroy( void* component, void* data ) {
+void _StgFEM_LevelSetPlugin_Destroy( void* component, void* data ) {
 	FiniteElementContext*	feCtx;
 	LevelSetPlugin_Context*	lsCtx;
 
@@ -168,7 +168,7 @@
 }
 
 
-void _StG_FEM_LevelSetPlugin_Solve( void* ctx ) {
+void _StgFEM_LevelSetPlugin_Solve( void* ctx ) {
 	FiniteElementContext*	feCtx = (FiniteElementContext*)ctx;
 	LevelSetPlugin_Context*	lsCtx;
 	unsigned		ls_i;

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/LevelSetPlugin.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,24 +48,24 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_plugins_LevelSet_LevelSetPlugin_h__
-#define __StG_FEM_plugins_LevelSet_LevelSetPlugin_h__
+#ifndef __StgFEM_plugins_LevelSet_LevelSetPlugin_h__
+#define __StgFEM_plugins_LevelSet_LevelSetPlugin_h__
 	
 	
 	extern const char*	LEVELSET_PLUGIN_TAG;
 
 
-	Index _StG_FEM_LevelSetPlugin_Register( PluginsManager* pluginsMgr );
+	Index _StgFEM_LevelSetPlugin_Register( PluginsManager* pluginsMgr );
 
-	void* _StG_FEM_LevelSetPlugin_DefaultNew( Name name );
+	void* _StgFEM_LevelSetPlugin_DefaultNew( Name name );
 
-	void _StG_FEM_LevelSetPlugin_Construct( void* component, Stg_ComponentFactory* cf, void* data );
+	void _StgFEM_LevelSetPlugin_Construct( void* component, Stg_ComponentFactory* cf, void* data );
 
-	void _StG_FEM_LevelSetPlugin_Build( void* component, void* data );
+	void _StgFEM_LevelSetPlugin_Build( void* component, void* data );
 
-	void _StG_FEM_LevelSetPlugin_Destroy( void* component, void* data );
+	void _StgFEM_LevelSetPlugin_Destroy( void* component, void* data );
 
-	void _StG_FEM_LevelSetPlugin_Solve( void* ctx );
+	void _StgFEM_LevelSetPlugin_Solve( void* ctx );
 	
 
-#endif /* __StG_FEM_plugins_LevelSet_LevelSetPlugin_h__ */
+#endif /* __StgFEM_plugins_LevelSet_LevelSetPlugin_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Polynomial.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Polynomial.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Polynomial.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -37,8 +37,8 @@
 **
 */
 
-#ifndef __StG_FEM_LevelSet_Polynomial_h__	
-#define __StG_FEM_LevelSet_Polynomial_h__	
+#ifndef __StgFEM_LevelSet_Polynomial_h__	
+#define __StgFEM_LevelSet_Polynomial_h__	
 
 	typedef struct {
 		unsigned	order;

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Quadrature.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Quadrature.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/LevelSetPlugin/Quadrature.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -36,8 +36,8 @@
 **  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 **
 */
-#ifndef __StG_FEM_LevelSet_Quadrature_h__
-#define __StG_FEM_LevelSet_Quadrature_h__
+#ifndef __StgFEM_LevelSet_Quadrature_h__
+#define __StgFEM_LevelSet_Quadrature_h__
 	
 	typedef struct {
 		unsigned	nDims;

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,7 +46,7 @@
 #include <mpi.h>
 
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include "Context.h"
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/Context.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -37,8 +37,8 @@
 **
 */
 
-#ifndef __StG_FEM_plugins_MultiGrid_Context_h__
-#define __StG_FEM_plugins_MultiGrid_Context_h__
+#ifndef __StgFEM_plugins_MultiGrid_Context_h__
+#define __StgFEM_plugins_MultiGrid_Context_h__
 	
 	
 	/* Context Information */
@@ -62,4 +62,4 @@
 	void MultiGrid_Context_Print( void* _feCtx );
 	
 	
-#endif /* __StG_FEM_plugins_MultiGrid_Context_h__ */
+#endif /* __StgFEM_plugins_MultiGrid_Context_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,44 +46,44 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 #include "Context.h"
 #include "MultiGrid.h"
 
 
-const Type		StG_FEM_MultiGrid_Type = "MultiGrid";
+const Type		StgFEM_MultiGrid_Type = "MultiGrid";
 ExtensionInfo_Index	MultiGrid_ContextHandle;
 
 const char*	MULTIGRID_PLUGIN_TAG = "MultiGrid";
 const char*	SLES_TO_CONVERT_LIST_TAG = "SLEsToConvert";
 
 
-Index _StG_FEM_MultiGrid_Register( PluginsManager* pluginsMgr ) {
+Index _StgFEM_MultiGrid_Register( PluginsManager* pluginsMgr ) {
 	return PluginsManager_Submit( pluginsMgr, 
-				      StG_FEM_MultiGrid_Type, 
+				      StgFEM_MultiGrid_Type, 
 				      "0", 
-				      _StG_FEM_MultiGrid_DefaultNew );
+				      _StgFEM_MultiGrid_DefaultNew );
 }
 
 
-void* _StG_FEM_MultiGrid_DefaultNew( Name name ) {
+void* _StgFEM_MultiGrid_DefaultNew( Name name ) {
 	return _Codelet_New( sizeof(Codelet), 
-			     StG_FEM_MultiGrid_Type, 
+			     StgFEM_MultiGrid_Type, 
 			     _Codelet_Delete, 
 			     _Codelet_Print, 
 			     _Codelet_Copy, 
-			     _StG_FEM_MultiGrid_DefaultNew, 
-			     _StG_FEM_MultiGrid_Construct, 
-			     _StG_FEM_MultiGrid_Build, 
+			     _StgFEM_MultiGrid_DefaultNew, 
+			     _StgFEM_MultiGrid_Construct, 
+			     _StgFEM_MultiGrid_Build, 
 			     _Codelet_Initialise, 
 			     _Codelet_Execute, 
-			     _StG_FEM_MultiGrid_Destroy, 
+			     _StgFEM_MultiGrid_Destroy, 
 			     name );
 }
 
 
-void _StG_FEM_MultiGrid_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
+void _StgFEM_MultiGrid_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
 	FiniteElementContext*	feCtx;
 	MultiGrid_Context*	mgCtx;
 
@@ -98,11 +98,11 @@
 	** Register all entry points, add extensions to the FE context and whatever else needs modifying.
 	*/
 
-	Journal_DPrintf( StG_FEM_Debug, "In: %s( void* )\n", __func__ );
+	Journal_DPrintf( StgFEM_Debug, "In: %s( void* )\n", __func__ );
 
 	/* Add extensions to the context and get them. */
 	MultiGrid_ContextHandle = ExtensionManager_Add( feCtx->extensionMgr, 
-							StG_FEM_MultiGrid_Type, 
+							StgFEM_MultiGrid_Type, 
 							sizeof(MultiGrid_Context) );
 
 	mgCtx = ExtensionManager_Get( feCtx->extensionMgr, 
@@ -350,7 +350,7 @@
 }
 
 
-void _StG_FEM_MultiGrid_Build( void* component, void* data ) {
+void _StgFEM_MultiGrid_Build( void* component, void* data ) {
 	FiniteElementContext*	feCtx;
 	MultiGrid_Context*	mgCtx;
 	unsigned		sle_i;
@@ -379,7 +379,7 @@
 }
 
 
-void _StG_FEM_MultiGrid_Destroy( void* component, void* data ) {
+void _StgFEM_MultiGrid_Destroy( void* component, void* data ) {
 	FiniteElementContext*	feCtx;
 	MultiGrid_Context*	mgCtx;
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/MultiGrid/MultiGrid.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,23 +48,23 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_plugins_MultiGrid_MultiGrid_h__
-#define __StG_FEM_plugins_MultiGrid_MultiGrid_h__
+#ifndef __StgFEM_plugins_MultiGrid_MultiGrid_h__
+#define __StgFEM_plugins_MultiGrid_MultiGrid_h__
 	
 	
 	extern const char*	MULTIGRID_PLUGIN_TAG;
 	extern const char*	SLES_TO_CONVERT_LIST_TAG;
 	
 	
-	Index _StG_FEM_MultiGrid_Register( PluginsManager* pluginsMgr );
+	Index _StgFEM_MultiGrid_Register( PluginsManager* pluginsMgr );
 
-	void* _StG_FEM_MultiGrid_DefaultNew( Name name );
+	void* _StgFEM_MultiGrid_DefaultNew( Name name );
 
-	void _StG_FEM_MultiGrid_Construct( void* component, Stg_ComponentFactory* cf, void* data );
+	void _StgFEM_MultiGrid_Construct( void* component, Stg_ComponentFactory* cf, void* data );
 
-	void _StG_FEM_MultiGrid_Build( void* component, void* data );
+	void _StgFEM_MultiGrid_Build( void* component, void* data );
 
-	void _StG_FEM_MultiGrid_Destroy( void* component, void* data );
+	void _StgFEM_MultiGrid_Destroy( void* component, void* data );
 	
 
-#endif /* __StG_FEM_plugins_MultiGrid_MultiGrid_h__ */
+#endif /* __StgFEM_plugins_MultiGrid_MultiGrid_h__ */

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,21 +41,21 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/FrequentOutput/FrequentOutput.h>
+#include <StgFEM/FrequentOutput/FrequentOutput.h>
 
 #include "CPUTime.h"
   
-const Type StG_FEM_CPUTime_Type = "StG_FEM_CPUTime";
+const Type StgFEM_CPUTime_Type = "StgFEM_CPUTime";
 
-void StG_FEM_CPUTime_PrintTimeInfo( AbstractContext* context ) {
-	StG_FEM_CPUTime* self = (StG_FEM_CPUTime*)LiveComponentRegister_Get( context->CF->LCRegister, StG_FEM_CPUTime_Type );
+void StgFEM_CPUTime_PrintTimeInfo( AbstractContext* context ) {
+	StgFEM_CPUTime* self = (StgFEM_CPUTime*)LiveComponentRegister_Get( context->CF->LCRegister, StgFEM_CPUTime_Type );
 
 	/* Print Current Time Taken */
-	StG_FEM_FrequentOutput_PrintValue( context, MPI_Wtime() - self->initialTime );
+	StgFEM_FrequentOutput_PrintValue( context, MPI_Wtime() - self->initialTime );
 }
 
-void _StG_FEM_CPUTime_Construct( void* componment, Stg_ComponentFactory* cf, void* data ) {
-	StG_FEM_CPUTime* self = (StG_FEM_CPUTime*)componment;
+void _StgFEM_CPUTime_Construct( void* componment, Stg_ComponentFactory* cf, void* data ) {
+	StgFEM_CPUTime* self = (StgFEM_CPUTime*)componment;
 	AbstractContext* context;
 
 	context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data ); 
@@ -64,20 +64,20 @@
 	self->initialTime = MPI_Wtime();
 
 	/* Print Header to file */
-	StG_FEM_FrequentOutput_PrintString( context, "CPU Time" );
+	StgFEM_FrequentOutput_PrintString( context, "CPU Time" );
 	
-	ContextEP_Append( context, AbstractContext_EP_FrequentOutput ,StG_FEM_CPUTime_PrintTimeInfo );
+	ContextEP_Append( context, AbstractContext_EP_FrequentOutput ,StgFEM_CPUTime_PrintTimeInfo );
 }
 
-void* _StG_FEM_CPUTime_DefaultNew( Name name ) {
+void* _StgFEM_CPUTime_DefaultNew( Name name ) {
 	return _Codelet_New(
-			sizeof( StG_FEM_CPUTime ),
-			StG_FEM_CPUTime_Type,
+			sizeof( StgFEM_CPUTime ),
+			StgFEM_CPUTime_Type,
 			_Codelet_Delete,
 			_Codelet_Print,
 			_Codelet_Copy,
-			_StG_FEM_CPUTime_DefaultNew,
-			_StG_FEM_CPUTime_Construct,
+			_StgFEM_CPUTime_DefaultNew,
+			_StgFEM_CPUTime_Construct,
 			_Codelet_Build,
 			_Codelet_Initialise,
 			_Codelet_Execute,
@@ -85,8 +85,8 @@
 			name );
 }
    
-Index StG_FEM_CPUTime_Register( PluginsManager* pluginsManager ) {
-	return PluginsManager_Submit( pluginsManager, StG_FEM_CPUTime_Type, "0", _StG_FEM_CPUTime_DefaultNew );
+Index StgFEM_CPUTime_Register( PluginsManager* pluginsManager ) {
+	return PluginsManager_Submit( pluginsManager, StgFEM_CPUTime_Type, "0", _StgFEM_CPUTime_DefaultNew );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/CPUTime/CPUTime.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -38,17 +38,17 @@
 */
 
 
-#ifndef __StG_FEM_CPUTime_h__
-#define __StG_FEM_CPUTime_h__
+#ifndef __StgFEM_CPUTime_h__
+#define __StgFEM_CPUTime_h__
 
-	extern const Type StG_FEM_CPUTime_Type;
+	extern const Type StgFEM_CPUTime_Type;
 
 	typedef struct {
 		__Codelet
 		double    initialTime;
-	} StG_FEM_CPUTime;
+	} StgFEM_CPUTime;
 
-	Index StG_FEM_CPUTime_Register( PluginsManager* pluginsManager );
-	void StG_FEM_CPUTime_PrintTimeInfo( AbstractContext* context );
+	Index StgFEM_CPUTime_Register( PluginsManager* pluginsManager );
+	void StgFEM_CPUTime_PrintTimeInfo( AbstractContext* context );
 
 #endif

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,10 +48,10 @@
 	#define MASTER 0
 #endif
 
-const Type StG_FEM_FrequentOutput_Type = "StG_FEM_FrequentOutput";
+const Type StgFEM_FrequentOutput_Type = "StgFEM_FrequentOutput";
 
-void _StG_FEM_FrequentOutput_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
-	StG_FEM_FrequentOutput*            self         = (StG_FEM_FrequentOutput*) component;
+void _StgFEM_FrequentOutput_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
+	StgFEM_FrequentOutput*            self         = (StgFEM_FrequentOutput*) component;
 	AbstractContext*                   context;
 	Dictionary*                        dictionary;
 	Stream*                            stream;
@@ -62,9 +62,9 @@
 	context = (AbstractContext*)Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data ); 
 	dictionary = context->dictionary;
 	
-	ContextEP_Append( context, AbstractContext_EP_Initialise, StG_FEM_FrequentOutput_PrintNewLine );
-	ContextEP_Prepend_AlwaysFirst( context, AbstractContext_EP_FrequentOutput, StG_FEM_FrequentOutput_PrintTime );
-	ContextEP_Append_AlwaysLast(   context, AbstractContext_EP_FrequentOutput, StG_FEM_FrequentOutput_PrintNewLine );
+	ContextEP_Append( context, AbstractContext_EP_Initialise, StgFEM_FrequentOutput_PrintNewLine );
+	ContextEP_Prepend_AlwaysFirst( context, AbstractContext_EP_FrequentOutput, StgFEM_FrequentOutput_PrintTime );
+	ContextEP_Append_AlwaysLast(   context, AbstractContext_EP_FrequentOutput, StgFEM_FrequentOutput_PrintNewLine );
 	
 	/* Create Stream */
 	stream = self->stream = Journal_Register( InfoStream_Type, "FrequentOutputFile" );
@@ -98,18 +98,18 @@
 	self->decimalLength = Dictionary_GetUnsignedInt_WithDefault( dictionary, "FrequentOutputDecimalLength", 6 );
 	self->borderString  = Dictionary_GetString_WithDefault( dictionary, "FrequentOutputBorderString", "    " );
 
-	StG_FEM_FrequentOutput_PrintHeader( context );
+	StgFEM_FrequentOutput_PrintHeader( context );
 }
 
-void* _StG_FEM_FrequentOutput_DefaultNew( Name name ) {
+void* _StgFEM_FrequentOutput_DefaultNew( Name name ) {
 	return _Codelet_New(
-			sizeof(StG_FEM_FrequentOutput),
-			StG_FEM_FrequentOutput_Type,
+			sizeof(StgFEM_FrequentOutput),
+			StgFEM_FrequentOutput_Type,
 			_Codelet_Delete,
 			_Codelet_Print,
 			_Codelet_Copy,
-			_StG_FEM_FrequentOutput_DefaultNew,
-			_StG_FEM_FrequentOutput_Construct,
+			_StgFEM_FrequentOutput_DefaultNew,
+			_StgFEM_FrequentOutput_Construct,
 			_Codelet_Build,
 			_Codelet_Initialise,
 			_Codelet_Execute,
@@ -117,17 +117,17 @@
 			name );
 }
 
-Index StG_FEM_FrequentOutput_Register( PluginsManager* pluginsManager ) {
-	return PluginsManager_Submit( pluginsManager, StG_FEM_FrequentOutput_Type, "0", _StG_FEM_FrequentOutput_DefaultNew );
+Index StgFEM_FrequentOutput_Register( PluginsManager* pluginsManager ) {
+	return PluginsManager_Submit( pluginsManager, StgFEM_FrequentOutput_Type, "0", _StgFEM_FrequentOutput_DefaultNew );
 }
 
-void StG_FEM_FrequentOutput_PrintString( void* _context, char* string ) {
+void StgFEM_FrequentOutput_PrintString( void* _context, char* string ) {
 	AbstractContext*                   context = (AbstractContext*) _context;
 	Stream*                            stream;
 
-	StG_FEM_FrequentOutput* self = (StG_FEM_FrequentOutput*)LiveComponentRegister_Get( 
+	StgFEM_FrequentOutput* self = (StgFEM_FrequentOutput*)LiveComponentRegister_Get( 
 									context->CF->LCRegister, 
-									StG_FEM_FrequentOutput_Type );
+									StgFEM_FrequentOutput_Type );
 	stream     = self->stream;
 
 	/* Print some empty space at start */
@@ -137,14 +137,14 @@
 	Journal_PrintString_WithLength( stream, string, self->columnWidth );
 }
 
-void StG_FEM_FrequentOutput_PrintDouble( void* _context, double value ) {
+void StgFEM_FrequentOutput_PrintDouble( void* _context, double value ) {
 	AbstractContext*                   context = (AbstractContext*) _context;
 	char*                              formatString;
 	Stream*                            stream;
 
-	StG_FEM_FrequentOutput* self = (StG_FEM_FrequentOutput*)LiveComponentRegister_Get( 
+	StgFEM_FrequentOutput* self = (StgFEM_FrequentOutput*)LiveComponentRegister_Get( 
 									context->CF->LCRegister,
-									StG_FEM_FrequentOutput_Type );
+									StgFEM_FrequentOutput_Type );
 
 	stream     = self->stream;
 
@@ -157,14 +157,14 @@
 	Memory_Free( formatString );
 }
 
-void StG_FEM_FrequentOutput_PrintHeader( void* _context ) {
+void StgFEM_FrequentOutput_PrintHeader( void* _context ) {
 	AbstractContext*                   context = (AbstractContext*) _context;
 	char*                              firstBorderString;
 	Stream*                            stream;
 
-	StG_FEM_FrequentOutput* self = (StG_FEM_FrequentOutput*)LiveComponentRegister_Get( 
+	StgFEM_FrequentOutput* self = (StgFEM_FrequentOutput*)LiveComponentRegister_Get( 
 									context->CF->LCRegister, 
-									StG_FEM_FrequentOutput_Type );
+									StgFEM_FrequentOutput_Type );
 	
 	stream     = self->stream;
 
@@ -176,23 +176,23 @@
 
 	Journal_PrintString_WithLength( stream, "Timestep", self->columnWidth );
 
-	StG_FEM_FrequentOutput_PrintString( context, "Time" );
+	StgFEM_FrequentOutput_PrintString( context, "Time" );
 }
 
-void StG_FEM_FrequentOutput_PrintTime( void* _context ) {
+void StgFEM_FrequentOutput_PrintTime( void* _context ) {
 	AbstractContext* context = (AbstractContext*) _context;
 
-	StG_FEM_FrequentOutput_PrintValue( context, context->timeStep );
-	StG_FEM_FrequentOutput_PrintValue( context, context->currentTime );
+	StgFEM_FrequentOutput_PrintValue( context, context->timeStep );
+	StgFEM_FrequentOutput_PrintValue( context, context->currentTime );
 }
 
-void StG_FEM_FrequentOutput_PrintNewLine( void* _context ) {
+void StgFEM_FrequentOutput_PrintNewLine( void* _context ) {
 	AbstractContext*                   context = (AbstractContext*) _context;
 	Stream*                            stream;
 
-	StG_FEM_FrequentOutput* self = (StG_FEM_FrequentOutput*)LiveComponentRegister_Get( 
+	StgFEM_FrequentOutput* self = (StgFEM_FrequentOutput*)LiveComponentRegister_Get( 
 									context->CF->LCRegister, 
-									StG_FEM_FrequentOutput_Type );
+									StgFEM_FrequentOutput_Type );
 	
 	stream     = self->stream;
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/FrequentOutput.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -37,10 +37,10 @@
 **
 */
 
-#ifndef __StG_FEM_FrequentOutput_h__
-#define __StG_FEM_FrequentOutput_h__
+#ifndef __StgFEM_FrequentOutput_h__
+#define __StgFEM_FrequentOutput_h__
 
-	extern const Type StG_FEM_FrequentOutput_Type;
+	extern const Type StgFEM_FrequentOutput_Type;
 
 	typedef struct {
 		__Codelet
@@ -48,19 +48,19 @@
 		unsigned int columnWidth;
 		unsigned int decimalLength;
 		char*        borderString;
-	} StG_FEM_FrequentOutput;
+	} StgFEM_FrequentOutput;
 
-	Index StG_FEM_FrequentOutput_Register( PluginsManager* pluginsManager );
+	Index StgFEM_FrequentOutput_Register( PluginsManager* pluginsManager );
 
 	/** Utility Functions */
-	void StG_FEM_FrequentOutput_PrintString( void* _context, char* string ) ;
-	void StG_FEM_FrequentOutput_PrintDouble( void* _context, double value ) ;
+	void StgFEM_FrequentOutput_PrintString( void* _context, char* string ) ;
+	void StgFEM_FrequentOutput_PrintDouble( void* _context, double value ) ;
 
-	#define StG_FEM_FrequentOutput_PrintValue( context, value ) \
-		StG_FEM_FrequentOutput_PrintDouble( context, (double) (value) )
+	#define StgFEM_FrequentOutput_PrintValue( context, value ) \
+		StgFEM_FrequentOutput_PrintDouble( context, (double) (value) )
 
-	void StG_FEM_FrequentOutput_PrintHeader( void* _context ) ;
-	void StG_FEM_FrequentOutput_PrintTime( void* _context ) ;
-	void StG_FEM_FrequentOutput_PrintNewLine( void* _context ) ;
+	void StgFEM_FrequentOutput_PrintHeader( void* _context ) ;
+	void StgFEM_FrequentOutput_PrintTime( void* _context ) ;
+	void StgFEM_FrequentOutput_PrintNewLine( void* _context ) ;
 
 #endif

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of1.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of1.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM testFrequentOutput.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM testFrequentOutput.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of2.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of2.sh	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.0of2.sh	2006-10-31 21:31:27 UTC (rev 5145)
@@ -46,4 +46,4 @@
 done
 . ${TEST_SCRIPT}
 
-runAndHandleSystemTestStdLocations "StG_FEM testFrequentOutput.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StgFEM testFrequentOutput.xml" "$0" "$@"

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.xml	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/FrequentOutput/tests/testFrequentOutput.xml	2006-10-31 21:31:27 UTC (rev 5145)
@@ -4,7 +4,7 @@
 <StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
  
 	<list name="plugins">
-		<param>StG_FEM_FrequentOutput</param>	
+		<param>StgFEM_FrequentOutput</param>	
 	</list>
 
 	<!-- Simulation control -->

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,17 +41,17 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/Discretisation/Discretisation.h>
-#include <StG_FEM/FrequentOutput/FrequentOutput.h>
-#include <StG_FEM/SLE/LinearAlgebra/LinearAlgebra.h>
+#include <StgFEM/Discretisation/Discretisation.h>
+#include <StgFEM/FrequentOutput/FrequentOutput.h>
+#include <StgFEM/SLE/LinearAlgebra/LinearAlgebra.h>
 
 #include "PeakMemory.h"
   
-const Type StG_FEM_PeakMemory_Type = "StG_FEM_PeakMemory";
+const Type StgFEM_PeakMemory_Type = "StgFEM_PeakMemory";
 
-void StG_FEM_PeakMemory_PrintMemoryInfo( AbstractContext* context ) {
+void StgFEM_PeakMemory_PrintMemoryInfo( AbstractContext* context ) {
 /* to potentially remove...
-	StG_FEM_PeakMemory* self = (StG_FEM_PeakMemory*)LiveComponentRegister_Get( context->CF->LCRegister, StG_FEM_PeakMemory_Type );
+	StgFEM_PeakMemory* self = (StgFEM_PeakMemory*)LiveComponentRegister_Get( context->CF->LCRegister, StgFEM_PeakMemory_Type );
 */
 	SizeT stgMem;
 	size_t laMem;
@@ -61,17 +61,17 @@
 	stgMem = stgMemory->stgCurrentMemory;
 	MPI_Allreduce( &stgMem, &ave, 1, MPI_INTEGER, MPI_SUM, context->communicator );
 	ave /= context->nproc * 1000 * 1000;
-	StG_FEM_FrequentOutput_PrintValue( context, ave );
+	StgFEM_FrequentOutput_PrintValue( context, ave );
 	
 	laMem = LinearAlgebra_GetMemoryUsage();
 	MPI_Allreduce( &laMem, &ave, 1, MPI_INTEGER, MPI_SUM, context->communicator );
 	ave /= context->nproc * 1000 * 1000;
-	StG_FEM_FrequentOutput_PrintValue( context, ave );
+	StgFEM_FrequentOutput_PrintValue( context, ave );
 }
 
-void _StG_FEM_PeakMemory_Construct( void* componment, Stg_ComponentFactory* cf, void* data ) {
+void _StgFEM_PeakMemory_Construct( void* componment, Stg_ComponentFactory* cf, void* data ) {
 /* to potentially remove ...
-	StG_FEM_PeakMemory* self = (StG_FEM_PeakMemory*)componment;
+	StgFEM_PeakMemory* self = (StgFEM_PeakMemory*)componment;
 */
 	AbstractContext* context;
 
@@ -83,22 +83,22 @@
 */
 	
 	/* Print Header to file */
-	StG_FEM_FrequentOutput_PrintString( context, "Stg Memory" );
-	StG_FEM_FrequentOutput_PrintString( context, "LA Memory" );
+	StgFEM_FrequentOutput_PrintString( context, "Stg Memory" );
+	StgFEM_FrequentOutput_PrintString( context, "LA Memory" );
 	
-	ContextEP_Append( context, AbstractContext_EP_FrequentOutput ,StG_FEM_PeakMemory_PrintMemoryInfo );
+	ContextEP_Append( context, AbstractContext_EP_FrequentOutput ,StgFEM_PeakMemory_PrintMemoryInfo );
 }
 
-void* _StG_FEM_PeakMemory_DefaultNew( Name name ) {
+void* _StgFEM_PeakMemory_DefaultNew( Name name ) {
 	return _Codelet_New(
-/*			sizeof( StG_FEM_PeakMemory ),*/
+/*			sizeof( StgFEM_PeakMemory ),*/
 			sizeof( Codelet ),
-			StG_FEM_PeakMemory_Type,
+			StgFEM_PeakMemory_Type,
 			_Codelet_Delete,
 			_Codelet_Print,
 			_Codelet_Copy,
-			_StG_FEM_PeakMemory_DefaultNew,
-			_StG_FEM_PeakMemory_Construct,
+			_StgFEM_PeakMemory_DefaultNew,
+			_StgFEM_PeakMemory_Construct,
 			_Codelet_Build,
 			_Codelet_Initialise,
 			_Codelet_Execute,
@@ -106,7 +106,7 @@
 			name );
 }
    
-Index StG_FEM_PeakMemory_Register( PluginsManager* pluginsManager ) {
-	return PluginsManager_Submit( pluginsManager, StG_FEM_PeakMemory_Type, "0", _StG_FEM_PeakMemory_DefaultNew );
+Index StgFEM_PeakMemory_Register( PluginsManager* pluginsManager ) {
+	return PluginsManager_Submit( pluginsManager, StgFEM_PeakMemory_Type, "0", _StgFEM_PeakMemory_DefaultNew );
 }
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PeakMemory/PeakMemory.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -37,19 +37,19 @@
 **
 */
 
-#ifndef __StG_FEM_PeakMemory_h__
-#define __StG_FEM_PeakMemory_h__
+#ifndef __StgFEM_PeakMemory_h__
+#define __StgFEM_PeakMemory_h__
 
-	extern const Type StG_FEM_PeakMemory_Type;
+	extern const Type StgFEM_PeakMemory_Type;
 	
 	/* to potentially remove...
 		typedef struct {
 			__Codelet;
 			double    initialTime;
-		} StG_FEM_PeakMemory;
+		} StgFEM_PeakMemory;
 	*/
 	
-	Index StG_FEM_PeakMemory_Register( PluginsManager* pluginsManager );
-	void StG_FEM_PeakMemory_PrintMemoryInfo( AbstractContext* context );
+	Index StgFEM_PeakMemory_Register( PluginsManager* pluginsManager );
+	void StgFEM_PeakMemory_PrintMemoryInfo( AbstractContext* context );
 
 #endif

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,17 +41,17 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include "Plugin.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-const Type StG_FEM_PrintFeVariableDiscreteValues_Type = "StG_FEM_PrintFeVariableDiscreteValues";
+const Type StgFEM_PrintFeVariableDiscreteValues_Type = "StgFEM_PrintFeVariableDiscreteValues";
 
 const char* PRINT_FE_VARIABLE_DISCRETE_VALUES_TAG = "PrintFeVariableDiscreteValues";
 
-void _StG_FEM_PrintFeVariableDiscreteValues_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
+void _StgFEM_PrintFeVariableDiscreteValues_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
 	FiniteElementContext* context;
 
 	context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data ); 
@@ -59,11 +59,11 @@
 	ContextEP_Append( context, AbstractContext_EP_Dump, PrintFeVariableDiscreteValues );
 }
 
-void* _StG_FEM_PrintFeVariableDiscreteValues_DefaultNew( Name name ) {
+void* _StgFEM_PrintFeVariableDiscreteValues_DefaultNew( Name name ) {
 	return Codelet_New(
-			StG_FEM_PrintFeVariableDiscreteValues_Type,
-			_StG_FEM_PrintFeVariableDiscreteValues_DefaultNew,
-			_StG_FEM_PrintFeVariableDiscreteValues_Construct,
+			StgFEM_PrintFeVariableDiscreteValues_Type,
+			_StgFEM_PrintFeVariableDiscreteValues_DefaultNew,
+			_StgFEM_PrintFeVariableDiscreteValues_Construct,
 			_Codelet_Build,
 			_Codelet_Initialise,
 			_Codelet_Execute,
@@ -71,10 +71,10 @@
 			name );
 }
 
-Index StG_FEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager ) {
-	Journal_DPrintf( StG_FEM_Debug, "In: %s( void* )\n", __func__ );
+Index StgFEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager ) {
+	Journal_DPrintf( StgFEM_Debug, "In: %s( void* )\n", __func__ );
 	
-	return PluginsManager_Submit( pluginsManager, StG_FEM_PrintFeVariableDiscreteValues_Type, "0", _StG_FEM_PrintFeVariableDiscreteValues_DefaultNew );
+	return PluginsManager_Submit( pluginsManager, StgFEM_PrintFeVariableDiscreteValues_Type, "0", _StgFEM_PrintFeVariableDiscreteValues_DefaultNew );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues/Plugin.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,18 +48,18 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_PrintFeVariableDiscreteValues_h__
-#define __StG_FEM_PrintFeVariableDiscreteValues_h__
+#ifndef __StgFEM_PrintFeVariableDiscreteValues_h__
+#define __StgFEM_PrintFeVariableDiscreteValues_h__
 
-	extern const Type StG_FEM_PrintFeVariableDiscreteValues_Type;
+	extern const Type StgFEM_PrintFeVariableDiscreteValues_Type;
 
 	typedef struct {
 		__Codelet
-	} StG_FEM_PrintFeVariableDiscreteValues;
+	} StgFEM_PrintFeVariableDiscreteValues;
 
 	extern const char* PRINT_FE_VARIABLE_DISCRETE_VALUES_TAG;
 	
-	Index _StG_FEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager );
+	Index _StgFEM_PrintFeVariableDiscreteValues_Register( PluginsManager* pluginsManager );
 	void PrintFeVariableDiscreteValues( void* _context );
 
 #endif	

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,17 +41,17 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include "Plugin.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-const Type StG_FEM_PrintFeVariableDiscreteValues_2dBox_Type = "StG_FEM_PrintFeVariableDiscreteValues_2dBox";
+const Type StgFEM_PrintFeVariableDiscreteValues_2dBox_Type = "StgFEM_PrintFeVariableDiscreteValues_2dBox";
 
 const char* PRINT_FE_VARIABLE_DISCRETE_VALUES_2D_BOX_TAG = "PrintFeVariableDiscreteValues_2dBox";
 
-void _StG_FEM_PrintFeVariableDiscreteValues_2dBox_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
+void _StgFEM_PrintFeVariableDiscreteValues_2dBox_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
 	FiniteElementContext* context;
 
 	context = (FiniteElementContext*)Stg_ComponentFactory_ConstructByName( cf, "context", FiniteElementContext, True, data ); 
@@ -61,11 +61,11 @@
 	ContextEP_Append( context, AbstractContext_EP_Dump, PrintFeVariableDiscreteValues_2dBox );
 }
 
-void* _StG_FEM_PrintFeVariableDiscreteValues_2dBox_DefaultNew( Name name ) {
+void* _StgFEM_PrintFeVariableDiscreteValues_2dBox_DefaultNew( Name name ) {
 	return Codelet_New(
-			StG_FEM_PrintFeVariableDiscreteValues_2dBox_Type,
-			_StG_FEM_PrintFeVariableDiscreteValues_2dBox_DefaultNew,
-			_StG_FEM_PrintFeVariableDiscreteValues_2dBox_Construct,
+			StgFEM_PrintFeVariableDiscreteValues_2dBox_Type,
+			_StgFEM_PrintFeVariableDiscreteValues_2dBox_DefaultNew,
+			_StgFEM_PrintFeVariableDiscreteValues_2dBox_Construct,
 			_Codelet_Build,
 			_Codelet_Initialise,
 			_Codelet_Execute,
@@ -73,10 +73,10 @@
 			name );
 }
 
-Index _StG_FEM_PrintFeVariableDiscreteValues_2dBox_Register( PluginsManager* pluginsManager ) {
-	Journal_DPrintf( StG_FEM_Debug, "In: %s( void* )\n", __func__ );
+Index _StgFEM_PrintFeVariableDiscreteValues_2dBox_Register( PluginsManager* pluginsManager ) {
+	Journal_DPrintf( StgFEM_Debug, "In: %s( void* )\n", __func__ );
 
-	return PluginsManager_Submit( pluginsManager, StG_FEM_PrintFeVariableDiscreteValues_2dBox_Type, "0", _StG_FEM_PrintFeVariableDiscreteValues_2dBox_DefaultNew );
+	return PluginsManager_Submit( pluginsManager, StgFEM_PrintFeVariableDiscreteValues_2dBox_Type, "0", _StgFEM_PrintFeVariableDiscreteValues_2dBox_DefaultNew );
 }
 
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/Output/PrintFeVariableDiscreteValues_2dBox/Plugin.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -49,18 +49,18 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_PrintFeVariableDiscreteValues_2dBox_h__
-#define __StG_FEM_PrintFeVariableDiscreteValues_2dBox_h__
+#ifndef __StgFEM_PrintFeVariableDiscreteValues_2dBox_h__
+#define __StgFEM_PrintFeVariableDiscreteValues_2dBox_h__
 
-	extern const Type StG_FEM_PrintFeVariableDiscreteValues_2dBox_Type;
+	extern const Type StgFEM_PrintFeVariableDiscreteValues_2dBox_Type;
 
 	typedef struct {
 		__Codelet
-	} StG_FEM_PrintFeVariableDiscreteValues_2dBox;
+	} StgFEM_PrintFeVariableDiscreteValues_2dBox;
 
 	extern const char* PRINT_FE_VARIABLE_DISCRETE_VALUES_2D_BOX_TAG;
 	
-	Index _StG_FEM_PrintFeVariableDiscreteValues_2dBox_Register( PluginsManager* pluginsManager );
+	Index _StgFEM_PrintFeVariableDiscreteValues_2dBox_Register( PluginsManager* pluginsManager );
 	void PrintFeVariableDiscreteValues_2dBox( void* _context );
 
 #endif	

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -41,64 +41,64 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include <assert.h>
 #include "StandardConditionFunctions.h"
 
-const Type StG_FEM_StandardConditionFunctions_Type = "StG_FEM_StandardConditionFunctions";
+const Type StgFEM_StandardConditionFunctions_Type = "StgFEM_StandardConditionFunctions";
 
-void _StG_FEM_StandardConditionFunctions_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
+void _StgFEM_StandardConditionFunctions_Construct( void* component, Stg_ComponentFactory* cf, void* data ) {
 	AbstractContext*        context;
 	ConditionFunction*      condFunc;
 
 	context = (AbstractContext*)Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data ); 
 	
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_SolidBodyRotation, "Velocity_SolidBodyRotation" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_SolidBodyRotation, "Velocity_SolidBodyRotation" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 	
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_PartialRotationX, "Velocity_PartialRotationX" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_PartialRotationX, "Velocity_PartialRotationX" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 		
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_PartialRotationY, "Velocity_PartialRotationY" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_PartialRotationY, "Velocity_PartialRotationY" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 	
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_SimpleShear, "Velocity_SimpleShear" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_SimpleShear, "Velocity_SimpleShear" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_Extension, "Velocity_Extension" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_Extension, "Velocity_Extension" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_PartialLid_TopLayer, "Velocity_PartialLid_TopLayer" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_PartialLid_TopLayer, "Velocity_PartialLid_TopLayer" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_Trigonometry, "Temperature_Trigonometry" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_Trigonometry, "Temperature_Trigonometry" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_LinearInterpolationLid, "Velocity_LinearInterpolationLid" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_LinearInterpolationLid, "Velocity_LinearInterpolationLid" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_Lid_RampWithCentralMax, "Velocity_Lid_RampWithCentralMax" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_Lid_RampWithCentralMax, "Velocity_Lid_RampWithCentralMax" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_SinusoidalLid, "Velocity_SinusoidalLid" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_SinusoidalLid, "Velocity_SinusoidalLid" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_CornerOnly, "Velocity_Lid_CornerOnly" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_CornerOnly, "Velocity_Lid_CornerOnly" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_TemperatureCosineHill, "Temperature_CosineHill" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_TemperatureCosineHill, "Temperature_CosineHill" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_LinearWithSinusoidalPerturbation, "LinearWithSinusoidalPerturbation" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_LinearWithSinusoidalPerturbation, "LinearWithSinusoidalPerturbation" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_AnalyticalTemperatureIC, "AnalyticalTemperatureIC" );
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_AnalyticalTemperatureIC, "AnalyticalTemperatureIC" );
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 	condFunc = ConditionFunction_New( Stg_FEM_VelicTemperatureIC, "VelicTemperatureIC");
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 	condFunc = ConditionFunction_New( Stg_FEM_VelicTemperatureIC_SolB, "VelicTemperatureIC_SolB");
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 	
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_SinusoidalExtension, "SinusoidalExtension");
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_SinusoidalExtension, "SinusoidalExtension");
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
-	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_StepFunction, "StepFunction");
+	condFunc = ConditionFunction_New( StgFEM_StandardConditionFunctions_StepFunction, "StepFunction");
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 
 	condFunc = ConditionFunction_New( StG_FEM_StandardConditionFunctions_StepFunctionProduct1, "StepFunctionProduct1");
@@ -114,11 +114,11 @@
 	ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
 }
 
-void* _StG_FEM_StandardConditionFunctions_DefaultNew( Name name ) {
+void* _StgFEM_StandardConditionFunctions_DefaultNew( Name name ) {
 	return Codelet_New(
-		StG_FEM_StandardConditionFunctions_Type,
-		_StG_FEM_StandardConditionFunctions_DefaultNew,
-		_StG_FEM_StandardConditionFunctions_Construct,
+		StgFEM_StandardConditionFunctions_Type,
+		_StgFEM_StandardConditionFunctions_DefaultNew,
+		_StgFEM_StandardConditionFunctions_Construct,
 		_Codelet_Build,
 		_Codelet_Initialise,
 		_Codelet_Execute,
@@ -126,13 +126,13 @@
 		name );
 }
 
-Index StG_FEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager ) {
-	Journal_DPrintf( StG_FEM_Debug, "In: %s( void* )\n", __func__ );
+Index StgFEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager ) {
+	Journal_DPrintf( StgFEM_Debug, "In: %s( void* )\n", __func__ );
 
-	return PluginsManager_Submit( pluginsManager, StG_FEM_StandardConditionFunctions_Type, "0", _StG_FEM_StandardConditionFunctions_DefaultNew );
+	return PluginsManager_Submit( pluginsManager, StgFEM_StandardConditionFunctions_Type, "0", _StgFEM_StandardConditionFunctions_DefaultNew );
 }
 
-void StG_FEM_StandardConditionFunctions_SolidBodyRotation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_SolidBodyRotation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	FeVariable*             feVariable         = NULL;
@@ -163,7 +163,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_PartialRotationX( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_PartialRotationX( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	FeVariable*             feVariable         = NULL;
@@ -201,7 +201,7 @@
 		*result = 0.0;
 }
 
-void StG_FEM_StandardConditionFunctions_PartialRotationY( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_PartialRotationY( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	FeVariable*             feVariable         = NULL;
@@ -240,7 +240,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_SimpleShear( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_SimpleShear( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	FeVariable*             feVariable         = NULL;
@@ -263,7 +263,7 @@
 	*result = factor * (coord[ J_AXIS ] - centre);
 }
 
-void StG_FEM_StandardConditionFunctions_Extension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_Extension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	FeVariable*             feVariable         = NULL;
@@ -287,7 +287,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_PartialLid_TopLayer( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
+void StgFEM_StandardConditionFunctions_PartialLid_TopLayer( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
 	DiscretisationContext*	context = (DiscretisationContext*)_context;
 	FeVariable*             velVar = NULL;
 	FiniteElement_Mesh*     mesh = NULL;
@@ -312,7 +312,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_LinearInterpolationLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
+void StgFEM_StandardConditionFunctions_LinearInterpolationLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
 	DiscretisationContext*	context = (DiscretisationContext*)_context;
 	FeVariable*             velVar = NULL;
 	FiniteElement_Mesh*     mesh = NULL;
@@ -337,7 +337,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_Lid_RampWithCentralMax( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
+void StgFEM_StandardConditionFunctions_Lid_RampWithCentralMax( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
 	DiscretisationContext*	context = (DiscretisationContext*)_context;
 	FeVariable*             velVar = NULL;
 	FiniteElement_Mesh*     mesh = NULL;
@@ -363,7 +363,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_SinusoidalLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
+void StgFEM_StandardConditionFunctions_SinusoidalLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
 	DiscretisationContext*	context = (DiscretisationContext*)_context;
 	FeVariable*             velVar = NULL;
 	FiniteElement_Mesh*     mesh = NULL;
@@ -387,7 +387,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_CornerOnly( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
+void StgFEM_StandardConditionFunctions_CornerOnly( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) {
 	DiscretisationContext*	context = (DiscretisationContext*)_context;
 	FeVariable*             velVar = NULL;
 	FiniteElement_Mesh*     mesh = NULL;
@@ -420,7 +420,7 @@
 		return 0.0;
 }
 
-void StG_FEM_StandardConditionFunctions_TemperatureCosineHill( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_TemperatureCosineHill( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	FeVariable*             feVariable         = NULL;
@@ -458,7 +458,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_LinearWithSinusoidalPerturbation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_LinearWithSinusoidalPerturbation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context = (DiscretisationContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	FeVariable*             feVariable = NULL;
@@ -501,7 +501,7 @@
 					    * sin( verticalWaveNumber * M_PI * coord[ J_AXIS ] ) );
 }
 
-void StG_FEM_StandardConditionFunctions_Trigonometry( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_Trigonometry( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	FeVariable*             feVariable         = NULL;
 	FiniteElement_Mesh*     mesh               = NULL;
@@ -607,7 +607,7 @@
 
 /* Initial Condition derived from Boundary Layer theory -
    taken from P. E. van Keken, S. D. King, U. R. Schmeling, U. R. Christensen, D. Neumeister, and M.-P. Doin. A comparison of methods for the modeling of thermochemical convection. Journal of Geophysical Research, 102(B10):22477-22496, october 1997. */
-void StG_FEM_StandardConditionFunctions_AnalyticalTemperatureIC( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_AnalyticalTemperatureIC( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	DiscretisationContext*	context            = (DiscretisationContext*)_context;
 	FeVariable*             feVariable         = NULL;
 	FiniteElement_Mesh*     mesh               = NULL;
@@ -665,7 +665,7 @@
 #endif
 }
 
-void StG_FEM_StandardConditionFunctions_SinusoidalExtension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_SinusoidalExtension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	FiniteElementContext *	context            = (FiniteElementContext*)_context;
 	Dictionary*             dictionary         = context->dictionary;
 	double*                 result             = (double*) _result;
@@ -684,7 +684,7 @@
 }
 
 
-void StG_FEM_StandardConditionFunctions_StepFunction( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
+void StgFEM_StandardConditionFunctions_StepFunction( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) {
 	FiniteElementContext *	context            = (FiniteElementContext*)_context;
 	FeVariable*             feVariable         = NULL;
 	FiniteElement_Mesh*     mesh               = NULL;

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/StandardConditionFunctions/StandardConditionFunctions.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -48,38 +48,38 @@
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-#ifndef __StG_FEM_StandardConditionFunctions_h__
-#define __StG_FEM_StandardConditionFunctions_h__
+#ifndef __StgFEM_StandardConditionFunctions_h__
+#define __StgFEM_StandardConditionFunctions_h__
 
-extern const Type StG_FEM_StandardConditionFunctions_Type;
+extern const Type StgFEM_StandardConditionFunctions_Type;
 
 typedef struct {
 	__Codelet
-} StG_FEM_StandardConditionFunctions;
+} StgFEM_StandardConditionFunctions;
 
-Index StG_FEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager );
+Index StgFEM_StandardConditionFunctions_Register( PluginsManager* pluginsManager );
 
-void StG_FEM_StandardConditionFunctions_SolidBodyRotation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_PartialRotationX( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_PartialRotationY( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_SimpleShear( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_Extension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_PartialLid_TopLayer( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
-void StG_FEM_StandardConditionFunctions_LinearInterpolationLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
-void StG_FEM_StandardConditionFunctions_Lid_RampWithCentralMax( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
+void StgFEM_StandardConditionFunctions_SolidBodyRotation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_PartialRotationX( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_PartialRotationY( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_SimpleShear( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_Extension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_PartialLid_TopLayer( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
+void StgFEM_StandardConditionFunctions_LinearInterpolationLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
+void StgFEM_StandardConditionFunctions_Lid_RampWithCentralMax( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
 
 
-void StG_FEM_StandardConditionFunctions_SinusoidalLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
-void StG_FEM_StandardConditionFunctions_CornerOnly( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
-void StG_FEM_StandardConditionFunctions_TemperatureCosineHill( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_LinearWithSinusoidalPerturbation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_Trigonometry( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_SinusoidalLid( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
+void StgFEM_StandardConditionFunctions_CornerOnly( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* result ) ;
+void StgFEM_StandardConditionFunctions_TemperatureCosineHill( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_LinearWithSinusoidalPerturbation( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_Trigonometry( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
 void Stg_FEM_VelicTemperatureIC( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
 void Stg_FEM_VelicTemperatureIC_SolB( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_AnalyticalTemperatureIC( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
-void StG_FEM_StandardConditionFunctions_SinusoidalExtension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_AnalyticalTemperatureIC( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_SinusoidalExtension( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
 
-void StG_FEM_StandardConditionFunctions_StepFunction( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
+void StgFEM_StandardConditionFunctions_StepFunction( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
 void StG_FEM_StandardConditionFunctions_StepFunctionProduct1( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
 void StG_FEM_StandardConditionFunctions_StepFunctionProduct2( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;
 void StG_FEM_StandardConditionFunctions_StepFunctionProduct3( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* _result ) ;

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,7 +43,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include "solA.h"
 
 const Type Velic_solA_Type = "Velic_solA";

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solA/solA.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -1,5 +1,5 @@
-#ifndef __StG_FEM_Velic_solA_h__
-#define __StG_FEM_Velic_solA_h__
+#ifndef __StgFEM_Velic_solA_h__
+#define __StgFEM_Velic_solA_h__
 
 	extern const Type Velic_solA_Type;
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solB/solB.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,7 +43,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include <assert.h>
 
 const Type Velic_solB_Type = "Velic_solB";

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,7 +43,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include <assert.h>
 #include "solCA.h"
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solCA/solCA.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,8 +40,8 @@
 ** $Id: solA.c 565 2006-05-19 02:33:01Z RobertTurnbull $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __StG_FEM_Velic_solCA_h__
-#define __StG_FEM_Velic_solCA_h__
+#ifndef __StgFEM_Velic_solCA_h__
+#define __StgFEM_Velic_solCA_h__
 
 	extern const Type Velic_solCA_Type;
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solD/solD.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,7 +43,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 const Type Velic_solD_Type = "Velic_solD";
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -43,7 +43,7 @@
 
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 #include <assert.h>
 #include "solKx.h"
 

Modified: long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.h	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/plugins/VelicAnalyticSolutions/Velic_solKx/solKx.h	2006-10-31 21:31:27 UTC (rev 5145)
@@ -40,8 +40,8 @@
 ** $Id: solA.c 565 2006-05-19 02:33:01Z RobertTurnbull $
 **
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-#ifndef __StG_FEM_Velic_solKx_h__
-#define __StG_FEM_Velic_solKx_h__
+#ifndef __StgFEM_Velic_solKx_h__
+#define __StgFEM_Velic_solKx_h__
 
 	extern const Type Velic_solKx_Type;
 

Modified: long/3D/Gale/trunk/src/StgFEM/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/src/main.c	2006-10-31 21:30:23 UTC (rev 5144)
+++ long/3D/Gale/trunk/src/StgFEM/src/main.c	2006-10-31 21:31:27 UTC (rev 5145)
@@ -44,7 +44,7 @@
 #endif
 #include <mpi.h>
 #include <StGermain/StGermain.h>
-#include <StG_FEM/StG_FEM.h>
+#include <StgFEM/StgFEM.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -82,18 +82,18 @@
 	MPI_Comm_rank( CommWorld, &rank );
 	
 	StGermain_Init( &argc, &argv );
-	StG_FEM_Init( &argc, &argv );
+	StgFEM_Init( &argc, &argv );
 	#ifdef HAVE_PYTHON
 		Py_Initialize();
 	#endif	
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
 	
-	/* StG_FEM's init message */
+	/* StgFEM's init message */
 	tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
 	Journal_Printf( /* DO NOT CHANGE OR REMOVE */
 		Journal_Register( InfoStream_Type, "Context" ), 
-		"StG_FEM revision %s. Copyright (C) 2004-2005 VPAC.\n", VERSION );
+		"StgFEM revision %s. Copyright (C) 2004-2005 VPAC.\n", VERSION );
 	Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
 	Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
 	MPI_Barrier( CommWorld ); /* Ensures copyright info always come first in output */
@@ -131,7 +131,7 @@
 		Py_Finalize();
 	#endif
 
-	StG_FEM_Finalise();
+	StgFEM_Finalise();
 	StGermain_Finalise();
 		
 	/* Close off MPI */

More information about the cig-commits mailing list