[cig-commits] r7876 - in mc/3D/CitcomS/trunk/CitcomS: . Coupler Solver

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-08-23 13:17:33 -0700 (Thu, 23 Aug 2007)
New Revision: 7876

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Controller.py
   mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py
   mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py
   mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py
   mc/3D/CitcomS/trunk/CitcomS/Solver/CoupledSolver.py
Log:
assert solver.tsolver.monitor_max_T is off in coupled run and remove debugging output


Modified: mc/3D/CitcomS/trunk/CitcomS/Controller.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Controller.py	2007-08-23 20:16:25 UTC (rev 7875)
+++ mc/3D/CitcomS/trunk/CitcomS/Controller.py	2007-08-23 20:17:33 UTC (rev 7876)
@@ -87,8 +87,7 @@
 
             # compute an acceptable timestep
             dt = self.stableTimestep()
-            print "controller received dt = %g" %dt
-            print "self.step = %g" %self.step
+
             # advance to the next step by dt
             self.advance(dt)
 

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py	2007-08-23 20:16:25 UTC (rev 7875)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py	2007-08-23 20:17:33 UTC (rev 7876)
@@ -48,6 +48,13 @@
 
 
     def initialize(self, solver):
+
+        # when monitor_max_T is on, the timestep size might get changed
+        # inside the tsolver, which will cause trouble in coupler
+        # synchronization.
+        assert solver.inventory.tsolver.inventory.monitor_max_T == False, \
+               'Error: solver.tsolver.monitor_max_T must be off!'
+
         self.communicator = solver.communicator
         self.srcCommList = solver.myPlus
 

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py	2007-08-23 20:16:25 UTC (rev 7875)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py	2007-08-23 20:17:33 UTC (rev 7876)
@@ -216,7 +216,7 @@
         from ExchangerLib import exchangeTimestep
 
         if self.synchronized:
-            print "start new big step"
+            #print "start new big step"
             mycomm = self.communicator
             self.ccplr_t = exchangeTimestep(old_dt,
                                             mycomm.handle(),
@@ -230,19 +230,19 @@
 
         # clipping oversized ecplr_t
         if self.ecplr_t >= self.ccplr_t:
-            print "** clip dt **"
-            print "dt = %g, ecplr_t = %g, ccplr_t = %g" %(dt, self.ecplr_t, self.ccplr_t)
+            #print "** clip dt **"
+            #print "dt = %g, ecplr_t = %g, ccplr_t = %g" %(dt, self.ecplr_t, self.ccplr_t)
             dt = dt - (self.ecplr_t - self.ccplr_t)
             self.ecplr_t = self.ccplr_t
             self.synchronized = True
-            print self.name, " SYNCHRONIZED!"
+            #print self.name, " SYNCHRONIZED!"
 
         # store timestep for interpolating boundary velocities
         self.inlet.storeTimestep(self.ecplr_t, self.ccplr_t)
 
-        print "%s -   old dt = %g   exchanged dt = %g" % (
-               self.name, old_dt, dt)
-        print "ccplr_t = %g  ecplr_t = %g" % (self.ccplr_t, self.ecplr_t)
+        #print "%s -   old dt = %g   exchanged dt = %g" % (
+        #       self.name, old_dt, dt)
+        #print "ccplr_t = %g  ecplr_t = %g" % (self.ccplr_t, self.ecplr_t)
         return dt
 
 

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py	2007-08-23 20:16:25 UTC (rev 7875)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py	2007-08-23 20:17:33 UTC (rev 7876)
@@ -174,8 +174,8 @@
         assert remote_dt2 < dt, \
                'Size of dt in the esolver is greater than dt in the csolver2!'
 
-        print "%s - old dt = %g   exchanged dt = %g" % (
-               self.__class__, dt, remote_dt)
+        #print "%s - old dt = %g   exchanged dt = %g" % (
+        #       self.__class__, dt, remote_dt)
         return dt
 
     def exchangeSignal2(self, signal):

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/CoupledSolver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/CoupledSolver.py	2007-08-23 20:16:25 UTC (rev 7875)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/CoupledSolver.py	2007-08-23 20:17:33 UTC (rev 7876)
@@ -109,7 +109,6 @@
 
         # negotiate with other solver(s)
         dt = self.coupler.stableTimestep(dt)
-        print "solver received dt = %g" %dt
         return dt