[cig-commits] r5292 - in long/3D/Gale/trunk/src/Underworld: . plugins/Output/ConvectionData

[walter at geodynamics.org]

Author: walter
Date: 2006-11-15 13:08:12 -0800 (Wed, 15 Nov 2006)
New Revision: 5292

Modified:
   long/3D/Gale/trunk/src/Underworld/
   long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c
Log:
 r725 at earth:  boo | 2006-11-15 13:06:47 -0800
  r716 at earth (orig r373):  JulianGiordani | 2006-11-08 22:12:39 -0800
  
  Slight changes to what's improved and how.
  Now a viscosity contrast is being calculated and outputed, and all output is now in a row.
  
 



Property changes on: long/3D/Gale/trunk/src/Underworld
___________________________________________________________________
Name: svk:merge
   - 9570c393-cf10-0410-b476-9a651db1e55a:/cig:724
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:372
   + 9570c393-cf10-0410-b476-9a651db1e55a:/cig:725
c24a034b-ab11-0410-afe6-cfe714e2959e:/trunk:373

Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c	2006-11-15 21:08:03 UTC (rev 5291)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/ConvectionData/ConvectionData.c	2006-11-15 21:08:12 UTC (rev 5292)
@@ -48,6 +48,7 @@
 #include <Underworld/Underworld.h>
 #include <Underworld/BoundaryLayers/BoundaryLayers.h>
 #include <StgFEM/FrequentOutput/FrequentOutput.h>
+#include <assert.h>
 #include <string.h>
 
 typedef struct {
@@ -138,6 +139,7 @@
 	double                     Upper_tbl_Thinckness;
 	double                     Lower_tbl_Thinckness;
 	double                     surfaceMobility;
+	double                     deltaViscosity;
 
 	self = (Underworld_ConvectionData*)LiveComponentRegister_Get(
 					context->CF->LCRegister,
@@ -145,23 +147,25 @@
 
 	geometry = Stg_CheckType( self->velocitySquaredField->feMesh->layout->elementLayout->geometry, BlockGeometry );
 
-	Journal_Printf( dataStream, "ID = %s_%.3g_%.3g_%.3g\n", self->rheologyName, self->stressExponent, self->eta0, self->Ra ); 
+	assert( self->stressExponent != 0 );
+	deltaViscosity = pow(self->eta0, (-1/self->stressExponent) );
+	Journal_Printf( dataStream, "%s %.3g %.3g ", self->rheologyName, deltaViscosity, self->Ra ); 
 	
 	// Prints out Surface Vrms 
 	topVrms = Underworld_ConvectionData_XZPlaneVrms( context, geometry->max[ J_AXIS ] );
-	Journal_Printf( dataStream, "Top Surface Vrms = %g\n", topVrms );
+	Journal_Printf( dataStream, " %g", topVrms );
 
 	bottomVrms = Underworld_ConvectionData_XZPlaneVrms( context, geometry->min[ J_AXIS ] );
-	Journal_Printf( dataStream, "Bottom Surface Vrms = %g\n", bottomVrms );
+	Journal_Printf( dataStream, " %g", bottomVrms );
 	
 	Upper_tbl_Thinckness = self->boundaryLayersPlugin->hotLayerThickness;
-	Journal_Printf( dataStream, "Delta_0 = %g\n", Upper_tbl_Thinckness );
+	Journal_Printf( dataStream, " %g", Upper_tbl_Thinckness );
 
 	Lower_tbl_Thinckness = self->boundaryLayersPlugin->coldLayerThickness;
-	Journal_Printf( dataStream, "Delta_1 = %g\n", Lower_tbl_Thinckness );
+	Journal_Printf( dataStream, " %g", Lower_tbl_Thinckness );
 
 	surfaceMobility = ( Upper_tbl_Thinckness * topVrms ) / ( self->diffusivity * self->horizontalDimOfConvecCell );
-	Journal_Printf( dataStream, "Surface Mobility = %g\n", surfaceMobility );
+	Journal_Printf( dataStream, " %g", surfaceMobility );
 /*
 */
 	Journal_Printf( dataStream, "\n" );