[cig-commits] r14375 - in long/3D/Gale/trunk: . src/StGermain/Discretisation/Swarm/src src/Underworld/Utils/src

[walter at geodynamics.org]

Author: walter
Date: 2009-03-17 16:51:28 -0700 (Tue, 17 Mar 2009)
New Revision: 14375

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmOutput.c
   long/3D/Gale/trunk/src/Underworld/Utils/src/PressureTemperatureOutput.c
Log:
 r2561 at dante:  boo | 2009-03-17 16:50:18 -0700
 Make PressureTemperature actually work and print out P and T after the solve but before advection, so that it can be compared with the VTK output



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2560
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2561

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmOutput.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmOutput.c	2009-03-17 23:51:25 UTC (rev 14374)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Swarm/src/SwarmOutput.c	2009-03-17 23:51:28 UTC (rev 14375)
@@ -134,7 +134,7 @@
 	self->borderString = StG_Strdup( borderString );
 	Stg_asprintf( &self->doubleFormatString, "%%%d.%dg", columnWidth, decimalLength );
 
-	EP_AppendClassHook( Context_GetEntryPoint( context, AbstractContext_EP_DumpClass ),	SwarmOutput_Execute, self );
+	EP_PrependClassHook( Context_GetEntryPoint( context, AbstractContext_EP_UpdateClass ),	SwarmOutput_Execute, self );
 }
 
 
@@ -310,7 +310,7 @@
 	GlobalParticle*   particle            = (GlobalParticle*)Swarm_ParticleAt( swarm, lParticle_I );
 	double*           coord               = particle->coord;
 		
-	SwarmOutput_PrintValue( self, stream, context->timeStep );
+	SwarmOutput_PrintValue( self, stream, context->timeStep-1 );
 	SwarmOutput_PrintValue( self, stream, context->currentTime + AbstractContext_Dt( context ) );
 	SwarmOutput_PrintValue( self, stream, coord[ I_AXIS ] );
 	SwarmOutput_PrintValue( self, stream, coord[ J_AXIS ] );

Modified: long/3D/Gale/trunk/src/Underworld/Utils/src/PressureTemperatureOutput.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/Utils/src/PressureTemperatureOutput.c	2009-03-17 23:51:25 UTC (rev 14374)
+++ long/3D/Gale/trunk/src/Underworld/Utils/src/PressureTemperatureOutput.c	2009-03-17 23:51:28 UTC (rev 14375)
@@ -193,7 +193,7 @@
 	pressureField    = Stg_ComponentFactory_ConstructByKey( cf, self->name, "PressureField",    FeVariable, True, data ) ;
 	temperatureField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TemperatureField", FeVariable, True, data ) ;
 	stressField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "StressField", FeVariable, True, data ) ;
-	hydrostaticTerm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "HydrostaticTerm", FeVariable, True, data ) ;
+	hydrostaticTerm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "HydrostaticTerm", HydrostaticTerm, False, data ) ;
 
 	_PressureTemperatureOutput_Init( self, pressureField, temperatureField,
                                          stressField, hydrostaticTerm);
@@ -250,6 +250,7 @@
         /* Get the pressure, with corrections from the trace of the
            stress and the hydrostatic term */
 	FieldVariable_InterpolateValueAt( self->pressureField,coord,&pressure);
+        ParticleFeVariable_Update( self->stressField );
 	FieldVariable_InterpolateValueAt( self->stressField, coord, stress );
         SymmetricTensor_GetTrace(stress, swarm->dim, &trace);
         pressure+=trace+HydrostaticTerm_Pressure(self->hydrostaticTerm,coord);