[cig-commits] commit: deleted an obselete advector and filled out the meta file
Mercurial
hg at geodynamics.org
Mon Nov 24 11:31:05 PST 2008
changeset: 106:d96dcba0969d
user: WendySharples
date: Tue Aug 12 00:34:07 2008 +0000
files: MaterialPoints/src/SwarmAdvectorD.meta MaterialPoints/src/SwarmAdvectorW.c MaterialPoints/src/SwarmAdvectorW.h MaterialPoints/src/SwarmAdvectorW.meta
description:
deleted an obselete advector and filled out the meta file
diff -r 88639d0dce7e -r d96dcba0969d MaterialPoints/src/SwarmAdvectorD.meta
--- a/MaterialPoints/src/SwarmAdvectorD.meta Mon Aug 11 10:38:06 2008 +0000
+++ b/MaterialPoints/src/SwarmAdvectorD.meta Tue Aug 12 00:34:07 2008 +0000
@@ -3,7 +3,7 @@
<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
<param name="Name">SwarmAdvectorD</param>
-<param name="Author">...</param>
+<param name="Author">DaveStegman</param>
<param name="Organisation">VPAC and MCC</param>
<param name="Project">PICellerator</param>
<param name="Location">./PICellerator/MaterialPoints/src/</param>
@@ -13,7 +13,7 @@
<param name="Parent">TimeIntegratee</param>
<param name="Reference">...</param>
<param name="Summary">...</param>
-<param name="Description">...</param>
+<param name="Description">Special advector that does not advect particles in the z direction</param>
<!--Now the interesting stuff-->
diff -r 88639d0dce7e -r d96dcba0969d MaterialPoints/src/SwarmAdvectorW.c
--- a/MaterialPoints/src/SwarmAdvectorW.c Mon Aug 11 10:38:06 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,246 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-**
-** 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: $
-**
-**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-#include <mpi.h>
-#include <StGermain/StGermain.h>
-#include <StgDomain/StgDomain.h>
-#include <StgFEM/StgFEM.h>
-
-#include <PICellerator/Voronoi/Voronoi.h>
-#include <PICellerator/PopulationControl/PopulationControl.h>
-#include <PICellerator/Weights/Weights.h>
-
-#include "types.h"
-#include "SwarmAdvector.h"
-#include "SwarmAdvectorW.h"
-
-#include "MaterialPointsSwarm.h"
-#include "PeriodicBoundariesManager.h"
-#include <assert.h>
-#include <string.h>
-#include <math.h>
-
-
-/* Textual name of this class */
-const Type SwarmAdvectorW_Type = "SwarmAdvectorW";
-
-/*-------------------------------------------------------------------------------------------------------------------------
-** Constructors
-*/
-SwarmAdvectorW* SwarmAdvectorW_New(
- Name name,
- TimeIntegrator* timeIntegrator,
- FeVariable* velocityField,
- Bool allowFallbackToFirstOrder,
- MaterialPointsSwarm* swarm,
- PeriodicBoundariesManager* periodicBCsManager )
-{
- SwarmAdvectorW* self = (SwarmAdvectorW*) _SwarmAdvectorW_DefaultNew( name );
-
- /* SwarmAdvectorW_InitAll */
- _TimeIntegratee_Init( self, timeIntegrator, swarm->particleCoordVariable->variable, 0, NULL,
- allowFallbackToFirstOrder );
- _SwarmAdvector_Init( (SwarmAdvector*)self, velocityField, swarm, periodicBCsManager );
- _SwarmAdvectorW_Init( self );
-
- return self;
-}
-
-SwarmAdvectorW* _SwarmAdvectorW_New(
- SizeT _sizeOfSelf,
- Type type,
- Stg_Class_DeleteFunction* _delete,
- Stg_Class_PrintFunction* _print,
- Stg_Class_CopyFunction* _copy,
- Stg_Component_DefaultConstructorFunction* _defaultConstructor,
- Stg_Component_ConstructFunction* _construct,
- Stg_Component_BuildFunction* _build,
- Stg_Component_InitialiseFunction* _initialise,
- Stg_Component_ExecuteFunction* _execute,
- Stg_Component_DestroyFunction* _destroy,
- TimeIntegratee_CalculateTimeDerivFunction* _calculateTimeDeriv,
- TimeIntegratee_IntermediateFunction* _intermediate,
- Name name )
-{
- SwarmAdvectorW* self;
-
- /* Allocate memory */
- assert( _sizeOfSelf >= sizeof(SwarmAdvectorW) );
- self = (SwarmAdvectorW*)_SwarmAdvector_New(
- _sizeOfSelf,
- type,
- _delete,
- _print,
- _copy,
- _defaultConstructor,
- _construct,
- _build,
- _initialise,
- _execute,
- _destroy,
- _calculateTimeDeriv,
- _intermediate,
- name );
-
- /* General info */
-
- /* Virtual Info */
-
- return self;
-}
-
-void _SwarmAdvectorW_Init( SwarmAdvectorW* self )
-{
-}
-
-
-/*------------------------------------------------------------------------------------------------------------------------
-** Virtual functions
-*/
-
-void _SwarmAdvectorW_Delete( void* swarmAdvector ) {
- SwarmAdvectorW* self = (SwarmAdvectorW*)swarmAdvector;
-
- /* Delete parent */
- _SwarmAdvector_Delete( self );
-}
-
-
-void _SwarmAdvectorW_Print( void* swarmAdvector, Stream* stream ) {
- SwarmAdvectorW* self = (SwarmAdvectorW*)swarmAdvector;
-
- /* Print parent */
- _SwarmAdvector_Print( self, stream );
-}
-
-
-void* _SwarmAdvectorW_Copy( void* swarmAdvector, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap ) {
- SwarmAdvectorW* self = (SwarmAdvectorW*)swarmAdvector;
- SwarmAdvectorW* newSwarmAdvectorW;
-
- newSwarmAdvectorW = (SwarmAdvectorW*)_SwarmAdvector_Copy( self, dest, deep, nameExt, ptrMap );
-
- newSwarmAdvectorW->velocityField = self->velocityField;
- newSwarmAdvectorW->swarm = self->swarm;
- newSwarmAdvectorW->periodicBCsManager = self->periodicBCsManager;
-
- return (void*)newSwarmAdvectorW;
-}
-
-void* _SwarmAdvectorW_DefaultNew( Name name ) {
- return (void*) _SwarmAdvectorW_New(
- sizeof(SwarmAdvectorW),
- SwarmAdvectorW_Type,
- _SwarmAdvectorW_Delete,
- _SwarmAdvectorW_Print,
- _SwarmAdvectorW_Copy,
- _SwarmAdvectorW_DefaultNew,
- _SwarmAdvectorW_Construct,
- /* Just use the normal parent's implementation for next few, apart from new TimeDeriv function */
- _SwarmAdvector_Build,
- _SwarmAdvector_Initialise,
- _SwarmAdvector_Execute,
- _SwarmAdvector_Destroy,
- _SwarmAdvectorW_TimeDeriv,
- _SwarmAdvector_Intermediate,
- name );
-}
-
-
-void _SwarmAdvectorW_Construct( void* swarmAdvector, Stg_ComponentFactory* cf, void* data ) {
- SwarmAdvectorW* self = (SwarmAdvectorW*) swarmAdvector;
-
- _SwarmAdvector_Construct( self, cf, data );
- /* Everything constructed by parent already */
- _SwarmAdvectorW_Init( self );
-}
-
-
-Bool _SwarmAdvectorW_TimeDeriv( void* swarmAdvector, Index array_I, double* timeDeriv ) {
- SwarmAdvectorW* self = (SwarmAdvectorW*) swarmAdvector;
- FieldVariable* velocityField = (FieldVariable*) self->velocityField;
- double* coord;
- InterpolationResult result;
-
- /* Get Coordinate of Object using Variable */
- coord = Variable_GetPtrDouble( self->variable, array_I );
-
- result = FieldVariable_InterpolateValueAt( velocityField, coord, timeDeriv );
- if( coord[ J_AXIS ] >= 0.99 ){
- timeDeriv[ K_AXIS ] = 0.0;
- timeDeriv[ I_AXIS ] = 0.0;
- timeDeriv[ J_AXIS ] = 0.0;
- }
-
-
- if ( result == OTHER_PROC || result == OUTSIDE_GLOBAL || isinf(timeDeriv[0]) || isinf(timeDeriv[1]) ||
- ( self->swarm->dim == 3 && isinf(timeDeriv[2]) ) )
- {
- #if 0
- Journal_Printf( Journal_Register( Error_Type, self->type ),
- "Error in func '%s' for particle with index %u.\n\tPosition (%g, %g, %g)\n\tVelocity here is (%g, %g, %g)."
- "\n\tInteropolation result is %u.\n",
- __func__, array_I, coord[0], coord[1], coord[2],
- timeDeriv[0], timeDeriv[1], ( self->swarm->dim == 3 ? timeDeriv[2] : 0.0 ),
- result );
- abort();
- #endif
-
- return False;
- }
-
- return True;
-}
-
-/*-------------------------------------------------------------------------------------------------------------------------
-** Private Functions
-*/
-/*---------------------------------------------------------------------------------------------------------------------
-** Entry Point Hooks
-*/
-/*-------------------------------------------------------------------------------------------------------------------------
-** Public Functions
-*/
-
-
diff -r 88639d0dce7e -r d96dcba0969d MaterialPoints/src/SwarmAdvectorW.h
--- a/MaterialPoints/src/SwarmAdvectorW.h Mon Aug 11 10:38:06 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-**
-** 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
-**
-*/
-/** \file
-** Role:
-** Special swarm advector which doesn't advect particles when they are is positioned above y = 0.99 even
-** for 3D problems.
-**
-** Assumptions:
-**
-** Comments:
-**
-** $Id: SwarmAdvectorW.h 189 2005-10-20 00:39:29Z wendy sharples$
-**
-**~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
-#ifndef __PICellerator_MaterialPoints_SwarmAdvectorW_h__
-#define __PICellerator_MaterialPoints_SwarmAdvectorW_h__
-
- /* Textual name of this class */
- extern const Type SwarmAdvectorW_Type;
-
- /* SwarmAdvectorW information */
- #define __SwarmAdvectorW \
- /* General info */ \
- __SwarmAdvector /** Now inherits from SwarmAdvector class */
-
- struct SwarmAdvectorW { __SwarmAdvectorW };
-
- /*---------------------------------------------------------------------------------------------------------------------
- ** Constructors
- */
- SwarmAdvectorW* SwarmAdvectorW_New(
- Name name,
- TimeIntegrator* timeIntegrator,
- FeVariable* velocityField,
- Bool allowFallbackToFirstOrder,
- MaterialPointsSwarm* swarm,
- PeriodicBoundariesManager* periodicBCsManager );
-
- SwarmAdvectorW* _SwarmAdvectorW_New(
- SizeT _sizeOfSelf,
- Type type,
- Stg_Class_DeleteFunction* _delete,
- Stg_Class_PrintFunction* _print,
- Stg_Class_CopyFunction* _copy,
- Stg_Component_DefaultConstructorFunction* _defaultConstructor,
- Stg_Component_ConstructFunction* _construct,
- Stg_Component_BuildFunction* _build,
- Stg_Component_InitialiseFunction* _initialise,
- Stg_Component_ExecuteFunction* _execute,
- Stg_Component_DestroyFunction* _destroy,
- TimeIntegratee_CalculateTimeDerivFunction* _calculateTimeDeriv,
- TimeIntegratee_IntermediateFunction* _intermediate,
- Name name );
-
- void _SwarmAdvectorW_Init(
- SwarmAdvectorW* self );
-
- void _SwarmAdvectorW_Delete( void* materialSwarm );
- void _SwarmAdvectorW_Print( void* materialSwarm, Stream* stream );
- #define SwarmAdvectorW_Copy( self ) \
- (SwarmAdvectorW*) Stg_Class_Copy( self, NULL, False, NULL, NULL )
- #define SwarmAdvectorW_DeepCopy( self ) \
- (SwarmAdvectorW*) Stg_Class_Copy( self, NULL, True, NULL, NULL )
- void* _SwarmAdvectorW_Copy( void* materialSwarm, void* dest, Bool deep, Name nameExt, PtrMap* ptrMap );
-
- void* _SwarmAdvectorW_DefaultNew( Name name ) ;
- void _SwarmAdvectorW_Construct( void* shape, Stg_ComponentFactory* cf, void* data ) ;
- void _SwarmAdvectorW_Build( void* materialSwarm, void* data ) ;
- void _SwarmAdvectorW_Initialise( void* materialSwarm, void* data ) ;
- void _SwarmAdvectorW_Execute( void* materialSwarm, void* data );
- void _SwarmAdvectorW_Destroy( void* materialSwarm, void* data ) ;
- Bool _SwarmAdvectorW_TimeDeriv( void* swarmAdvector, Index array_I, double* timeDeriv ) ;
- void _SwarmAdvectorW_Intermediate( void* swarmAdvector, Index array_I ) ;
-
-
- /*---------------------------------------------------------------------------------------------------------------------
- ** Private functions
- */
-
- /*---------------------------------------------------------------------------------------------------------------------
- ** Entry Point Hooks
- */
- void SwarmAdvectorW_AdvectionSetup( TimeIntegrator* timeIntegrator, SwarmAdvectorW* self ) ;
- void SwarmAdvectorW_AdvectionFinish( TimeIntegrator* timeIntegrator, SwarmAdvectorW* self ) ;
-
- /*---------------------------------------------------------------------------------------------------------------------
- ** Public functions
- */
-
-#endif
diff -r 88639d0dce7e -r d96dcba0969d MaterialPoints/src/SwarmAdvectorW.meta
--- a/MaterialPoints/src/SwarmAdvectorW.meta Mon Aug 11 10:38:06 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE StGermainData SYSTEM "stgermain.dtd">
-<StGermainData xmlns="http://www.vpac.org/StGermain/XML_IO_Handler/Jun2003">
-
-<param name="Name">SwarmAdvectorW</param>
-<param name="Author">...</param>
-<param name="Organisation">VPAC and MCC</param>
-<param name="Project">PICellerator</param>
-<param name="Location">./</param>
-<param name="Project Web">http://www.stgermainproject.org/PICellerator.html</param>
-<param name="Copyright">Copyright (C) 2005 VPAC and Monash Cluster Computing.</param>
-<param name="License">https://csd.vpac.org/twiki/bin/view/Stgermain/SoftwareLicense http://www.opensource.org/licenses/bsd-license.php</param>
-<param name="Parent">SwarmAdvector</param>
-<param name="Reference">...</param>
-<param name="Summary">...</param>
-<param name="Description">...</param>
-
-<!--Now the interesting stuff-->
-
-
-<list name="Params">
-
-</list>
-
-<list name="Dependencies">
-
-</list>
-<!-- Add an exmaple XML if possible -->
-<param name="Example">...</param>
-
-</StGermainData>
More information about the CIG-COMMITS
mailing list