[cig-commits] r4157 - in long/3D/Gale/trunk/src/StgFEM: .
Apps/EnergySolver/tests Apps/EnergySolver/tests/AdvDiffSteadyState1D
Apps/EnergySolver/tests/expected
walter at geodynamics.org
walter at geodynamics.org
Tue Aug 1 01:54:32 PDT 2006
Author: walter
Date: 2006-08-01 01:54:31 -0700 (Tue, 01 Aug 2006)
New Revision: 4157
Added:
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.TemperatureField-ErrorFile.expected
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1-x.0of1.TemperatureField-ErrorFile.expected
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1-y.0of1.TemperatureField-ErrorFile.expected
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/testSteadyState1D-x.xml
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-y.xml
Removed:
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
Modified:
long/3D/Gale/trunk/src/StgFEM/
long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c
Log:
r721 at earth: boo | 2006-08-01 01:52:53 -0700
r711 at earth (orig r615): RobertTurnbull | 2006-07-20 23:10:25 -0700
Adding a couple of extra 1D Steady State tests for Energy Solver
1 test in the y direction
1 test using a different diffusivity
Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
- 38867592-cf10-0410-9e16-a142ea72ac34:/cig:703
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:614
+ 38867592-cf10-0410-9e16-a142ea72ac34:/cig:721
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:615
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-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/AdvDiffSteadyState1D/AdvDiffSteadyState1D.c 2006-08-01 08:54:31 UTC (rev 4157)
@@ -41,6 +41,7 @@
#include <StGermain/StGermain.h>
#include <StG_FEM/StG_FEM.h>
+#include <string.h>
const Type AdvDiffSteadyState1D_Type = "AdvDiffSteadyState1D";
@@ -77,6 +78,45 @@
AdvDiffSteadyState1D_TemperatureFunction( self, NULL, coord, temperature );
}
+
+void _AdvDiffSteadyState1D_Build( void* analyticSolution, void* data ) {
+ AdvDiffSteadyState1D* self = (AdvDiffSteadyState1D*)analyticSolution;
+ FeVariable* velocityField = Stg_CheckType( self->residual->velocityField, FeVariable );
+ CompositeVC* velocityICs = Stg_CheckType( velocityField->ics, CompositeVC );
+ Stream* errorStream = Journal_MyStream( Error_Type, self );
+ AllNodesVC* allNodesVC;
+ AllNodesVC_Entry* vcEntry;
+
+ _AnalyticSolution_Build( self, data );
+
+ /* Get AllNodes Variable Condition */
+ Stg_Component_Build( velocityICs, data, False );
+ Journal_Firewall( velocityICs->itemCount == 1, errorStream,
+ "Velocity Field needs to have one and only one Boundary Condition.\n"
+ "Currently it has %d types of VariableConditions.\n", velocityICs->itemCount );
+ allNodesVC = Stg_CheckType( velocityICs->itemTbl[ 0 ], AllNodesVC );
+
+ /* Get Variable Condition entry */
+ Journal_Firewall( allNodesVC->_entryCount == 1, errorStream,
+ "Velocity Field has more than one Boundary Condition.\n"
+ "Currently it has %d VariableCondition entries.\n", allNodesVC->_entryCount );
+ vcEntry = &allNodesVC->_entryTbl[0];
+
+ /* Get Velocity Direction from Variable Condition */
+ if ( strcmp( vcEntry->varName, "vx" ) == 0 ) {
+ self->velocityDirection = I_AXIS;
+ }
+ else if ( strcmp( vcEntry->varName, "vy" ) == 0 ) {
+ self->velocityDirection = J_AXIS;
+ }
+ else if ( strcmp( vcEntry->varName, "vz" ) == 0 ) {
+ self->velocityDirection = K_AXIS;
+ }
+ else {
+ Journal_Firewall( False, errorStream, "Cannot recognise Boundary Condition: %s.\n", vcEntry->varName );
+ }
+}
+
void _AdvDiffSteadyState1D_Construct( void* analyticSolution, Stg_ComponentFactory* cf ) {
AdvDiffSteadyState1D* self = (AdvDiffSteadyState1D*)analyticSolution;
FeVariable* temperatureField;
@@ -98,6 +138,7 @@
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 ) {
@@ -109,7 +150,7 @@
_AnalyticSolution_Copy,
_AdvDiffSteadyState1D_DefaultNew,
_AdvDiffSteadyState1D_Construct,
- _AnalyticSolution_Build,
+ _AdvDiffSteadyState1D_Build,
_AnalyticSolution_Initialise,
_AnalyticSolution_Execute,
_AnalyticSolution_Destroy,
Added: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.TemperatureField-ErrorFile.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.TemperatureField-ErrorFile.expected 2006-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.TemperatureField-ErrorFile.expected 2006-08-01 08:54:31 UTC (rev 4157)
@@ -0,0 +1,13 @@
+Timestep 0: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 5: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 10: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 15: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 20: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 25: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 30: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 35: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 40: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 45: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is outside a tolerance 5e-05.
+Timestep 50: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is within a tolerance 5e-05.
+Timestep 55: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is within a tolerance 5e-05.
+Timestep 60: Total integrated value of 'TemperatureField-ErrorMagnitudeField' is within a tolerance 5e-05.
Added: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1-x.0of1.TemperatureField-ErrorFile.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1-x.0of1.TemperatureField-ErrorFile.expected 2006-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1-x.0of1.TemperatureField-ErrorFile.expected 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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/expected/testEnergySolver-SteadyState1D-kappa1-y.0of1.TemperatureField-ErrorFile.expected
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1-y.0of1.TemperatureField-ErrorFile.expected 2006-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1-y.0of1.TemperatureField-ErrorFile.expected 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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.
Deleted: 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-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/expected/testEnergySolver-SteadyState1D-kappa1.0of1.TemperatureField-ErrorFile.expected 2006-08-01 08:54:31 UTC (rev 4157)
@@ -1,13 +0,0 @@
-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-kappa0.5-x.0of1.sh
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.sh 2006-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.sh 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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-x.xml --defaultDiffusivity=0.5 --A=0.1 --TemperatureField-Tolerance=5e-5" "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa0.5-x.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ LastChangedDate Author Id
Name: svn:eol-style
+ native
Added: 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-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-x.0of1.sh 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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-x.xml" "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-x.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ LastChangedDate Author Id
Name: svn:eol-style
+ native
Added: 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-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-y.0of1.sh 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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-y.xml" "$0" "$@"
Property changes on: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1-y.0of1.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ LastChangedDate Author Id
Name: svn:eol-style
+ native
Deleted: 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-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testEnergySolver-SteadyState1D-kappa1.0of1.sh 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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 "StG_FEM ../EnergySolver2D.xml testSteadyState1D.xml" "$0" "$@"
Added: 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-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-x.xml 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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>
Added: 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-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D-y.xml 2006-08-01 08:54:31 UTC (rev 4157)
@@ -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"> -1e9 </param> <param name="endX"> 1e9 </param>
+ <param name="startY"> 0.49 </param> <param name="endY"> 0.51 </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">vy</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"> bottom </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"> top </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>
Deleted: long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D.xml
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D.xml 2006-08-01 08:54:04 UTC (rev 4156)
+++ long/3D/Gale/trunk/src/StgFEM/Apps/EnergySolver/tests/testSteadyState1D.xml 2006-08-01 08:54:31 UTC (rev 4157)
@@ -1,95 +0,0 @@
-<?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