[cig-commits] commit: Fix a warning
Mercurial
hg at geodynamics.org
Thu Mar 15 12:30:28 PDT 2012
changeset: 447:744dbfab0c93
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Thu Mar 15 12:30:16 2012 -0700
files: MaterialPoints/src/SwarmVariableField.cxx SysTest/PerformanceTests/BuoyancyExample.xml
description:
Fix a warning
diff -r f9eb6157c284 -r 744dbfab0c93 MaterialPoints/src/SwarmVariableField.cxx
--- a/MaterialPoints/src/SwarmVariableField.cxx Sat Nov 26 20:50:04 2011 -0800
+++ b/MaterialPoints/src/SwarmVariableField.cxx Thu Mar 15 12:30:16 2012 -0700
@@ -126,7 +126,6 @@ void* _SwarmVariableField_DefaultNew( Na
void _SwarmVariableField_AssignFromXML( void* swarmVariableField, Stg_ComponentFactory* cf, void* data ) {
SwarmVariableField* self = (SwarmVariableField*)swarmVariableField;
- IntegrationPointsSwarm* integrationSwarm;
Variable_Register* variable_Register;
Name swarmVarName;
MaterialPointsSwarm* materialSwarm;
@@ -138,8 +137,7 @@ void _SwarmVariableField_AssignFromXML(
swarmVarName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"swarmVariable", "" );
materialSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"MaterialSwarm", MaterialPointsSwarm, True, data );
- integrationSwarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", IntegrationPointsSwarm, True, NULL );
- assert( integrationSwarm );
+ assert(Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", IntegrationPointsSwarm, True, NULL ));
_SwarmVariableField_Init( self, variable_Register, swarmVarName, materialSwarm );
}
diff -r f9eb6157c284 -r 744dbfab0c93 SysTest/PerformanceTests/BuoyancyExample.xml
--- a/SysTest/PerformanceTests/BuoyancyExample.xml Sat Nov 26 20:50:04 2011 -0800
+++ b/SysTest/PerformanceTests/BuoyancyExample.xml Thu Mar 15 12:30:16 2012 -0700
@@ -1,1 +1,144 @@
-../../Apps/BuoyancyBenchmark/BuoyancyExample.xml
\ No newline at end of file
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <list name="import" mergeType="merge">
+ <param>PICellerator</param>
+ </list>
+
+ <list name="plugins" mergeType="Replace">
+ <struct>
+ <param name="Type">StgFEM_FrequentOutput</param>
+ <param name="Context">context</param>
+ </struct>
+ <struct>
+ <param name="Type">StgFEM_CPUTime</param>
+ <param name="Context">context</param>
+ </struct>
+ <struct>
+ <param name="Type">PICellerator_AnalyticPressure</param>
+ <param name="Context">context</param>
+ </struct>
+ </list>
+
+ <!--param name="extensionReferenceHeight">maxY</param-->
+
+ <!-- Component Stuff -->
+ <include>StgFEM/ConstantMesh.xml </include>
+ <include>StgFEM/LinearMesh.xml </include>
+ <include>StgFEM/VelocityField.xml </include>
+ <include>StgFEM/PressureField.xml </include>
+ <include>StgFEM/GaussSwarm.xml </include>
+ <include>StgFEM/TimeIntegrator.xml </include>
+ <include>PICellerator/MaterialPointSwarm.xml </include>
+ <include>PICellerator/StokesFlowUzawa.xml </include>
+ <!--include>Underworld/StokesFlowUzawaCompressible.xml </include-->
+
+ <param name="gravity">9.81</param>
+
+ <struct name="pluginData">
+ <list name="NumericFields">
+ <param>PressureField</param> <param>0</param>
+ </list>
+ <param name="IntegrationSwarm">gaussSwarm</param>
+ <param name="ConstantMesh">constantMesh</param>
+ <param name="ElementMesh">linearMesh</param>
+ <param name="normaliseByAnalyticSolution">true</param>
+ <param name="useReferenceSolutionFromFile">false</param>
+ <param name="appendToAnalysisFile">false</param>
+ <param name="Context">context</param>
+ </struct>
+
+ <!-- Rheology Components -->
+ <struct name="components" mergeType="merge">
+ <struct name="context">
+ <param name="Type">PICelleratorContext</param>
+ </struct>
+ <struct name="buoyancyForceTerm">
+ <param name="Type">BuoyancyForceTerm</param>
+ <param name="ForceVector">mom_force</param>
+ <param name="TemperatureField">TemperatureField</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="gravity">gravity</param>
+ </struct>
+
+ <!-- Background Material Stuff -->
+ <!--struct name="backgroundShape">
+ <param name="Type">Everywhere</param>
+ </struct>
+ <struct name="backgroundViscosity">
+ <param name="Type">MaterialViscosity</param>
+ <param name="eta0">1.0</param>
+ </struct>
+ <struct name="compressible">
+ <param name="Type">Compressible</param>
+ <param name="GeometryMesh">linearMesh</param>
+ <param name="StiffnessMatrix">c_matrix</param>
+ <param name="Swarm">picIntegrationPoints</param>
+ <param name="oneOnLambda">10.0</param>
+ </struct>
+
+ <struct name="background">
+ <param name="Type">RheologyMaterial</param>
+ <param name="Shape">backgroundShape</param>
+ <param name="Compressible">compressible</param>
+ <param name="density">0.0</param>
+ <param name="Rheology">backgroundViscosity</param>
+ </struct-->
+
+ <struct name="layerShape">
+ <param name="Type">Box</param>
+ <param name="startX"> minX </param> <param name="endX"> maxX </param>
+ <param name="startY"> minY </param> <param name="endY"> maxY </param>
+ <param name="startZ"> minZ </param> <param name="endZ"> maxZ </param>
+ </struct>
+
+ <struct name="layer">
+ <param name="Type">Material</param>
+ <param name="Shape">layerShape</param>
+ <param name="density">1.36</param>
+ </struct>
+
+ <struct name="materialSwarmParticleLayout" mergeType="replace">
+ <param name="Type">GaussParticleLayout</param>
+ </struct>
+
+ </struct>
+
+ <!-- Simulation control -->
+ <param name="maxTimeSteps"> 1 </param>
+ <param name="outputPath"> ./output </param>
+ <param name="dumpEvery"> 1 </param>
+
+ <param name="particlesPerCell"> 20 </param>
+
+ <!-- Non-linear stuff -->
+ <param name="nonLinearMaxIterations"> 20 </param>
+
+ <!-- Journal Control -->
+ <param name="journal.info.Context-verbose">True</param>
+ <param name="journal-level.info.Stg_ComponentFactory">2</param>
+ <param name="journal.debug">t</param>
+ <param name="journal-enable-branch.debug.StgFEM">t</param>
+ <param name="journal-level-branch.debug.StgFEM"> 2 </param>
+
+ <!-- Geometry & Mesh setup -->
+ <param name="dim"> 2 </param>
+ <param name="elementResI"> 50</param>
+ <param name="elementResJ"> 50 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="minX"> 0.0 </param>
+ <param name="minY"> 0.0 </param>
+ <param name="minZ"> 0.0 </param>
+ <param name="maxX"> 1.0 </param>
+ <param name="maxY"> 0.8 </param>
+ <param name="maxZ"> 1 </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <!-- Set up BCs and ICs -->
+ <include>PICellerator/velocityBCs.freeslip.xml</include>
+
+</StGermainData>
+
More information about the CIG-COMMITS
mailing list