[cig-commits] r4578 - in mc/3D/CitcomS/trunk: CitcomS examples
examples/Cookbook1 examples/Cookbook2 examples/Cookbook3
examples/Cookbook4 examples/Cookbook5 examples/Cookbook7
tan2 at geodynamics.org
tan2 at geodynamics.org
Wed Sep 20 17:18:04 PDT 2006
Author: tan2
Date: 2006-09-20 17:18:04 -0700 (Wed, 20 Sep 2006)
New Revision: 4578
Modified:
mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py
mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg
mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg
mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg
mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg
mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg
mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg
mc/3D/CitcomS/trunk/examples/example0.cfg
mc/3D/CitcomS/trunk/examples/example1.cfg
Log:
Calculate the needed # of cpu according to mesher properties. There is no longer a need to set launcher.nodes.
Modified: mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py 2006-09-21 00:18:04 UTC (rev 4578)
@@ -48,6 +48,17 @@
+ def _configure(self):
+ BaseApplication._configure(self)
+ s1 = self.inventory.solver1.inventory.mesher.inventory
+ nproc1 = s1.nproc_surf * s1.nprocx * s1.nprocy * s1.nprocz
+ s2 = self.inventory.solver2.inventory.mesher.inventory
+ nproc2 = s2.nproc_surf * s2.nprocx * s2.nprocy * s2.nprocz
+ self.inventory.launcher.nodes = nproc1 + nproc2
+ return
+
+
+
def initialize(self):
layout = self.inventory.layout
layout.initialize(self)
Modified: mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/CitcomS/SimpleApp.py 2006-09-21 00:18:04 UTC (rev 4578)
@@ -43,6 +43,15 @@
+ def _configure(self):
+ BaseApplication._configure(self)
+ s = self.inventory.solver.inventory.mesher.inventory
+ nproc = s.nproc_surf * s.nprocx * s.nprocy * s.nprocz
+ self.inventory.launcher.nodes = nproc
+ return
+
+
+
def initialize(self):
layout = self.findLayout()
Modified: mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/Cookbook1/cookbook1.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -4,9 +4,6 @@
solver = full
steps = 101 ; number of time steps
-[CitcomS.launcher]
-nodes = 12 ; number of processors
-
[CitcomS.controller]
monitoringFrequency = 25 ; how often to monitor the computation
Modified: mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/Cookbook2/cookbook2.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -3,9 +3,6 @@
[CitcomS]
steps = 61 ; number of time steps
-[CitcomS.launcher]
-nodes = 4 ; number of processors
-
[CitcomS.controller]
monitoringFrequency = 30 ; how often to monitor the computation
Modified: mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/Cookbook3/cookbook3.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -3,9 +3,6 @@
[CitcomS]
steps = 200 ; number of time steps
-[CitcomS.launcher]
-nodes = 4 ; number of processors
-
[CitcomS.controller]
monitoringFrequency = 25 ; how often to monitor the computation
Modified: mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/Cookbook4/cookbook4.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -7,12 +7,6 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-[CitcomS.launcher]
-
-nodes = 16 ; number of processors
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[CitcomS.controller]
monitoringFrequency = 10 ; how often to monitor the computation
Modified: mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/Cookbook5/cookbook5.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -7,12 +7,6 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-[CitcomS.launcher]
-
-nodes = 64 ; number of processors
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[CitcomS.controller]
monitoringFrequency = 10 ; how often to monitor the computation
Modified: mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/Cookbook7/cookbook7.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -7,12 +7,6 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-[CitcomS.launcher]
-
-nodes = 32
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[CitcomS.controller]
monitoringFrequency = 10
@@ -67,7 +61,7 @@
# To try a different hot blob, one can specify three parameters:
# 1. blob_center: Coordinates(theta,fi,r) of the center.
# 2. blob_radius: Radius as non-dimensional distance.
-# 3. blob_dT: The amount of temperature increase/decrease
+# 3. blob_dT: The amount of temperature increase/decrease
# within the blob as non-dimensional temperature.
#
# Note: It is required to keep "tic_method = 2" to have the initial
Modified: mc/3D/CitcomS/trunk/examples/example0.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/example0.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/example0.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -5,9 +5,6 @@
[CitcomS.controller]
monitoringFrequency = 1
-[CitcomS.launcher]
-nodes = 1
-
[CitcomS.solver]
datafile = example0
Modified: mc/3D/CitcomS/trunk/examples/example1.cfg
===================================================================
--- mc/3D/CitcomS/trunk/examples/example1.cfg 2006-09-20 22:51:34 UTC (rev 4577)
+++ mc/3D/CitcomS/trunk/examples/example1.cfg 2006-09-21 00:18:04 UTC (rev 4578)
@@ -5,9 +5,6 @@
[CitcomS.controller]
monitoringFrequency = 10
-[CitcomS.launcher]
-nodes = 4
-
[CitcomS.solver]
datafile = example1
More information about the cig-commits
mailing list