[cig-commits] r14695 - long/3D/SNAC/trunk/Snac/libSnac/src

[echoi at geodynamics.org]

Author: echoi
Date: 2009-04-14 12:22:26 -0700 (Tue, 14 Apr 2009)
New Revision: 14695

Modified:
   long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
   long/3D/SNAC/trunk/Snac/libSnac/src/Material.h
Log:
Follow-up after the recent removal of obsolete plugins (Material.h) and the changes in the way of writing outputs (Context.c).



Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2009-04-14 18:33:21 UTC (rev 14694)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2009-04-14 19:22:26 UTC (rev 14695)
@@ -601,10 +601,13 @@
 	if( self->rank == 0 ) Journal_Printf( self->debug, "In: %s\n", __func__ );
 
 	/* Close the output files */
-
-	fclose( self->timeStepInfo );
-	fclose( self->simInfo );
 	fclose( self->stressTensorOut );
+	fclose( self->stressTensorCheckpoint );
+	if( self->rank==0 ) {
+		fclose( self->timeStepInfo );
+		fclose( self->checkpointTimeStepInfo );
+		fclose( self->simInfo );
+	}
 
 	/* Parallelisation information */
 	if( self->parallel ) {

Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Material.h
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Material.h	2009-04-14 18:33:21 UTC (rev 14694)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Material.h	2009-04-14 19:22:26 UTC (rev 14695)
@@ -47,9 +47,7 @@
 	#define Snac_Material_Plastic		0x00000002
 	#define Snac_Material_Maxwell		0x00000004
 	#define Snac_Material_ViscoPlastic	0x00000008
-	#define Snac_Material_MaxwellDruckerPrager	0x00000010
-	#define Snac_Material_MaxwellMohrCoulomb	0x00000020
-	#define Snac_Material_CreepMohrCoulomb		0x00000040
+	#define Snac_Material_EngVP			0x00000010
         typedef enum            {mohrcoulomb,druckerprager} plModel;
 
 	/* Material */