[cig-commits] r4297 - mc/3D/CitcomS/trunk/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-08-15 13:48:52 -0700 (Tue, 15 Aug 2006)
New Revision: 4297

Modified:
   mc/3D/CitcomS/trunk/lib/Citcom_init.c
   mc/3D/CitcomS/trunk/lib/Instructions.c
Log:
Added 'output_format' input for stand-alone version

Modified: mc/3D/CitcomS/trunk/lib/Citcom_init.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Citcom_init.c	2006-08-15 20:46:55 UTC (rev 4296)
+++ mc/3D/CitcomS/trunk/lib/Citcom_init.c	2006-08-15 20:48:52 UTC (rev 4297)
@@ -1,6 +1,6 @@
 /*
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * 
+ *
  *<LicenseText>
  *
  * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
@@ -22,7 +22,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *</LicenseText>
- * 
+ *
  *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
@@ -51,11 +51,5 @@
   E->control.total_iteration_cycles=0;
   E->control.total_v_solver_calls=0;
 
-#ifdef USE_HDF5
-  strcpy(E->control.output_format, "hdf5");
-#else
-  strcpy(E->control.output_format, "ascii");
-#endif
-
   return(E);
 }

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2006-08-15 20:46:55 UTC (rev 4296)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2006-08-15 20:48:52 UTC (rev 4297)
@@ -270,6 +270,8 @@
   input_string("datafile",E->control.data_file,"initialize",m);
   input_string("datafile_old",E->control.old_P_file,"initialize",m);
 
+  input_string("output_format",E->control.output_format,"ascii",m);
+
   input_int("mgunitx",&(E->mesh.mgunitx),"1",m);
   input_int("mgunitz",&(E->mesh.mgunitz),"1",m);
   input_int("mgunity",&(E->mesh.mgunity),"1",m);