[cig-commits] commit: search: Integratee
Mercurial
hg at geodynamics.org
Mon Feb 1 15:31:46 PST 2010
changeset: 374:8552d351f5a5
branch: 1.4.x
user: mvelic at localhost.localdomain
date: Wed Jan 06 17:45:44 2010 +1100
files: MaterialPoints/src/Init.c MaterialPoints/src/SwarmAdvectionInAPlane.c MaterialPoints/src/SwarmAdvectionInAPlane.meta MaterialPoints/src/SwarmAdvector.c MaterialPoints/src/SwarmAdvector.h MaterialPoints/src/SwarmAdvector.meta
description:
search: Integratee
did you mean Integrand?
diff -r 821293a4a7ce -r 8552d351f5a5 MaterialPoints/src/Init.c
--- a/MaterialPoints/src/Init.c Tue Dec 22 15:45:46 2009 +1100
+++ b/MaterialPoints/src/Init.c Wed Jan 06 17:45:44 2010 +1100
@@ -98,7 +98,7 @@ Bool PICellerator_MaterialPoints_Init( i
RegisterParent(OneToManyMapper_Type, IntegrationPointMapper_Type);
RegisterParent( ParticleFeVariable_Type, FeVariable_Type );
RegisterParent( PeriodicBoundariesManager_Type, Stg_Component_Type );
- RegisterParent( SwarmAdvector_Type, TimeIntegratee_Type );
+ RegisterParent( SwarmAdvector_Type, TimeIntegrand_Type );
RegisterParent( SwarmAdvectionInAPlane_Type, SwarmAdvector_Type );
/* dave, 18.09.07 */
diff -r 821293a4a7ce -r 8552d351f5a5 MaterialPoints/src/SwarmAdvectionInAPlane.c
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.c Tue Dec 22 15:45:46 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.c Wed Jan 06 17:45:44 2010 +1100
@@ -82,7 +82,7 @@ SwarmAdvectionInAPlane* SwarmAdvectionIn
int whichaxis;
/* SwarmAdvectionInAPlane_InitAll */
- _TimeIntegratee_Init( self, context, timeIntegrator, swarm->particleCoordVariable->variable, 0, NULL,
+ _TimeIntegrand_Init( self, context, timeIntegrator, swarm->particleCoordVariable->variable, 0, NULL,
allowFallbackToFirstOrder );
_SwarmAdvector_Init( (SwarmAdvector*)self, velocityField, swarm, periodicBCsManager);
_SwarmAdvectionInAPlane_Init( self, whichaxis );
@@ -142,8 +142,8 @@ void* _SwarmAdvectionInAPlane_DefaultNew
Stg_Component_InitialiseFunction* _initialise = _SwarmAdvector_Initialise;
Stg_Component_ExecuteFunction* _execute = _SwarmAdvector_Execute;
Stg_Component_DestroyFunction* _destroy = _SwarmAdvector_Destroy;
- TimeIntegratee_CalculateTimeDerivFunction* _calculateTimeDeriv = _SwarmAdvectionInAPlane_TimeDeriv;
- TimeIntegratee_IntermediateFunction* _intermediate = _SwarmAdvector_Intermediate;
+ TimeIntegrand_CalculateTimeDerivFunction* _calculateTimeDeriv = _SwarmAdvectionInAPlane_TimeDeriv;
+ TimeIntegrand_IntermediateFunction* _intermediate = _SwarmAdvector_Intermediate;
/* Variables that are set to ZERO are variables that will be set either by the current _New function or another parent _New function further up the hierachy */
AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
diff -r 821293a4a7ce -r 8552d351f5a5 MaterialPoints/src/SwarmAdvectionInAPlane.meta
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.meta Tue Dec 22 15:45:46 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.meta Wed Jan 06 17:45:44 2010 +1100
@@ -10,7 +10,7 @@
<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">http://www.opensource.org/licenses/bsd-license.php</param>
-<param name="Parent">TimeIntegratee</param>
+<param name="Parent">TimeIntegrand</param>
<param name="Reference">...</param>
<param name="Summary">...</param>
<param name="Description">Special advector that does not advect particles along the chosen axis </param>
diff -r 821293a4a7ce -r 8552d351f5a5 MaterialPoints/src/SwarmAdvector.c
--- a/MaterialPoints/src/SwarmAdvector.c Tue Dec 22 15:45:46 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvector.c Wed Jan 06 17:45:44 2010 +1100
@@ -78,7 +78,7 @@ SwarmAdvector* SwarmAdvector_New(
SwarmAdvector* self = (SwarmAdvector*) _SwarmAdvector_DefaultNew( name );
/* SwarmAdvector_InitAll */
- _TimeIntegratee_Init( self, context, timeIntegrator, swarm->particleCoordVariable->variable, 0, NULL,
+ _TimeIntegrand_Init( self, context, timeIntegrator, swarm->particleCoordVariable->variable, 0, NULL,
allowFallbackToFirstOrder );
_SwarmAdvector_Init( self, velocityField, swarm, periodicBCsManager );
@@ -91,7 +91,7 @@ SwarmAdvector* _SwarmAdvector_New( SWAR
/* Allocate memory */
assert( _sizeOfSelf >= sizeof(SwarmAdvector) );
- self = (SwarmAdvector*)_TimeIntegratee_New( TIMEINTEGRATEE_PASSARGS );
+ self = (SwarmAdvector*)_TimeIntegrand_New( TIMEINTEGRAND_PASSARGS );
/* General info */
@@ -158,7 +158,7 @@ void _SwarmAdvector_Delete( void* swarmA
SwarmAdvector* self = (SwarmAdvector*)swarmAdvector;
/* Delete parent */
- _TimeIntegratee_Delete( self );
+ _TimeIntegrand_Delete( self );
}
@@ -166,7 +166,7 @@ void _SwarmAdvector_Print( void* swarmAd
SwarmAdvector* self = (SwarmAdvector*)swarmAdvector;
/* Print parent */
- _TimeIntegratee_Print( self, stream );
+ _TimeIntegrand_Print( self, stream );
}
@@ -174,7 +174,7 @@ void* _SwarmAdvector_Copy( void* swarmAd
SwarmAdvector* self = (SwarmAdvector*)swarmAdvector;
SwarmAdvector* newSwarmAdvector;
- newSwarmAdvector = (SwarmAdvector*)_TimeIntegratee_Copy( self, dest, deep, nameExt, ptrMap );
+ newSwarmAdvector = (SwarmAdvector*)_TimeIntegrand_Copy( self, dest, deep, nameExt, ptrMap );
newSwarmAdvector->velocityField = self->velocityField;
newSwarmAdvector->swarm = self->swarm;
@@ -196,8 +196,8 @@ void* _SwarmAdvector_DefaultNew( Name na
Stg_Component_InitialiseFunction* _initialise = _SwarmAdvector_Initialise;
Stg_Component_ExecuteFunction* _execute = _SwarmAdvector_Execute;
Stg_Component_DestroyFunction* _destroy = _SwarmAdvector_Destroy;
- TimeIntegratee_CalculateTimeDerivFunction* _calculateTimeDeriv = _SwarmAdvector_TimeDeriv;
- TimeIntegratee_IntermediateFunction* _intermediate = _SwarmAdvector_Intermediate;
+ TimeIntegrand_CalculateTimeDerivFunction* _calculateTimeDeriv = _SwarmAdvector_TimeDeriv;
+ TimeIntegrand_IntermediateFunction* _intermediate = _SwarmAdvector_Intermediate;
/* Variables that are set to ZERO are variables that will be set either by the current _New function or another parent _New function further up the hierachy */
AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
@@ -212,7 +212,7 @@ void _SwarmAdvector_AssignFromXML( void*
MaterialPointsSwarm* swarm;
PeriodicBoundariesManager* periodicBCsManager;
- _TimeIntegratee_AssignFromXML( self, cf, data );
+ _TimeIntegrand_AssignFromXML( self, cf, data );
velocityField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "VelocityField", FeVariable, True, data );
swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", MaterialPointsSwarm, True, data );
@@ -228,7 +228,7 @@ void _SwarmAdvector_Build( void* swarmAd
Stg_Component_Build( self->swarm, data, False );
if ( self->periodicBCsManager )
Stg_Component_Build( self->periodicBCsManager, data, False );
- _TimeIntegratee_Build( self, data );
+ _TimeIntegrand_Build( self, data );
}
@@ -239,19 +239,19 @@ void _SwarmAdvector_Initialise( void* sw
Stg_Component_Initialise( self->swarm, data, False );
if ( self->periodicBCsManager )
Stg_Component_Initialise( self->periodicBCsManager, data, False );
- _TimeIntegratee_Initialise( self, data );
+ _TimeIntegrand_Initialise( self, data );
}
void _SwarmAdvector_Execute( void* swarmAdvector, void* data ) {
SwarmAdvector* self = (SwarmAdvector*)swarmAdvector;
- _TimeIntegratee_Execute( self, data );
+ _TimeIntegrand_Execute( self, data );
}
void _SwarmAdvector_Destroy( void* swarmAdvector, void* data ) {
SwarmAdvector* self = (SwarmAdvector*)swarmAdvector;
- _TimeIntegratee_Destroy( self, data );
+ _TimeIntegrand_Destroy( self, data );
Stg_Component_Destroy( self->velocityField, data, False );
Stg_Component_Destroy( self->swarm, data, False );
if ( self->periodicBCsManager )
diff -r 821293a4a7ce -r 8552d351f5a5 MaterialPoints/src/SwarmAdvector.h
--- a/MaterialPoints/src/SwarmAdvector.h Tue Dec 22 15:45:46 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvector.h Wed Jan 06 17:45:44 2010 +1100
@@ -59,7 +59,7 @@
/* SwarmAdvector information */
#define __SwarmAdvector \
/* General info */ \
- __TimeIntegratee \
+ __TimeIntegrand \
/* Virtual Info */\
/* Other Info */\
MaterialPointsSwarm* swarm; \
@@ -86,10 +86,10 @@
#endif
#define SWARMADVECTOR_DEFARGS \
- TIMEINTEGRATEE_DEFARGS
+ TIMEINTEGRAND_DEFARGS
#define SWARMADVECTOR_PASSARGS \
- TIMEINTEGRATEE_PASSARGS
+ TIMEINTEGRAND_PASSARGS
SwarmAdvector* _SwarmAdvector_New( SWARMADVECTOR_DEFARGS );
diff -r 821293a4a7ce -r 8552d351f5a5 MaterialPoints/src/SwarmAdvector.meta
--- a/MaterialPoints/src/SwarmAdvector.meta Tue Dec 22 15:45:46 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvector.meta Wed Jan 06 17:45:44 2010 +1100
@@ -10,7 +10,7 @@
<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">http://www.opensource.org/licenses/bsd-license.php</param>
-<param name="Parent">TimeIntegratee</param>
+<param name="Parent">TimeIntegrand</param>
<param name="Reference">http://en.wikipedia.org/wiki/Advection</param>
<param name="Summary">A component which moves particles according to a velocity field each timestep.</param>
<param name="Description">A component which moves particles according to a velocity field each timestep.</param>
More information about the CIG-COMMITS
mailing list