[cig-commits] commit: Adding simple shear test in 3D
Mercurial
hg at geodynamics.org
Mon Nov 24 11:30:54 PST 2008
changeset: 86:0b9d91635559
user: RobertTurnbull
date: Tue Apr 08 05:54:05 2008 +0000
files: Apps/LidDrivenPIC/AnalyticShear.xml Apps/LidDrivenPIC/AnalyticShearXZ.xml Apps/LidDrivenPIC/AnalyticShearZ.xml Apps/LidDrivenPIC/Viewport.xml Apps/LidDrivenPIC/Visualisation.xml Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-Analytic-2D.0of1.PressureField-ErrorFile.expected Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-AnalyticXZ-3D.0of1.PressureField-ErrorFile.expected Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-AnalyticXZ-3D.0of1.VelocityField-ErrorFile.expected Apps/LidDrivenPIC/tests/testSimpleShearPIC-AnalyticXZ-3D.0of1.sh MaterialPoints/src/SwarmAdvector.c
description:
Adding simple shear test in 3D
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/AnalyticShear.xml
--- a/Apps/LidDrivenPIC/AnalyticShear.xml Mon Apr 07 00:37:45 2008 +0000
+++ b/Apps/LidDrivenPIC/AnalyticShear.xml Tue Apr 08 05:54:05 2008 +0000
@@ -10,5 +10,6 @@
</list>
<param name="VelocityField-Tolerance">1e-6</param>
+ <param name="PressureField-Tolerance">1e-5</param>
</StGermainData>
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/AnalyticShearXZ.xml
--- a/Apps/LidDrivenPIC/AnalyticShearXZ.xml Mon Apr 07 00:37:45 2008 +0000
+++ b/Apps/LidDrivenPIC/AnalyticShearXZ.xml Tue Apr 08 05:54:05 2008 +0000
@@ -3,16 +3,16 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
- <include>./LidDrivenPIC.xml</include>
+ <include>./AnalyticShear.xml</include>
<include>./velocityBCs.shearXZ.xml</include>
- <list name="plugins">
- <param>StgFEM_LinearVelocityAnalytic</param>
- </list>
- <param name="VelocityField-Tolerance">1e-6</param>
<param name="dim">3</param>
<param name="elementResI">10</param>
<param name="elementResJ">10</param>
<param name="elementResK">10</param>
+
+ <!-- I don't know why this should be less accurate than the 2D solution -->
+ <param name="VelocityField-Tolerance">1e-4</param>
+ <param name="PressureField-Tolerance">1e-2</param>
</StGermainData>
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/AnalyticShearZ.xml
--- a/Apps/LidDrivenPIC/AnalyticShearZ.xml Mon Apr 07 00:37:45 2008 +0000
+++ b/Apps/LidDrivenPIC/AnalyticShearZ.xml Tue Apr 08 05:54:05 2008 +0000
@@ -10,6 +10,7 @@
</list>
<param name="VelocityField-Tolerance">1e-6</param>
+ <param name="PressureField-Tolerance">1e-5</param>
<param name="dim">3</param>
<param name="elementResI">10</param>
<param name="elementResJ">10</param>
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/Viewport.xml
--- a/Apps/LidDrivenPIC/Viewport.xml Mon Apr 07 00:37:45 2008 +0000
+++ b/Apps/LidDrivenPIC/Viewport.xml Tue Apr 08 05:54:05 2008 +0000
@@ -1,4 +1,3 @@
-<!-- Rayleigh-Taylor lucifer viewports -->
<!-- DTD to validate against -->
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
@@ -15,6 +14,11 @@
<param name="colours">Black Grey White Orange Red</param>
<param name="dynamicRange">true</param>
</struct>
+ <struct name="velocityMagnitudeColourMap" mergeType="replace">
+ <param name="Type">lucColourMap</param>
+ <param name="colours">Purple Blue Green Yellow Orange Red Black</param>
+ <param name="dynamicRange">true</param>
+ </struct>
<!-- Drawing Objects -->
<struct name="pressureColourBar" mergeType="replace">
<param name="Type">lucColourBar</param>
@@ -25,35 +29,50 @@
<param name="FieldVariable">PressureField</param>
<param name="ColourMap">pressureColourMap</param>
</struct>
- <struct name="velocityArrows">
+ <struct name="velocityArrows" mergeType="replace">
<param name="Type">lucVectorArrows</param>
<param name="VectorVariable">VelocityField</param>
<param name="Colour">black</param>
<param name="arrowHeadSize">0.15</param>
<param name="lengthScale">0.15</param>
- </struct>
+ </struct>
+ <struct name="velocitySwarmVariable">
+ <param name="Type">FeSwarmVariable</param>
+ <param name="Swarm">materialSwarm</param> <!-- THIS IS THE WRONG SWARM - DOESN'T GET XI's CORRECTLY -->
+ <param name="FeVariable">VelocityMagnitudeField</param>
+ </struct>
<struct name="particleDots" mergeType="replace">
<param name="Type">lucSwarmViewer</param>
<param name="Swarm">materialSwarm</param>
- <param name="colour">black</param>
+ <param name="ColourVariable">velocitySwarmVariable</param>
+ <param name="ColourMap">velocityMagnitudeColourMap</param>
<param name="pointSize">2.0</param>
</struct>
<struct name="border" mergeType="replace">
<param name="Type">lucFieldVariableBorder</param>
<param name="FieldVariable">VelocityField</param>
</struct>
+ <struct name="velocityMagnitudeColourBar" mergeType="replace">
+ <param name="Type">lucColourBar</param>
+ <param name="ColourMap">velocityMagnitudeColourMap</param>
+ </struct>
+ <struct name="particlesAndVelocityMagTitle" mergeType="replace">
+ <param name="Type">lucTitle</param>
+ <param name="string">Particles and Velocity Mag</param>
+ </struct>
<!-- Viewport -->
- <struct name="SolutionViewport">
+ <struct name="ParticlesAndVelocityMagVP">
<param name="Type">lucViewport</param>
<param name="Camera">camera</param>
<list name="DrawingObject">
<!--
<param>pressureMap</param>
-->
+ <param>particlesAndVelocityMagTitle</param>
<param>particleDots</param>
<param>velocityArrows</param>
<param>border</param>
- <param>pressureColourBar</param>
+ <param>velocityMagnitudeColourBar</param>
</list>
</struct>
</struct>
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/Visualisation.xml
--- a/Apps/LidDrivenPIC/Visualisation.xml Mon Apr 07 00:37:45 2008 +0000
+++ b/Apps/LidDrivenPIC/Visualisation.xml Tue Apr 08 05:54:05 2008 +0000
@@ -7,7 +7,7 @@
<include>gLucifer/window.xml</include>
<struct name="components" mergeType="merge">
<struct name="window" mergeType="merge">
- <param name="Viewport">SolutionViewport</param>
+ <param name="Viewport">ParticlesAndVelocityMagVP</param>
</struct>
</struct>
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-Analytic-2D.0of1.PressureField-ErrorFile.expected
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-Analytic-2D.0of1.PressureField-ErrorFile.expected Tue Apr 08 05:54:05 2008 +0000
@@ -0,0 +1,11 @@
+Timestep 0: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 1: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 2: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 5: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 6: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 7: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 8: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 9: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
+Timestep 10: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 1e-05.
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-AnalyticXZ-3D.0of1.PressureField-ErrorFile.expected
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-AnalyticXZ-3D.0of1.PressureField-ErrorFile.expected Tue Apr 08 05:54:05 2008 +0000
@@ -0,0 +1,11 @@
+Timestep 0: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 1: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 2: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 3: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 4: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 5: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 6: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 7: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 8: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 9: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
+Timestep 10: Total integrated value of 'PressureField-ErrorMagnitudeField' is within a tolerance 0.01.
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-AnalyticXZ-3D.0of1.VelocityField-ErrorFile.expected
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Apps/LidDrivenPIC/tests/expected/testSimpleShearPIC-AnalyticXZ-3D.0of1.VelocityField-ErrorFile.expected Tue Apr 08 05:54:05 2008 +0000
@@ -0,0 +1,11 @@
+Timestep 0: Total integrated value of 'VelocityField-ErrorMagnitudeField' is outside a tolerance 0.0001.
+Timestep 1: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 2: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 3: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 4: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 5: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 6: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 7: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 8: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 9: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
+Timestep 10: Total integrated value of 'VelocityField-ErrorMagnitudeField' is within a tolerance 0.0001.
diff -r 9830278ecde3 -r 0b9d91635559 Apps/LidDrivenPIC/tests/testSimpleShearPIC-AnalyticXZ-3D.0of1.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Apps/LidDrivenPIC/tests/testSimpleShearPIC-AnalyticXZ-3D.0of1.sh Tue Apr 08 05:54:05 2008 +0000
@@ -0,0 +1,52 @@
+#!/bin/sh
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##
+## Copyright (C), 2003-2006, Victorian Partnership for Advanced Computing (VPAC) Ltd, 110 Victoria Street,
+## Melbourne, 3053, Australia.
+## Copyright (c) 2005-2006, Monash Cluster Computing, Building 28, Monash University Clayton Campus,
+## Victoria, 3800, 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
+##
+## Contributors:
+## Robert Turnbull, Research Assistant, Monash University. (robert.turnbull at sci.monash.edu.au)
+## Patrick D. Sunter, Software Engineer, VPAC. (patrick at vpac.org)
+## Alan H. Lo, Computational Engineer, VPAC. (alan at vpac.org)
+## Stevan M. Quenette, Senior Software Engineer, VPAC. (steve at vpac.org)
+## David May, PhD Student, Monash University (david.may at sci.monash.edu.au)
+## Vincent Lemiale, Postdoctoral Fellow, Monash University. (vincent.lemiale at sci.monash.edu.au)
+## Julian Giordani, Research Assistant, Monash University. (julian.giordani 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)
+## Raquibul Hassan, Computational Engineer, VPAC. (raq at vpac.org)
+## David Stegman, Postdoctoral Fellow, Monash University. (david.stegman at sci.monash.edu.au)
+## Wendy Sharples, PhD Student, Monash University (wendy.sharples 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: testSimpleShearPIC-AnalyticXZ-3D.0of1.sh 559 2008-04-08 05:54:05Z RobertTurnbull $
+##
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+ TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+runAndHandleSystemTestStdLocations "StGermain ../AnalyticShearXZ.xml --maxTimeSteps=10" "$0" "$@"
diff -r 9830278ecde3 -r 0b9d91635559 MaterialPoints/src/SwarmAdvector.c
--- a/MaterialPoints/src/SwarmAdvector.c Mon Apr 07 00:37:45 2008 +0000
+++ b/MaterialPoints/src/SwarmAdvector.c Tue Apr 08 05:54:05 2008 +0000
@@ -38,7 +38,7 @@
** 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: SwarmAdvector.c 556 2008-03-28 06:41:03Z RobertTurnbull $
+** $Id: SwarmAdvector.c 559 2008-04-08 05:54:05Z RobertTurnbull $
**
**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -154,7 +154,7 @@ void _SwarmAdvector_Init(
/* Test if mesh is periodic and a periodic boundaries manager hasn't been given */
if ( !periodicBCsManager && Stg_Class_IsInstance( swarm->mesh->generator, CartesianGenerator_Type ) ) {
CartesianGenerator* cartesianGenerator = (CartesianGenerator*) swarm->mesh->generator;
- if ( cartesianGenerator->periodic[ I_AXIS ] || cartesianGenerator->periodic[ I_AXIS ] || cartesianGenerator->periodic[ I_AXIS ] ) {
+ if ( cartesianGenerator->periodic[ I_AXIS ] || cartesianGenerator->periodic[ J_AXIS ] || cartesianGenerator->periodic[ K_AXIS ] ) {
/* Create a periodicBCsManager if there isn't one already */
periodicBCsManager = PeriodicBoundariesManager_New( "periodicBCsManager", (Mesh*)swarm->mesh, (Swarm*)swarm, NULL );
}
More information about the CIG-COMMITS
mailing list