[cig-commits] commit: Initialising nameAllocationType to NON_GLOBAL, to get rid of compile warnings
Mercurial
hg at geodynamics.org
Mon Feb 1 15:31:37 PST 2010
changeset: 366:db952724329e
branch: pcu_rejig
user: JulianGiordani
date: Wed Dec 16 11:57:04 2009 +1100
files: Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c MaterialPoints/src/IntegrationPointsSwarm.c MaterialPoints/src/Material.c MaterialPoints/src/MaterialPointsSwarm.c MaterialPoints/src/SwarmAdvectionInAPlane.c MaterialPoints/src/SwarmAdvector.c PopulationControl/src/EscapedRoutine.c SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Utils/src/BuoyancyForceTerm.c Utils/src/BuoyancyForceTermThermoChem.c Utils/src/DiffusionSMT.c plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c plugins/Output/MaterialCentroid/MaterialCentroid.c
description:
Initialising nameAllocationType to NON_GLOBAL, to get rid of compile warnings
diff -r 6030236ba072 -r db952724329e Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c
--- a/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Tue Dec 15 17:00:52 2009 +1100
+++ b/Apps/RayleighTaylor/tests/AnalyticBlock/AnalyticBlock.c Wed Dec 16 11:57:04 2009 +1100
@@ -1763,7 +1763,7 @@ void* _AnalyticBlock_DefaultNew( Name na
Stg_Component_DestroyFunction* _destroy = _AnalyticSolution_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return _AnalyticSolution_New( ANALYTICSOLUTION_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c
--- a/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c Tue Dec 15 17:00:52 2009 +1100
+++ b/Apps/RayleighTaylor/tests/AnalyticColumn/AnalyticColumn.c Wed Dec 16 11:57:04 2009 +1100
@@ -341,7 +341,7 @@ void* _AnalyticColumn_DefaultNew( Name n
Stg_Component_DestroyFunction* _destroy = _AnalyticSolution_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return _AnalyticSolution_New( ANALYTICSOLUTION_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e MaterialPoints/src/IntegrationPointsSwarm.c
--- a/MaterialPoints/src/IntegrationPointsSwarm.c Tue Dec 15 17:00:52 2009 +1100
+++ b/MaterialPoints/src/IntegrationPointsSwarm.c Wed Dec 16 11:57:04 2009 +1100
@@ -96,7 +96,7 @@ IntegrationPointsSwarm* IntegrationPoint
Stg_Component_DestroyFunction* _destroy = _IntegrationPointsSwarm_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
void* ics = ZERO;
IntegrationPointsSwarm* self = _IntegrationPointsSwarm_New( INTEGRATIONPOINTSSWARM_PASSARGS );
@@ -140,7 +140,7 @@ void* _IntegrationPointsSwarm_DefaultNew
SizeT particleSize = sizeof(IntegrationPoint);
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
void* ics = ZERO;
return (void*) _IntegrationPointsSwarm_New( INTEGRATIONPOINTSSWARM_PASSARGS );
diff -r 6030236ba072 -r db952724329e MaterialPoints/src/Material.c
--- a/MaterialPoints/src/Material.c Tue Dec 15 17:00:52 2009 +1100
+++ b/MaterialPoints/src/Material.c Wed Dec 16 11:57:04 2009 +1100
@@ -91,7 +91,7 @@ void* _Material_DefaultNew( Name name )
Stg_Component_DestroyFunction* _destroy = _Material_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return (void*) _Material_New( MATERIAL_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e MaterialPoints/src/MaterialPointsSwarm.c
--- a/MaterialPoints/src/MaterialPointsSwarm.c Tue Dec 15 17:00:52 2009 +1100
+++ b/MaterialPoints/src/MaterialPointsSwarm.c Wed Dec 16 11:57:04 2009 +1100
@@ -90,7 +90,7 @@ MaterialPointsSwarm* MaterialPointsSwarm
Stg_Component_DestroyFunction* _destroy = _MaterialPointsSwarm_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
void* ics = ZERO;
/* The following terms are parameters that have been passed into or defined in this function but are being set before being passed onto the parent */
@@ -229,7 +229,7 @@ void* _MaterialPointsSwarm_DefaultNew( N
SizeT particleSize = sizeof(MaterialPoint);
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
void* ics = ZERO;
return _MaterialPointsSwarm_New( MATERIALPOINTSSWARM_PASSARGS );
diff -r 6030236ba072 -r db952724329e MaterialPoints/src/SwarmAdvectionInAPlane.c
--- a/MaterialPoints/src/SwarmAdvectionInAPlane.c Tue Dec 15 17:00:52 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvectionInAPlane.c Wed Dec 16 11:57:04 2009 +1100
@@ -146,7 +146,7 @@ void* _SwarmAdvectionInAPlane_DefaultNew
TimeIntegratee_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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return (void*) _SwarmAdvectionInAPlane_New( SWARMADVECTIONINAPLANE_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e MaterialPoints/src/SwarmAdvector.c
--- a/MaterialPoints/src/SwarmAdvector.c Tue Dec 15 17:00:52 2009 +1100
+++ b/MaterialPoints/src/SwarmAdvector.c Wed Dec 16 11:57:04 2009 +1100
@@ -200,7 +200,7 @@ void* _SwarmAdvector_DefaultNew( Name na
TimeIntegratee_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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return (void*) _SwarmAdvector_New( SWARMADVECTOR_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e PopulationControl/src/EscapedRoutine.c
--- a/PopulationControl/src/EscapedRoutine.c Tue Dec 15 17:00:52 2009 +1100
+++ b/PopulationControl/src/EscapedRoutine.c Wed Dec 16 11:57:04 2009 +1100
@@ -97,7 +97,7 @@ void* _EscapedRoutine_DefaultNew( Name n
EscapedRoutine_SelectFunction* _select = _EscapedRoutine_Select;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return (void*) _EscapedRoutine_New( ESCAPEDROUTINE_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c
--- a/SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Tue Dec 15 17:00:52 2009 +1100
+++ b/SysTest/AnalyticPlugins/AnalyticPressure/AnalyticPressure.c Wed Dec 16 11:57:04 2009 +1100
@@ -96,7 +96,7 @@ void* _AnalyticPressure_DefaultNew( Name
Stg_Component_DestroyFunction* _destroy = _FieldTest_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return _FieldTest_New( FIELDTEST_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e Utils/src/BuoyancyForceTerm.c
--- a/Utils/src/BuoyancyForceTerm.c Tue Dec 15 17:00:52 2009 +1100
+++ b/Utils/src/BuoyancyForceTerm.c Wed Dec 16 11:57:04 2009 +1100
@@ -150,7 +150,7 @@ void* _BuoyancyForceTerm_DefaultNew( Nam
BuoyancyForceTerm_CalcGravityFunction* _calcGravity = _BuoyancyForceTerm_CalcGravity;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return (void*)_BuoyancyForceTerm_New( BUOYANCYFORCETERM_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e Utils/src/BuoyancyForceTermThermoChem.c
--- a/Utils/src/BuoyancyForceTermThermoChem.c Tue Dec 15 17:00:52 2009 +1100
+++ b/Utils/src/BuoyancyForceTermThermoChem.c Wed Dec 16 11:57:04 2009 +1100
@@ -99,7 +99,7 @@ void* _BuoyancyForceTermThermoChem_Defau
BuoyancyForceTermThermoChem_CalcRaCFunction* _calcRaC = _BuoyancyForceTermThermoChem_CalcRaC;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return (void*)_BuoyancyForceTermThermoChem_New( BUOYANCYFORCETERMTHERMOCHEM_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e Utils/src/DiffusionSMT.c
--- a/Utils/src/DiffusionSMT.c Tue Dec 15 17:00:52 2009 +1100
+++ b/Utils/src/DiffusionSMT.c Wed Dec 16 11:57:04 2009 +1100
@@ -124,7 +124,7 @@ void* _DiffusionSMT_DefaultNew( Name nam
StiffnessMatrixTerm_AssembleElementFunction* _assembleElement = _DiffusionSMT_AssembleElement;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return (void*)_DiffusionSMT_New( DIFFUSIONSMT_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c
--- a/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Tue Dec 15 17:00:52 2009 +1100
+++ b/plugins/CalculateParticleDisplacement/CalculateParticleDisplacement.c Wed Dec 16 11:57:04 2009 +1100
@@ -183,7 +183,7 @@ void* _PICellerator_CalculateParticleDis
Stg_Component_DestroyFunction* _destroy = _Codelet_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return _Codelet_New( CODELET_PASSARGS );
}
diff -r 6030236ba072 -r db952724329e plugins/Output/MaterialCentroid/MaterialCentroid.c
--- a/plugins/Output/MaterialCentroid/MaterialCentroid.c Tue Dec 15 17:00:52 2009 +1100
+++ b/plugins/Output/MaterialCentroid/MaterialCentroid.c Wed Dec 16 11:57:04 2009 +1100
@@ -133,7 +133,7 @@ void* _PICellerator_MaterialCentroid_Def
Stg_Component_DestroyFunction* _destroy = _Codelet_Destroy;
/* 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 = ZERO;
+ AllocationType nameAllocationType = NON_GLOBAL /* default value NON_GLOBAL */;
return _Codelet_New( CODELET_PASSARGS );
}
More information about the CIG-COMMITS
mailing list