[cig-commits] r8144 - in mc/3D/CitcomS/trunk: CitcomS/Coupler module/Exchanger

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-10-18 11:53:49 -0700 (Thu, 18 Oct 2007)
New Revision: 8144

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py
   mc/3D/CitcomS/trunk/module/Exchanger/Convertor.cc
   mc/3D/CitcomS/trunk/module/Exchanger/Convertor.h
   mc/3D/CitcomS/trunk/module/Exchanger/exchangers.cc
Log:
Renamed coupler inventory: dimensional -> si_unit and transformational -> cartesian

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py	2007-10-18 18:49:46 UTC (rev 8143)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py	2007-10-18 18:53:49 UTC (rev 8144)
@@ -74,8 +74,8 @@
         # init'd Convertor singleton, this must be done before any other
         # exchanger call
         from ExchangerLib import initConvertor
-        initConvertor(self.inventory.dimensional,
-                      self.inventory.transformational,
+        initConvertor(self.inventory.si_unit,
+                      self.inventory.cartesian,
                       self.all_variables)
 
         return
@@ -156,12 +156,12 @@
         exchange_initial_temperature = prop.bool("exchange_initial_temperature",
                                                  default=True)
 
-        # if dimensional is True, quantities exchanged are dimensional
-        dimensional = prop.bool("dimensional", default=False)
+        # if si_unit is True, quantities exchanged are in SI units
+        si_unit = prop.bool("si_unit", default=False)
 
-        # if transformational is True, quantities exchanged are in standard
+        # if cartesion is True, quantities exchanged are in standard
         # (ie. Cartesian) coordinate system
-        transformational = prop.bool("transformational", default=False)
+        cartesian = prop.bool("cartesian", default=False)
 
 
 

Modified: mc/3D/CitcomS/trunk/module/Exchanger/Convertor.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/Convertor.cc	2007-10-18 18:49:46 UTC (rev 8143)
+++ mc/3D/CitcomS/trunk/module/Exchanger/Convertor.cc	2007-10-18 18:53:49 UTC (rev 8144)
@@ -33,16 +33,16 @@
 #include "journal/diagnostics.h"
 
 
-void Convertor::init(bool dimensional, bool transformational,
+void Convertor::init(bool si_unit, bool cartesian,
 		     const All_variables* E)
 {
     journal::debug_t debug("CitcomS-Exchanger");
     debug << journal::at(__HERE__) << journal::endl;
 
-    if(dimensional)
+    if(si_unit)
 	si = new SIUnit(E);
 
-    if(transformational)
+    if(cartesian)
 	cart = new Exchanger::Spherical2Cartesian();
 
     inited = true;

Modified: mc/3D/CitcomS/trunk/module/Exchanger/Convertor.h
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/Convertor.h	2007-10-18 18:49:46 UTC (rev 8143)
+++ mc/3D/CitcomS/trunk/module/Exchanger/Convertor.h	2007-10-18 18:53:49 UTC (rev 8144)
@@ -43,7 +43,7 @@
 public:
     ~Convertor();
 
-    static void init(bool dimensional, bool transformational,
+    static void init(bool si_unit, bool cartesian,
 		     const All_variables* E);
 
 private:

Modified: mc/3D/CitcomS/trunk/module/Exchanger/exchangers.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/exchangers.cc	2007-10-18 18:49:46 UTC (rev 8143)
+++ mc/3D/CitcomS/trunk/module/Exchanger/exchangers.cc	2007-10-18 18:53:49 UTC (rev 8144)
@@ -155,15 +155,15 @@
 PyObject * PyCitcomSExchanger_initConvertor(PyObject *, PyObject *args)
 {
    PyObject *obj1;
-   int dimensional, transformational;
+   int si_unit, cartesian;
 
    if (!PyArg_ParseTuple(args, "iiO:initConvertor",
-			 &dimensional, &transformational, &obj1))
+			 &si_unit, &cartesian, &obj1))
         return NULL;
 
     All_variables* E = static_cast<All_variables*>(PyCObject_AsVoidPtr(obj1));
 
-    Convertor::init(dimensional, transformational, E);
+    Convertor::init(si_unit, cartesian, E);
 
     Py_INCREF(Py_None);
     return Py_None;