[cig-commits] r7714 - in mc/3D/CitcomS/trunk: CitcomS tests

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-07-19 11:51:12 -0700 (Thu, 19 Jul 2007)
New Revision: 7714

Modified:
   mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
   mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py
   mc/3D/CitcomS/trunk/tests/coupled.cfg
   mc/3D/CitcomS/trunk/tests/multicoupled.cfg
Log:
Changed the name attribute of all application classes to 'CitcomS'. This allows the users to specify the same launcher parameters for all application in their ~/.pyre/CitcomS/CitcomS.cfg.

Modified: mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py	2007-07-19 18:37:13 UTC (rev 7713)
+++ mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py	2007-07-19 18:51:12 UTC (rev 7714)
@@ -33,7 +33,7 @@
 class CoupledApp(BaseApplication):
 
 
-    def __init__(self, name="CoupledCitcomS"):
+    def __init__(self, name="CitcomS"):
         BaseApplication.__init__(self, name)
 
         self.solver = None

Modified: mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py	2007-07-19 18:37:13 UTC (rev 7713)
+++ mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py	2007-07-19 18:51:12 UTC (rev 7714)
@@ -16,7 +16,7 @@
 class MultiCoupledApp(BaseApplication):
 
 
-    def __init__(self, name="MultiCoupledCitcomS"):
+    def __init__(self, name="CitcomS"):
         BaseApplication.__init__(self, name)
 
         self.solver = None

Modified: mc/3D/CitcomS/trunk/tests/coupled.cfg
===================================================================
--- mc/3D/CitcomS/trunk/tests/coupled.cfg	2007-07-19 18:37:13 UTC (rev 7713)
+++ mc/3D/CitcomS/trunk/tests/coupled.cfg	2007-07-19 18:51:12 UTC (rev 7714)
@@ -1,4 +1,4 @@
-[CoupledCitcomS]
+[CitcomS]
 steps = 2
 
 # containing solver
@@ -8,14 +8,14 @@
 esolver = regional
 
 
-[CoupledCitcomS.journal.debug]
+[CitcomS.journal.debug]
 Exchanger = on
 CitcomS-Exchanger = on
 
 
 ## citcoms must be configured with CXXFLAGS=-DDEBUG
 ## otherwise, this info will be disabled
-[CoupledCitcomS.journal.info]
+[CitcomS.journal.info]
 #CitcomS-GlobalBBox = on
 #Exchanger-exchangers-RemoteBBox = on
 #CitcomS-Boundary-BBox = on
@@ -43,35 +43,35 @@
 #Exchanger-Boundary-normal_recv = on
 
 
-[CoupledCitcomS.ecoupler]
+[CitcomS.ecoupler]
 two_way_communication = off
 
 
-[CoupledCitcomS.ccoupler]
+[CitcomS.ccoupler]
 two_way_communication = off
 
 
-[CoupledCitcomS.layout]
+[CitcomS.layout]
 # assigning proc. to csolver
 containing_group = [0]
 embedded_group = [1]
 
 
-[CoupledCitcomS.csolver]
+[CitcomS.csolver]
 datafile = cntn
 
-[CoupledCitcomS.csolver.mesher]
+[CitcomS.csolver.mesher]
 nprocz = 1
 nodex = 3
 nodey = 3
 nodez = 3
 
 
-[CoupledCitcomS.esolver]
+[CitcomS.esolver]
 datafile = embd
 
 
-[CoupledCitcomS.esolver.mesher]
+[CitcomS.esolver.mesher]
 nodex = 3
 nodey = 3
 nodez = 3
@@ -82,6 +82,6 @@
 fi_min = 0.3
 fi_max = 0.7
 
-[CoupledCitcomS.esolver.bc]
+[CitcomS.esolver.bc]
 side_sbcs = on
 

Modified: mc/3D/CitcomS/trunk/tests/multicoupled.cfg
===================================================================
--- mc/3D/CitcomS/trunk/tests/multicoupled.cfg	2007-07-19 18:37:13 UTC (rev 7713)
+++ mc/3D/CitcomS/trunk/tests/multicoupled.cfg	2007-07-19 18:51:12 UTC (rev 7714)
@@ -1,4 +1,4 @@
-[MultiCoupledCitcomS]
+[CitcomS]
 steps = 31
 
 # containing solver
@@ -11,14 +11,14 @@
 #esolver2 = regional
 
 
-[MultiCoupledCitcomS.journal.debug]
+[CitcomS.journal.debug]
 Exchanger = on
 CitcomS-Exchanger = on
 
 
 ## citcoms must be configured with CXXFLAGS=-DDEBUG
 ## otherwise, this info will be disabled
-[MultiCoupledCitcomS.journal.info]
+[CitcomS.journal.info]
 CitcomS-GlobalBBox = on
 #Exchanger-exchangers-RemoteBBox = on
 #CitcomS-Boundary-BBox = on
@@ -46,45 +46,45 @@
 #Exchanger-Boundary-normal_recv = on
 
 
-[MultiCoupledCitcomS.ecoupler1]
+[CitcomS.ecoupler1]
 two_way_communication = off
 
 
-[MultiCoupledCitcomS.ecoupler2]
+[CitcomS.ecoupler2]
 two_way_communication = off
 
 
-[MultiCoupledCitcomS.ccoupler]
+[CitcomS.ccoupler]
 two_way_communication = off
 
 
-[MultiCoupledCitcomS.layout]
+[CitcomS.layout]
 # assigning proc. to csolver
 containing_group = [0]
 embedded_group1 = [1]
 embedded_group2 = [2]
 
 
-[MultiCoupledCitcomS.csolver]
+[CitcomS.csolver]
 datafile = cntn
 
 
-[MultiCoupledCitcomS.csolver.mesher]
+[CitcomS.csolver.mesher]
 nprocz = 1
 nodex = 3
 nodey = 3
 nodez = 3
 
 
-[MultiCoupledCitcomS.esolver1]
+[CitcomS.esolver1]
 datafile = embd1
 
 
-[MultiCoupledCitcomS.esolver2]
+[CitcomS.esolver2]
 datafile = embd2
 
 
-[MultiCoupledCitcomS.esolver1.mesher]
+[CitcomS.esolver1.mesher]
 nodex = 3
 nodey = 3
 nodez = 3
@@ -96,7 +96,7 @@
 fi_max = 0.48
 
 
-[MultiCoupledCitcomS.esolver2.mesher]
+[CitcomS.esolver2.mesher]
 nodex = 3
 nodey = 3
 nodez = 3
@@ -108,10 +108,10 @@
 fi_max = 0.7
 
 
-[MultiCoupledCitcomS.esolver1.bc]
+[CitcomS.esolver1.bc]
 side_sbcs = on
 
 
-[MultiCoupledCitcomS.esolver2.bc]
+[CitcomS.esolver2.bc]
 side_sbcs = on