[cig-commits] r11889 - in mc/3D/CitcomS/trunk: CitcomS/Components CitcomS/Solver module

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-05-01 15:59:14 -0700 (Thu, 01 May 2008)
New Revision: 11889

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/BC.py
   mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
   mc/3D/CitcomS/trunk/module/bindings.c
   mc/3D/CitcomS/trunk/module/misc.c
   mc/3D/CitcomS/trunk/module/misc.h
Log:
Add python binding to update top surface temperatures


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/BC.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/BC.py	2008-05-01 22:56:12 UTC (rev 11888)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/BC.py	2008-05-01 22:59:14 UTC (rev 11889)
@@ -50,7 +50,13 @@
         return
 
 
+    def updatePlateTemperature(self):
+        from CitcomSLib import BC_update_plate_temperature
+        BC_update_plate_temperature(self.all_variables)
+        return
 
+
+
     class Inventory(CitcomComponent.Inventory):
 
         import pyre.inventory

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2008-05-01 22:56:12 UTC (rev 11888)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2008-05-01 22:59:14 UTC (rev 11889)
@@ -203,6 +203,7 @@
     def endTimestep(self, done):
         self.inventory.visc.updateMaterial()
         self.inventory.bc.updatePlateVelocity()
+        self.inventory.bc.updatePlateTemperature()
         return done
 
 

Modified: mc/3D/CitcomS/trunk/module/bindings.c
===================================================================
--- mc/3D/CitcomS/trunk/module/bindings.c	2008-05-01 22:56:12 UTC (rev 11888)
+++ mc/3D/CitcomS/trunk/module/bindings.c	2008-05-01 22:59:14 UTC (rev 11889)
@@ -105,6 +105,11 @@
      METH_VARARGS,
      pyCitcom_velocities_conform_bcs__doc__},
 
+    {pyCitcom_BC_update_plate_temperature__name__,
+     pyCitcom_BC_update_plate_temperature,
+     METH_VARARGS,
+     pyCitcom_BC_update_plate_temperature__doc__},
+
     {pyCitcom_BC_update_plate_velocity__name__,
      pyCitcom_BC_update_plate_velocity,
      METH_VARARGS,

Modified: mc/3D/CitcomS/trunk/module/misc.c
===================================================================
--- mc/3D/CitcomS/trunk/module/misc.c	2008-05-01 22:56:12 UTC (rev 11888)
+++ mc/3D/CitcomS/trunk/module/misc.c	2008-05-01 22:59:14 UTC (rev 11889)
@@ -47,6 +47,7 @@
 void global_default_values(struct All_variables*);
 void parallel_process_termination();
 void read_mat_from_file(struct All_variables*);
+void read_temperature_boundary_from_file(struct All_variables*);
 void read_velocity_boundary_from_file(struct All_variables*);
 void set_signal();
 void tracer_advection(struct All_variables*);
@@ -253,6 +254,27 @@
 }
 
 
+char pyCitcom_BC_update_plate_temperature__doc__[] = "";
+char pyCitcom_BC_update_plate_temperature__name__[] = "BC_update_plate_temperature";
+
+PyObject * pyCitcom_BC_update_plate_temperature(PyObject *self, PyObject *args)
+{
+    PyObject *obj;
+    struct All_variables* E;
+
+    if (!PyArg_ParseTuple(args, "O:BC_update_plate_temperature", &obj))
+        return NULL;
+
+    E = (struct All_variables*)(PyCObject_AsVoidPtr(obj));
+
+    if(E->control.tbcs_file==1)
+        read_temperature_boundary_from_file(E);
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
 char pyCitcom_BC_update_plate_velocity__doc__[] = "";
 char pyCitcom_BC_update_plate_velocity__name__[] = "BC_update_plate_velocity";
 
@@ -267,7 +289,7 @@
     E = (struct All_variables*)(PyCObject_AsVoidPtr(obj));
 
     if(E->control.vbcs_file==1)
-      read_velocity_boundary_from_file(E);
+        read_velocity_boundary_from_file(E);
 
     Py_INCREF(Py_None);
     return Py_None;

Modified: mc/3D/CitcomS/trunk/module/misc.h
===================================================================
--- mc/3D/CitcomS/trunk/module/misc.h	2008-05-01 22:56:12 UTC (rev 11888)
+++ mc/3D/CitcomS/trunk/module/misc.h	2008-05-01 22:59:14 UTC (rev 11889)
@@ -78,6 +78,11 @@
 PyObject * pyCitcom_velocities_conform_bcs(PyObject *, PyObject *);
 
 
+extern char pyCitcom_BC_update_plate_temperature__name__[];
+extern char pyCitcom_BC_update_plate_temperature__doc__[];
+PyObject * pyCitcom_BC_update_plate_temperature(PyObject *, PyObject *);
+
+
 extern char pyCitcom_BC_update_plate_velocity__name__[];
 extern char pyCitcom_BC_update_plate_velocity__doc__[];
 PyObject * pyCitcom_BC_update_plate_velocity(PyObject *, PyObject *);