[cig-commits] r3948 - in long/3D/Gale/trunk/src/StgFEM: .
Apps/EnergySolver Apps/EnergySolver/tests
Apps/EnergySolver/tests/AdvDiffSteadyState1D
Apps/EnergySolver/tests/expected
walter at geodynamics.org
walter at geodynamics.org
Thu Jul 6 02:08:04 PDT 2006
Author: walter
Date: 2006-07-06 02:08:03 -0700 (Thu, 06 Jul 2006)
New Revision: 3948
Added:
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1.0of1.TemperatureField-ErrorFile.expected
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1.0of1.sh
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D.xml
Removed:
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AnalyticTemperatureField.xml
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureAndVelocityArrowsVP.xml
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureSurfaceVP.xml
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml
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
Log:
r664 at earth: boo | 2006-07-06 02:04:20 -0700
r657 at earth (orig r598): RobertTurnbull | 2006-06-30 19:31:45 -0700
Adding 1D Steady State analytic test for advection diffusion solver.
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:655
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:596
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:664
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:598
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureAndVelocityArrowsVP.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureAndVelocityArrowsVP.xml 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureAndVelocityArrowsVP.xml 2006-07-06 09:08:03 UTC (rev 3948)
@@ -4,44 +4,46 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<struct name="components" mergeType="merge">
- <struct name="temperatureVPCamera">
+ <struct name="camera" mergeType="replace">
<param name="Type">lucCamera</param>
<param name="CentreFieldVariable">TemperatureField</param>
<param name="coordZ">1.5</param>
</struct>
- <struct name="temperatureColourMap">
+ <struct name="temperatureColourMap" mergeType="replace">
<param name="Type">lucColourMap</param>
- <param name="colours">Blue White Red</param>
- <param name="dynamicRange">t</param>
+ <param name="colours">#0B0133 White #B7210B</param>
+ <param name="dynamicRange">True</param>
</struct>
<!-- Drawing Objects -->
<struct name="temperatureMap">
<param name="Type">lucScalarField</param>
<param name="FieldVariable">TemperatureField</param>
<param name="ColourMap">temperatureColourMap</param>
+ <param name="resolution">128</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 name="temperatureBorder">
+ <struct name="border" mergeType="replace">
<param name="Type">lucFieldVariableBorder</param>
<param name="FieldVariable">TemperatureField</param>
</struct>
- <struct name="temperatureColourBar">
+ <struct name="temperatureColourBar" mergeType="replace">
<param name="Type">lucColourBar</param>
<param name="ColourMap">temperatureColourMap</param>
</struct>
<!-- Put these althogether in a viewport -->
<struct name="TemperatureAndVelocityArrowsVP">
<param name="Type">lucViewport</param>
- <param name="Camera">temperatureVPCamera</param>
+ <param name="Camera">camera</param>
+ <param name="compositeEachObject">t</param>
<list name="DrawingObject">
<param>temperatureMap</param>
- <param>temperatureBorder</param>
+ <param>border</param>
<param>velocityArrows</param>
<param>temperatureColourBar</param>
</list>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureSurfaceVP.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureSurfaceVP.xml 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/TemperatureSurfaceVP.xml 2006-07-06 09:08:03 UTC (rev 3948)
@@ -16,9 +16,10 @@
<!--
-->
</struct>
- <struct name="temperatureSurfaceColourMap">
+ <struct name="temperatureColourMap" mergeType="replace">
<param name="Type">lucColourMap</param>
- <param name="colours">Blue White Red</param>
+ <param name="colours">#0B0133 White #B7210B</param>
+ <param name="dynamicRange">True</param>
</struct>
<!-- Drawing Objects -->
<struct name="temperatureSurface">
@@ -34,9 +35,9 @@
<param name="wireframe">true</param>
<param name="scaleHeight">0.5</param>
</struct>
- <struct name="temperatureSurfaceColourBar">
+ <struct name="temperatureColourBar" mergeType="replace">
<param name="Type">lucColourBar</param>
- <param name="ColourMap">temperatureSurfaceColourMap</param>
+ <param name="ColourMap">temperatureColourMap</param>
</struct>
<!-- Put these althogether in a viewport -->
<struct name="TemperatureSurfaceVP">
@@ -45,7 +46,7 @@
<list name="DrawingObject">
<param>temperatureSurface</param>
<param>temperatureSurfaceMesh</param>
- <param>temperatureSurfaceColourBar</param>
+ <param>temperatureColourBar</param>
</list>
</struct>
</struct>
Added: 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-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c 2006-07-06 09:08:03 UTC (rev 3948)
@@ -0,0 +1,124 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**
+** 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 <StGermain/StGermain.h>
+#include <StG_FEM/StG_FEM.h>
+
+const Type AdvDiffSteadyState1D_Type = "AdvDiffSteadyState1D";
+
+typedef struct {
+ __AnalyticSolution
+ AdvDiffResidualForceTerm* residual;
+ double velocity;
+ Axis velocityDirection;
+ double A;
+ double B;
+ double c;
+} AdvDiffSteadyState1D;
+
+void AdvDiffSteadyState1D_TemperatureFunction( void* analyticSolution, FeVariable* analyticFeVariable, double* coord, double* temperature ) {
+ AdvDiffSteadyState1D* self = (AdvDiffSteadyState1D*)analyticSolution;
+ double exponent;
+ double kappa = self->residual->defaultDiffusivity;
+
+ exponent = self->velocity / kappa * ( coord[ self->velocityDirection ] - self->c );
+ *temperature = self->A * exp( exponent ) + self->B;
+}
+
+void AdvDiffSteadyState1D_TemperatureBC( Node_LocalIndex node_lI, Variable_Index var_I, void* _context, void* temperature ){
+ DiscretisationContext* context = (DiscretisationContext*)_context;
+ AdvDiffSteadyState1D* self = Stg_ComponentFactory_ConstructByName( context->CF, AdvDiffSteadyState1D_Type, AdvDiffSteadyState1D, True );
+ FeVariable* feVariable = NULL;
+ FiniteElement_Mesh* mesh = NULL;
+ double* coord;
+
+ feVariable = (FeVariable*)FieldVariable_Register_GetByName( context->fieldVariable_Register, "TemperatureField" );
+ mesh = feVariable->feMesh;
+ coord = Mesh_CoordAt( mesh, node_lI );
+
+ AdvDiffSteadyState1D_TemperatureFunction( self, NULL, coord, temperature );
+}
+
+void _AdvDiffSteadyState1D_Construct( void* analyticSolution, Stg_ComponentFactory* cf ) {
+ AdvDiffSteadyState1D* self = (AdvDiffSteadyState1D*)analyticSolution;
+ FeVariable* temperatureField;
+ AbstractContext* context;
+ ConditionFunction* condFunc;
+
+ _AnalyticSolution_Construct( self, cf );
+
+ temperatureField = Stg_ComponentFactory_ConstructByName( cf, "TemperatureField", FeVariable, True );
+ AnalyticSolution_CreateAnalyticField( self, temperatureField, AdvDiffSteadyState1D_TemperatureFunction );
+
+ self->residual = Stg_ComponentFactory_ConstructByName( cf, "defaultResidualForceTerm", AdvDiffResidualForceTerm, True );
+
+ self->velocity = Stg_ComponentFactory_GetRootDictDouble( cf, "velocity", 1.0 );
+ self->A = Stg_ComponentFactory_GetRootDictDouble( cf, "A", 1.0 );
+ self->B = Stg_ComponentFactory_GetRootDictDouble( cf, "B", 0.0 );
+ self->c = Stg_ComponentFactory_GetRootDictDouble( cf, "c", 0.0 );
+
+ context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True );
+ condFunc = ConditionFunction_New( AdvDiffSteadyState1D_TemperatureBC, "AnalyticSolutionFunction" );
+ ConditionFunction_Register_Add( context->condFunc_Register, condFunc );
+}
+
+void* _AdvDiffSteadyState1D_DefaultNew( Name name ) {
+ return (void*) _AnalyticSolution_New(
+ sizeof(AdvDiffSteadyState1D),
+ AdvDiffSteadyState1D_Type,
+ _AnalyticSolution_Delete,
+ _AnalyticSolution_Print,
+ _AnalyticSolution_Copy,
+ _AdvDiffSteadyState1D_DefaultNew,
+ _AdvDiffSteadyState1D_Construct,
+ _AnalyticSolution_Build,
+ _AnalyticSolution_Initialise,
+ _AnalyticSolution_Execute,
+ _AnalyticSolution_Destroy,
+ name );
+}
+
+/* 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 ) {
+ /* 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 );
+}
+
Property changes on: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate Author Id
Name: svn:eol-style
+ native
Added: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/makefile 2006-07-06 09:08:03 UTC (rev 3948)
@@ -0,0 +1,59 @@
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+##
+## 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: makefile 535 2006-04-11 13:07:34Z PatrickSunter $
+##
+##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+SHELL := $(shell which bash)
+PROJ_ROOT := $(shell until test -r ./Makefile.system ; do cd .. ; done ; echo `pwd`)
+
+include ${PROJ_ROOT}/Makefile.system
+
+modName := $(shell basename `pwd` )
+modName := $(shell echo ${modName} | cut -c 1 | tr '[:lower:]' '[:upper:]' )$(shell echo ${modName} | cut -c 2- )
+
+mod = ${PROJECT}_${modName}
+includes = ${PROJECT}/${modName}
+
+SRCS = $(wildcard *.c)
+HDRS = $(wildcard *.h)
+
+packages = STGERMAIN PETSC MPI XML
+EXTERNAL_LIBS = -lStG_FEM
+
+include ${PROJ_ROOT}/Makefile.vmake
Deleted: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AnalyticTemperatureField.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AnalyticTemperatureField.xml 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AnalyticTemperatureField.xml 2006-07-06 09:08:03 UTC (rev 3948)
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
-<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
-
- <param name="TemperatureField-Tolerance">0.0005</param>
-
-</StGermainData>
Modified: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/analyticHomogeneousNaturalBCs.xml 2006-07-06 09:08:03 UTC (rev 3948)
@@ -8,4 +8,7 @@
<list name="plugins" mergeType="merge">
<param>StG_FEM_HomogeneousNaturalBCs</param>
</list>
+
+ <param name="TemperatureField-Tolerance">0.0005</param>
+
</StGermainData>
Added: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1.0of1.TemperatureField-ErrorFile.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1.0of1.TemperatureField-ErrorFile.expected 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1.0of1.TemperatureField-ErrorFile.expected 2006-07-06 09:08:03 UTC (rev 3948)
@@ -0,0 +1,13 @@
+Timestep 0: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 5: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 10: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 15: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 20: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 25: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 30: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 35: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 40: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 45: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 50: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 55: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 1e-05.
+Timestep 60: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is within a tolerance 1e-05.
Added: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1.0of1.sh 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1.0of1.sh 2006-07-06 09:08:03 UTC (rev 3948)
@@ -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 "StG_FEM ../EnergySolver2D.xml testSteadyState1D.xml" "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ LastChangedDate Author Id
Name: svn:eol-style
+ native
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-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of1.sh 2006-07-06 09:08:03 UTC (rev 3948)
@@ -46,4 +46,4 @@
done
. ${TEST_SCRIPT}
-runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml ./homogeneousNaturalBCs.xml AnalyticTemperatureField.xml analyticHomogeneousNaturalBCs.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StG_FEM ../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-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-homogeneousNatural.0of2.sh 2006-07-06 09:08:03 UTC (rev 3948)
@@ -46,4 +46,4 @@
done
. ${TEST_SCRIPT}
-runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml ./homogeneousNaturalBCs.xml AnalyticTemperatureField.xml analyticHomogeneousNaturalBCs.xml" "$0" "$@"
+runAndHandleSystemTestStdLocations "StG_FEM ../EnergySolver2D.xml ./homogeneousNaturalBCs.xml analyticHomogeneousNaturalBCs.xml" "$0" "$@"
Added: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D.xml 2006-07-06 09:06:35 UTC (rev 3947)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D.xml 2006-07-06 09:08:03 UTC (rev 3948)
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
+<!-- A StGermain input file -->
+<!-- DTD to validate against -->
+<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
+
+ <list name="plugins" mergeType="merge">
+ <param>StG_FEM_AdvDiffSteadyState1D</param>
+ </list>
+
+ <param name="defaultDiffusivity"> 1 </param>
+ <param name="A"> 0.5 </param>
+ <param name="B"> 0.0 </param>
+ <param name="c"> 0.0 </param>
+ <param name="TemperatureField-Tolerance"> 1e-5 </param>
+
+ <param name="maxTimeSteps"> 60 </param>
+ <param name="dim"> 2 </param>
+ <param name="shadowDepth"> 1 </param>
+ <param name="elementResI"> 10 </param>
+ <param name="elementResJ"> 10 </param>
+ <param name="elementResK"> 1 </param>
+ <param name="minX"> 0.0f </param>
+ <param name="minY"> 0.0f </param>
+ <param name="minZ"> 0.0f </param>
+ <param name="maxX"> 1.0f </param>
+ <param name="maxY"> 1.0f </param>
+ <param name="maxZ"> 1.0f </param>
+ <param name="allowUnbalancing"> True </param>
+
+ <struct name="components" mergeType="merge">
+ <struct name="middleNodesShape">
+ <param name="Type">Box</param>
+ <param name="startX"> 0.49 </param> <param name="endX"> 0.51 </param>
+ <param name="startY"> -1e9 </param> <param name="endY"> 1e9 </param>
+ <param name="startZ"> -1e9 </param> <param name="endZ"> 1e9 </param>
+ </struct>
+ </struct>
+
+ <struct name="velocityICs" mergeType="replace">
+ <param name="type">CompositeVC</param>
+ <list name="vcList">
+ <struct>
+ <param name="type"> AllNodesVC </param>
+ <list name="variables">
+ <struct>
+ <param name="name">vx</param>
+ <param name="type"> value </param>
+ <param name="value"> 1.0 </param>
+ </struct>
+ </list>
+ </struct>
+ </list>
+ </struct>
+
+ <struct name="temperatureBCs" mergeType="replace">
+ <param name="type">CompositeVC</param>
+ <list name="vcList">
+ <struct>
+ <param name="type"> WallVC </param>
+ <param name="wall"> left </param>
+ <list name="variables">
+ <struct>
+ <param name="name">temperature</param>
+ <param name="type"> func </param>
+ <param name="value"> AnalyticSolutionFunction </param>
+ </struct>
+ </list>
+ </struct>
+ <struct>
+ <param name="type"> ShapeVC </param>
+ <param name="Shape"> middleNodesShape </param>
+ <list name="variables">
+ <struct>
+ <param name="name">temperature</param>
+ <param name="type"> func </param>
+ <param name="value"> AnalyticSolutionFunction </param>
+ </struct>
+ </list>
+ </struct>
+ <struct>
+ <param name="type"> WallVC </param>
+ <param name="wall"> right </param>
+ <list name="variables">
+ <struct>
+ <param name="name">temperature</param>
+ <param name="type"> func </param>
+ <param name="value"> AnalyticSolutionFunction </param>
+ </struct>
+ </list>
+ </struct>
+ </list>
+ </struct>
+
+</StGermainData>
More information about the cig-commits
mailing list