[cig-commits] r4946 - in long/3D/Gale/trunk/src/Underworld: .
plugins/MaterialThermalDiffusivity
walter at geodynamics.org
walter at geodynamics.org
Wed Oct 11 13:54:45 PDT 2006
Author: walter
Date: 2006-10-11 13:54:44 -0700 (Wed, 11 Oct 2006)
New Revision: 4946
Modified:
long/3D/Gale/trunk/src/Underworld/
long/3D/Gale/trunk/src/Underworld/plugins/MaterialThermalDiffusivity/MaterialThermalDiffusivity.c
Log:
r606 at earth: boo | 2006-10-11 13:52:13 -0700
r568 at earth (orig r345): KathleenHumble | 2006-10-05 00:31:48 -0700
Implementing a reasonably big change to the FeildVariable:
Adding in a Bool isCheckpointedAndReloaded
that at present can not be set per FieldVariable type
except by using the standard method of deciding which
variables to checkpoint...
This change is to prevent the checkpointing system from
checkpointing spurious FieldVariables that were breaking
some of the checkpointing tests.
At present, this new flag cannot be set from the xml
Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
- 9570c393-cf10-0410-b476-9a651db1e55a:/cig:605
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:344
+ 9570c393-cf10-0410-b476-9a651db1e55a:/cig:606
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:345
Modified: long/3D/Gale/trunk/src/Underworld/plugins/MaterialThermalDiffusivity/MaterialThermalDiffusivity.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/MaterialThermalDiffusivity/MaterialThermalDiffusivity.c 2006-10-11 20:54:41 UTC (rev 4945)
+++ long/3D/Gale/trunk/src/Underworld/plugins/MaterialThermalDiffusivity/MaterialThermalDiffusivity.c 2006-10-11 20:54:44 UTC (rev 4946)
@@ -85,12 +85,14 @@
Dictionary* dictionary;
double* materialThermalDiffusivity;
Particle_Index lParticle_I;
- IntegrationPointsSwarm* swarm = context->picIntegrationPoints;
+ MaterialPointsSwarm* materialPoints;
AdvectionDiffusionSLE* energySLE = context->energySLE;
ForceVector* residual;
AdvDiffResidualForceTerm* residualForceTerm;
Variable* variable;
+ materialPoints = (MaterialPointsSwarm*)Stg_ComponentFactory_ConstructByName( context->CF, "materialPoints", MaterialPointsSwarm, True );
+ assert(materialPoints);
residual = energySLE->residual;
residualForceTerm = Stg_CheckType( Stg_ObjectList_At( residual->forceTermList, 0 ), AdvDiffResidualForceTerm );
variable = residualForceTerm->diffusivityVariable;
@@ -107,11 +109,11 @@
}
/* Assign value to particle */
- for ( lParticle_I = 0 ; lParticle_I < swarm->particleLocalCount ; lParticle_I++ ) {
+ for ( lParticle_I = 0 ; lParticle_I < materialPoints->particleLocalCount ; lParticle_I++ ) {
Variable_SetValueDouble(
variable,
lParticle_I,
- materialThermalDiffusivity[ IntegrationPointsSwarm_GetMaterialOnParticleIndex( swarm, lParticle_I ) ] );
+ materialThermalDiffusivity[ MaterialPointsSwarm_GetMaterialIndexAt( materialPoints, lParticle_I ) ] );
}
Memory_Free( materialThermalDiffusivity );
More information about the cig-commits
mailing list