[cig-commits] r7741 - in long/3D/Gale/trunk: .
src/Underworld/plugins/Output/VTKOutput
walter at geodynamics.org
walter at geodynamics.org
Tue Jul 24 11:20:22 PDT 2007
Author: walter
Date: 2007-07-24 11:20:22 -0700 (Tue, 24 Jul 2007)
New Revision: 7741
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c
Log:
r1899 at earth: boo | 2007-07-24 09:58:58 -0700
Reindent VTKOutput
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1898
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1899
Modified: long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c
===================================================================
--- long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c 2007-07-24 18:20:14 UTC (rev 7740)
+++ long/3D/Gale/trunk/src/Underworld/plugins/Output/VTKOutput/VTKOutput.c 2007-07-24 18:20:22 UTC (rev 7741)
@@ -119,207 +119,207 @@
double defaultDiffusivity,
int stepping, char *outputPath,
int timeStep, int dim, int myRank, int nprocs) {
- double *coord;
- int iteration, i;
- Particle_Index num_particles = picswarm->particleLocalCount;
- Particle_Index lParticle_I;
-
- RheologyMaterial* material;
- MaterialPointsSwarm* materialSwarm;
- MaterialPoint* materialparticle;
-
- Rheology_Register* rheology_register;
- Rheology_Index rheology_I;
- Rheology_Index rheologyCount;
- YieldRheology* rheology;
-
- FILE *fp;
- Name filename;
-
- Stg_asprintf( &filename, "%s/particles.%d.%05d.vtu", outputPath,
- myRank, timeStep);
-
- fp=fopen(filename,"w");
+ double *coord;
+ int iteration, i;
+ Particle_Index num_particles = picswarm->particleLocalCount;
+ Particle_Index lParticle_I;
+
+ RheologyMaterial* material;
+ MaterialPointsSwarm* materialSwarm;
+ MaterialPoint* materialparticle;
+
+ Rheology_Register* rheology_register;
+ Rheology_Index rheology_I;
+ Rheology_Index rheologyCount;
+ YieldRheology* rheology;
+
+ FILE *fp;
+ Name filename;
+
+ Stg_asprintf( &filename, "%s/particles.%d.%05d.vtu", outputPath,
+ myRank, timeStep);
+
+ fp=fopen(filename,"w");
+
+ /* Write a header */
+ fprintf(fp,"<?xml version=\"1.0\"?>\n");
+ fprintf(fp,"<VTKFile type=\"UnstructuredGrid\" version=\"0.1\" byte_order=\"LittleEndian\">\n");
+ fprintf(fp," <UnstructuredGrid>\n");
+ fprintf(fp," <Piece NumberOfPoints=\"%d\" NumberOfCells=\"1\">\n",
+ (num_particles-1)/stepping+1);
+ fprintf(fp," <Points>\n");
+ fprintf(fp," <DataArray type=\"Float32\" NumberOfComponents=\"3\" format=\"ascii\">\n");
+
+ /* We need many iterations, because the values are written
+ separately from the coordinates. */
+ for(iteration=0; iteration<7; ++iteration)
+ {
+ /* Loop over all of the particles */
+ for ( lParticle_I = 0 ; lParticle_I < num_particles ;
+ lParticle_I+=stepping ){
+ double yielding, viscosity, density, alpha, diffusivity;
+ SymmetricTensor stress;
+ BuoyancyForceTerm_MaterialExt* materialExt;
+ Material *extension_info;
- /* Write a header */
- fprintf(fp,"<?xml version=\"1.0\"?>\n");
- fprintf(fp,"<VTKFile type=\"UnstructuredGrid\" version=\"0.1\" byte_order=\"LittleEndian\">\n");
- fprintf(fp," <UnstructuredGrid>\n");
- fprintf(fp," <Piece NumberOfPoints=\"%d\" NumberOfCells=\"1\">\n",
- (num_particles-1)/stepping+1);
- fprintf(fp," <Points>\n");
- fprintf(fp," <DataArray type=\"Float32\" NumberOfComponents=\"3\" format=\"ascii\">\n");
-
- /* We need many iterations, because the values are written
- separately from the coordinates. */
- for(iteration=0; iteration<7; ++iteration)
+ IntegrationPoint* integrationparticle = (IntegrationPoint*)Swarm_ParticleAt( picswarm, lParticle_I );
+
+ material = (RheologyMaterial*) IntegrationPointsSwarm_GetMaterialOn( picswarm, integrationparticle );
+ materialparticle = OneToOneMapper_GetMaterialPoint( picswarm->mapper, integrationparticle, &materialSwarm );
+
+ density=Dictionary_GetDouble_WithDefault( material->dictionary,
+ "density", 0.0 );
+ alpha=Dictionary_GetDouble_WithDefault( material->dictionary,
+ "alpha", 0.0 );
+ diffusivity=Dictionary_GetDouble_WithDefault
+ ( material->dictionary, "diffusivity", defaultDiffusivity );
+ rheology_register=(Rheology_Register*)material->rheology_Register;
+
+ rheologyCount = Rheology_Register_GetCount( rheology_register );
+
+ coord = materialparticle->coord;
+ yielding=0;
+ viscosity=0;
+ SymmetricTensor_Zero(stress);
+
+ /* First print out only the coordinates. */
+ if(iteration==0)
{
- /* Loop over all of the particles */
- for ( lParticle_I = 0 ; lParticle_I < num_particles ;
- lParticle_I+=stepping ){
- double yielding, viscosity, density, alpha, diffusivity;
- SymmetricTensor stress;
- BuoyancyForceTerm_MaterialExt* materialExt;
- Material *extension_info;
-
- IntegrationPoint* integrationparticle = (IntegrationPoint*)Swarm_ParticleAt( picswarm, lParticle_I );
-
- material = (RheologyMaterial*) IntegrationPointsSwarm_GetMaterialOn( picswarm, integrationparticle );
- materialparticle = OneToOneMapper_GetMaterialPoint( picswarm->mapper, integrationparticle, &materialSwarm );
-
- density=Dictionary_GetDouble_WithDefault( material->dictionary,
- "density", 0.0 );
- alpha=Dictionary_GetDouble_WithDefault( material->dictionary,
- "alpha", 0.0 );
- diffusivity=Dictionary_GetDouble_WithDefault
- ( material->dictionary, "diffusivity", defaultDiffusivity );
- rheology_register=(Rheology_Register*)material->rheology_Register;
-
- rheologyCount = Rheology_Register_GetCount( rheology_register );
-
- coord = materialparticle->coord;
- yielding=0;
- viscosity=0;
- SymmetricTensor_Zero(stress);
-
- /* First print out only the coordinates. */
- if(iteration==0)
+ if (dim == 2) {
+ fprintf(fp,"%lf %lf 0.0 ",(double)coord[0],
+ (double)coord[1]);
+ } else {
+ fprintf(fp,"%lf %lf %lf ", (double)coord[0],
+ (double)coord[1], (double)coord[2]);
+ }
+ }
+ else
+ {
+ /* Loop over all of the rheologies for a particle. */
+
+ for( rheology_I = 0; rheology_I < rheologyCount ; rheology_I++ ) {
+ rheology = (YieldRheology*)Rheology_Register_GetByIndex( rheology_register, rheology_I );
+
+ /* Get yielding information */
+ if(!strcmp(rheology->name,"yielding"))
{
- if (dim == 2) {
- fprintf(fp,"%lf %lf 0.0 ",(double)coord[0],
- (double)coord[1]);
- } else {
- fprintf(fp,"%lf %lf %lf ", (double)coord[0],
- (double)coord[1], (double)coord[2]);
- }
+ yielding=StrainWeakening_CalcRatio(rheology->strainWeakening,
+ materialparticle);
}
- else
+ /* Get viscosity */
+ else if(!strcmp(rheology->name,"storeViscosity"))
{
- /* Loop over all of the rheologies for a particle. */
-
- for( rheology_I = 0; rheology_I < rheologyCount ; rheology_I++ ) {
- rheology = (YieldRheology*)Rheology_Register_GetByIndex( rheology_register, rheology_I );
-
- /* Get yielding information */
- if(!strcmp(rheology->name,"yielding"))
- {
- yielding=StrainWeakening_CalcRatio(rheology->strainWeakening,
- materialparticle);
- }
- /* Get viscosity */
- else if(!strcmp(rheology->name,"storeViscosity"))
- {
- StoreVisc* self = (StoreVisc*) rheology;
- StoreVisc_ParticleExt* particleExt;
- particleExt=
- ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
- viscosity=particleExt->effVisc;
- }
- /* Get stress */
- else if(!strcmp(rheology->name,"storeStress"))
- {
- StoreStress* self = (StoreStress*) rheology;
- StoreStress_ParticleExt* particleExt;
- particleExt=
- ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
- stress[0]=particleExt->stress[0];
- stress[1]=particleExt->stress[1];
- stress[2]=particleExt->stress[2];
- stress[3]=particleExt->stress[3];
- if(dim==3)
- {
- stress[4]=particleExt->stress[4];
- stress[5]=particleExt->stress[5];
- }
- }
- }
- switch(iteration)
+ StoreVisc* self = (StoreVisc*) rheology;
+ StoreVisc_ParticleExt* particleExt;
+ particleExt=
+ ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
+ viscosity=particleExt->effVisc;
+ }
+ /* Get stress */
+ else if(!strcmp(rheology->name,"storeStress"))
+ {
+ StoreStress* self = (StoreStress*) rheology;
+ StoreStress_ParticleExt* particleExt;
+ particleExt=
+ ExtensionManager_Get( materialSwarm->particleExtensionMgr, materialparticle, self->particleExtHandle );
+ stress[0]=particleExt->stress[0];
+ stress[1]=particleExt->stress[1];
+ stress[2]=particleExt->stress[2];
+ stress[3]=particleExt->stress[3];
+ if(dim==3)
{
- case 1:
- fprintf(fp,"%lf ",viscosity);
- break;
- case 2:
- fprintf(fp,"%lf ",yielding);
- break;
- case 3:
- if(dim==2)
- {
- fprintf(fp,"%lf %lf 0.0 %lf %lf 0.0 0.0 0.0 0.0 ",
- stress[0],stress[1],
- stress[1],stress[2]);
- }
- else
- {
- fprintf(fp,"%lf %lf %lf %lf %lf %lf %lf %lf %lf ",
- stress[0],stress[1],stress[2],
- stress[1],stress[3],stress[4],
- stress[2],stress[4],stress[5]);
- }
- break;
- case 4:
- fprintf(fp,"%lf ",density);
- break;
- case 5:
- fprintf(fp,"%lf ",alpha);
- break;
- case 6:
- fprintf(fp,"%lf ",diffusivity);
- break;
+ stress[4]=particleExt->stress[4];
+ stress[5]=particleExt->stress[5];
}
}
}
switch(iteration)
{
- case 0:
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," </Points>\n");
- fprintf(fp," <PointData Scalars=\"Viscosity\" Tensors=\"Stress\">\n");
- fprintf(fp," <DataArray type=\"Float32\" Name=\"Viscosity\" format=\"ascii\">\n");
- break;
case 1:
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," <DataArray type=\"Float32\" Name=\"Yielding_fraction\" format=\"ascii\">\n");
+ fprintf(fp,"%lf ",viscosity);
break;
case 2:
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," <DataArray type=\"Float32\" Name=\"Stress\" format=\"ascii\" NumberOfComponents=\"9\">\n");
+ fprintf(fp,"%lf ",yielding);
break;
case 3:
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," <DataArray type=\"Float32\" Name=\"Density\" format=\"ascii\">\n");
+ if(dim==2)
+ {
+ fprintf(fp,"%lf %lf 0.0 %lf %lf 0.0 0.0 0.0 0.0 ",
+ stress[0],stress[1],
+ stress[1],stress[2]);
+ }
+ else
+ {
+ fprintf(fp,"%lf %lf %lf %lf %lf %lf %lf %lf %lf ",
+ stress[0],stress[1],stress[2],
+ stress[1],stress[3],stress[4],
+ stress[2],stress[4],stress[5]);
+ }
break;
case 4:
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," <DataArray type=\"Float32\" Name=\"Alpha\" format=\"ascii\">\n");
+ fprintf(fp,"%lf ",density);
break;
case 5:
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," <DataArray type=\"Float32\" Name=\"Thermal_Diffusivity\" format=\"ascii\">\n");
+ fprintf(fp,"%lf ",alpha);
break;
case 6:
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," </PointData>\n");
- fprintf(fp," <CellData>\n");
- fprintf(fp," </CellData>\n");
- fprintf(fp," <Cells>\n");
- fprintf(fp," <DataArray type=\"Int32\" Name=\"connectivity\" format=\"ascii\">\n");
- for(i=0;i<(num_particles-1)/stepping+1;++i)
- fprintf(fp,"%d ",i);
- fprintf(fp,"\n </DataArray>\n");
- fprintf(fp," <DataArray type=\"Int32\" Name=\"offsets\" format=\"ascii\">\n");
- fprintf(fp," %d\n",(num_particles-1)/stepping+1);
- fprintf(fp," </DataArray>\n");
- fprintf(fp," <DataArray type=\"UInt8\" Name=\"types\" format=\"ascii\">\n");
- fprintf(fp," 2\n");
- fprintf(fp," </DataArray>\n");
- fprintf(fp," </Cells>\n");
- fprintf(fp," </Piece>\n");
- fprintf(fp," </UnstructuredGrid>\n");
- fprintf(fp,"</VTKFile>\n");
+ fprintf(fp,"%lf ",diffusivity);
+ break;
}
}
- fclose(fp);
- Memory_Free( filename );
+ }
+ switch(iteration)
+ {
+ case 0:
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," </Points>\n");
+ fprintf(fp," <PointData Scalars=\"Viscosity\" Tensors=\"Stress\">\n");
+ fprintf(fp," <DataArray type=\"Float32\" Name=\"Viscosity\" format=\"ascii\">\n");
+ break;
+ case 1:
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," <DataArray type=\"Float32\" Name=\"Yielding_fraction\" format=\"ascii\">\n");
+ break;
+ case 2:
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," <DataArray type=\"Float32\" Name=\"Stress\" format=\"ascii\" NumberOfComponents=\"9\">\n");
+ break;
+ case 3:
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," <DataArray type=\"Float32\" Name=\"Density\" format=\"ascii\">\n");
+ break;
+ case 4:
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," <DataArray type=\"Float32\" Name=\"Alpha\" format=\"ascii\">\n");
+ break;
+ case 5:
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," <DataArray type=\"Float32\" Name=\"Thermal_Diffusivity\" format=\"ascii\">\n");
+ break;
+ case 6:
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," </PointData>\n");
+ fprintf(fp," <CellData>\n");
+ fprintf(fp," </CellData>\n");
+ fprintf(fp," <Cells>\n");
+ fprintf(fp," <DataArray type=\"Int32\" Name=\"connectivity\" format=\"ascii\">\n");
+ for(i=0;i<(num_particles-1)/stepping+1;++i)
+ fprintf(fp,"%d ",i);
+ fprintf(fp,"\n </DataArray>\n");
+ fprintf(fp," <DataArray type=\"Int32\" Name=\"offsets\" format=\"ascii\">\n");
+ fprintf(fp," %d\n",(num_particles-1)/stepping+1);
+ fprintf(fp," </DataArray>\n");
+ fprintf(fp," <DataArray type=\"UInt8\" Name=\"types\" format=\"ascii\">\n");
+ fprintf(fp," 2\n");
+ fprintf(fp," </DataArray>\n");
+ fprintf(fp," </Cells>\n");
+ fprintf(fp," </Piece>\n");
+ fprintf(fp," </UnstructuredGrid>\n");
+ fprintf(fp,"</VTKFile>\n");
+ }
+ }
+ fclose(fp);
+ Memory_Free( filename );
}
/* Print out the coordinates of the mesh. */
More information about the cig-commits
mailing list