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

[walter at geodynamics.org]

Author: walter
Date: 2008-04-09 10:23:22 -0700 (Wed, 09 Apr 2008)
New Revision: 11787

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c
Log:
 r2092 at earth:  boo | 2008-04-09 10:23:26 -0700
 Add Material_Index to vtk output



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

Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c	2008-04-09 17:23:16 UTC (rev 11786)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c	2008-04-09 17:23:22 UTC (rev 11787)
@@ -127,12 +127,12 @@
   RheologyMaterial*       material;
   MaterialPointsSwarm*    materialSwarm;
   MaterialPoint*          materialparticle;
-  
+ 
   Rheology_Register*      rheology_register;
   Rheology_Index      rheology_I; 
   Rheology_Index      rheologyCount;
   YieldRheology*      rheology; 
-  
+ 
   FILE *fp, *pfp;
   Name filename;
   
@@ -171,12 +171,13 @@
   
   /* We need many iterations, because the values are written
      separately from the coordinates. */
-  for(iteration=0; iteration<7; ++iteration)
+  for(iteration=0; iteration<8; ++iteration)
     {
       /* Loop over all of the particles */
       for ( lParticle_I = 0 ; lParticle_I < num_particles ;
             lParticle_I+=stepping ){
         double yielding, viscosity, density, alpha, diffusivity;
+        Material_Index material_index;
         SymmetricTensor stress;
         BuoyancyForceTerm_MaterialExt*   materialExt;
         Material *extension_info;
@@ -190,10 +191,11 @@
                                                   "density", 0.0 );
         alpha=Dictionary_GetDouble_WithDefault( material->dictionary,
                                                 "alpha", 0.0 );
+	material_index=material->index;
         diffusivity=Dictionary_GetDouble_WithDefault
           ( material->dictionary, "diffusivity", defaultDiffusivity );
         rheology_register=(Rheology_Register*)material->rheology_Register;
-        
+
         rheologyCount = Rheology_Register_GetCount( rheology_register ); 
         
         coord = materialparticle->coord;
@@ -279,9 +281,12 @@
                 fprintf(fp,"%lf ",density);
                 break;
               case 5:
+                fprintf(fp,"%d ",material_index);
+                break;
+              case 6:
                 fprintf(fp,"%lf ",alpha);
                 break;
-              case 6:
+              case 7:
                 fprintf(fp,"%lf ",diffusivity);
                 break;
               }
@@ -320,17 +325,23 @@
           break;
         case 4:
           fprintf(fp,"\n        </DataArray>\n");
+          fprintf(fp,"        <DataArray type=\"Int32\" Name=\"Material_Index\" format=\"ascii\">\n");
+          if(myRank==0)
+            fprintf(pfp,"        <PDataArray type=\"Int32\" Name=\"Material_Index\" format=\"ascii\"/>\n");
+          break;
+        case 5:
+          fprintf(fp,"\n        </DataArray>\n");
           fprintf(fp,"        <DataArray type=\"Float64\" Name=\"Alpha\" format=\"ascii\">\n");
           if(myRank==0)
             fprintf(pfp,"        <PDataArray type=\"Float64\" Name=\"Alpha\" format=\"ascii\"/>\n");
           break;
-        case 5:
+        case 6:
           fprintf(fp,"\n        </DataArray>\n");
           fprintf(fp,"        <DataArray type=\"Float64\" Name=\"Thermal_Diffusivity\" format=\"ascii\">\n");
           if(myRank==0)
             fprintf(pfp,"        <PDataArray type=\"Float64\" Name=\"Thermal_Diffusivity\" format=\"ascii\"/>\n");
           break;
-        case 6:
+        case 7:
           fprintf(fp,"\n        </DataArray>\n");
           fprintf(fp,"      </PointData>\n");
           fprintf(fp,"      <CellData>\n");