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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-09-27 12:07:33 -0700 (Thu, 27 Sep 2007)
New Revision: 8036

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
   mc/3D/CitcomS/trunk/lib/Regional_sphere_related.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Enable coor_refine for regional model, only radial coordinate is refined

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py	2007-09-27 03:32:37 UTC (rev 8035)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py	2007-09-27 19:07:33 UTC (rev 8036)
@@ -59,6 +59,8 @@
 
 
     def setProperties(self, stream):
+        self.inventory.coor_refine = map(float, self.inventory.coor_refine)
+
         from CitcomSLib import Sphere_set_properties
         Sphere_set_properties(self.all_variables, self.inventory, stream)
         return
@@ -74,7 +76,9 @@
         nprocy = pyre.inventory.int("nprocy", default=1)
         nprocz = pyre.inventory.int("nprocz", default=1)
 
-        coor = pyre.inventory.bool("coor", default=False)
+        coor = pyre.inventory.int("coor", default=0)
+        coor_refine = pyre.inventory.list("coor_refine", 
+                                          default=[0.1,0.15,0.1,0.2])
         coor_file = pyre.inventory.str("coor_file", default="coor.dat")
 
         nodex = pyre.inventory.int("nodex", default=9)

Modified: mc/3D/CitcomS/trunk/lib/Regional_sphere_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_sphere_related.c	2007-09-27 03:32:37 UTC (rev 8035)
+++ mc/3D/CitcomS/trunk/lib/Regional_sphere_related.c	2007-09-27 19:07:33 UTC (rev 8036)
@@ -164,7 +164,7 @@
 
 }
 
-else if(E->control.coor==0)   {
+ else if((E->control.coor==0) || (E->control.coor==2))   {
 
   /*
   for(i=1;i<=5;i++)  {
@@ -244,9 +244,6 @@
   free ((void *)SX[1]);
   free ((void *)tt);
   free ((void *)ff);
-}else{
-  myerror(E,"regional_sphere_related: coor setting not implemented");
-
 }
 
   return;

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-09-27 03:32:37 UTC (rev 8035)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-09-27 19:07:33 UTC (rev 8036)
@@ -532,6 +532,7 @@
     }
 
     getIntProperty(properties, "coor", E->control.coor, fp);
+    getFloatVectorProperty(properties, "coor_refine", E->control.coor_refine, 4, fp);
     getStringProperty(properties, "coor_file", E->control.coor_file, fp);
 
     getIntProperty(properties, "nodex", E->mesh.nox, fp);