[cig-commits] r11878 - in mc/3D/CitcomS/trunk: CitcomS/Components lib module

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-04-30 17:51:25 -0700 (Wed, 30 Apr 2008)
New Revision: 11878

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Output_h5.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Inputing tbcs_file & temperature_boundary_file


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Param.py	2008-05-01 00:24:01 UTC (rev 11877)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Param.py	2008-05-01 00:51:25 UTC (rev 11878)
@@ -56,6 +56,9 @@
         file_vbcs = pyre.inventory.bool("file_vbcs", default=False)
         vel_bound_file = pyre.inventory.str("vel_bound_file", default="bvel.dat")
 
+        file_tbcs = pyre.inventory.bool("file_tbcs", default=False)
+        temp_bound_file = pyre.inventory.str("temp_bound_file", default="btemp.dat")
+
         mat_control = pyre.inventory.bool("mat_control", default=False)
         mat_file = pyre.inventory.str("mat_file", default="mat.dat")
 

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2008-05-01 00:24:01 UTC (rev 11877)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2008-05-01 00:51:25 UTC (rev 11878)
@@ -441,6 +441,9 @@
   input_int("file_vbcs",&(E->control.vbcs_file),"0",m);
   input_string("vel_bound_file",E->control.velocity_boundary_file,"",m);
 
+  input_int("file_tbcs",&(E->control.tbcs_file),"0",m);
+  input_string("temp_bound_file",E->control.temperature_boundary_file,"",m);
+
   input_int("reference_state",&(E->refstate.choice),"1",m);
   if(E->refstate.choice == 0) {
       input_string("refstate_file",E->refstate.filename,"refstate.dat",m);

Modified: mc/3D/CitcomS/trunk/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Output_h5.c	2008-05-01 00:24:01 UTC (rev 11877)
+++ mc/3D/CitcomS/trunk/lib/Output_h5.c	2008-05-01 00:51:25 UTC (rev 11878)
@@ -1421,6 +1421,9 @@
     status = set_attribute_int(input, "file_vbcs", E->control.vbcs_file);
     status = set_attribute_string(input, "vel_bound_file", E->control.velocity_boundary_file);
 
+    status = set_attribute_int(input, "file_tbcs", E->control.tbcs_file);
+    status = set_attribute_string(input, "temp_bound_file", E->control.temperature_boundary_file);
+
     status = set_attribute_int(input, "mat_control", E->control.mat_control);
     status = set_attribute_string(input, "mat_file", E->control.mat_file);
 

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2008-05-01 00:24:01 UTC (rev 11877)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2008-05-01 00:51:25 UTC (rev 11878)
@@ -366,6 +366,9 @@
     getIntProperty(properties, "file_vbcs", E->control.vbcs_file, fp);
     getStringProperty(properties, "vel_bound_file", E->control.velocity_boundary_file, fp);
 
+    getIntProperty(properties, "file_tbcs", E->control.tbcs_file, fp);
+    getStringProperty(properties, "temp_bound_file", E->control.temperature_boundary_file, fp);
+
     getIntProperty(properties, "mat_control", E->control.mat_control, fp);
     getStringProperty(properties, "mat_file", E->control.mat_file, fp);