Revision 0461d2e117ce88704a56dd8bcbf6bf7787991b15 authored by Eh Tan on 08 November 2007, 23:28:46 UTC, committed by Eh Tan on 08 November 2007, 23:28:46 UTC
svn+ssh://svn@geodynamics.org/cig/mc/3D/CitcomS/trunk ........ r8194 | tan2 | 2007-10-30 14:49:58 -0700 (Tue, 30 Oct 2007) | 1 line Compute d(rho)/dr/rho from rho(r) ........ r8195 | tan2 | 2007-10-30 14:50:52 -0700 (Tue, 30 Oct 2007) | 1 line Fixed a bug in dimensionalizing density. Provided the formula of geoid calculation in the comments. Rearranged the order of functions. ........ r8196 | tan2 | 2007-10-30 14:53:50 -0700 (Tue, 30 Oct 2007) | 1 line A post-processing program to project geoid coefficents onto a regular (longitude, latitude) mesh ........ r8197 | tan2 | 2007-10-30 14:54:14 -0700 (Tue, 30 Oct 2007) | 1 line Added the C program project_geoid to the makefile ........ r8199 | tan2 | 2007-10-30 15:29:44 -0700 (Tue, 30 Oct 2007) | 1 line Minor modification ........ r8201 | tan2 | 2007-11-01 16:33:30 -0700 (Thu, 01 Nov 2007) | 1 line Print dv/v=dp/p=1.0 for the 1st Uzawa iteraion ........ r8202 | tan2 | 2007-11-01 16:33:50 -0700 (Thu, 01 Nov 2007) | 1 line Fixed an error in comment ........ r8204 | tan2 | 2007-11-05 17:03:35 -0800 (Mon, 05 Nov 2007) | 1 line Scaled topo with variable gravity. Fixed an error in comment. Rearranged computation. ........ r8205 | tan2 | 2007-11-05 17:03:55 -0800 (Mon, 05 Nov 2007) | 1 line Removed functions related sph. harm in lib/Regional_obsolete.c ........ r8206 | tan2 | 2007-11-05 17:04:20 -0800 (Mon, 05 Nov 2007) | 1 line Shrank the size of sph. harm arrays ........ r8207 | tan2 | 2007-11-05 17:04:43 -0800 (Mon, 05 Nov 2007) | 1 line Init'd some variables about vtk_io, which might be accessed with uninit'd values in output_finalize() ........ r8212 | tan2 | 2007-11-06 15:17:54 -0800 (Tue, 06 Nov 2007) | 1 line Fixed a few memory errors ........ r8213 | tan2 | 2007-11-06 15:18:12 -0800 (Tue, 06 Nov 2007) | 1 line Increase vlowstep to match the default value in pyre ........ r8214 | tan2 | 2007-11-06 15:18:35 -0800 (Tue, 06 Nov 2007) | 1 line Removed unused multigrid parameters ........ r8215 | tan2 | 2007-11-06 15:18:54 -0800 (Tue, 06 Nov 2007) | 1 line Added cgrad solver convergence parameters, increased buoyancy_ratio and lower the # of steps ........ r8226 | tan2 | 2007-11-07 11:51:56 -0800 (Wed, 07 Nov 2007) | 1 line Print a warning when matrix eqn solver not converging ........ r8227 | tan2 | 2007-11-07 11:52:17 -0800 (Wed, 07 Nov 2007) | 1 line Removed comp_el from default output, since it is not required for restart anymore. ........ r8228 | tan2 | 2007-11-07 11:52:39 -0800 (Wed, 07 Nov 2007) | 1 line Decreased the # of processors. This is the only way I can reproduce single-cell convection as in the manual. ........ r8235 | tan2 | 2007-11-08 11:18:26 -0800 (Thu, 08 Nov 2007) | 1 line Dereased the timestep size to reduce artifacts in advection ........ r8236 | tan2 | 2007-11-08 11:18:52 -0800 (Thu, 08 Nov 2007) | 1 line Update NEWS ........ r8237 | tan2 | 2007-11-08 11:19:12 -0800 (Thu, 08 Nov 2007) | 1 line Update the version number ........ r8241 | tan2 | 2007-11-08 13:17:14 -0800 (Thu, 08 Nov 2007) | 1 line Updated file ChangeLog to r8240 ........ r8242 | tan2 | 2007-11-08 13:36:55 -0800 (Thu, 08 Nov 2007) | 1 line Removed binary checkpoint files from makefile, as the file size is too big for distribution. ........ r8243 | tan2 | 2007-11-08 13:38:09 -0800 (Thu, 08 Nov 2007) | 1 line Updated file ChangeLog to r8242 ........ r8244 | tan2 | 2007-11-08 14:31:21 -0800 (Thu, 08 Nov 2007) | 1 line Replaced a system call by std C library remove() and disabled another system call (backup input file). Partially fixed issue130. All remaining system calls are in lib/Output_gzdir.c. ........ r8245 | tan2 | 2007-11-08 14:41:31 -0800 (Thu, 08 Nov 2007) | 1 line Updated file ChangeLog to r8244 ........
1 parent a828fa9
MultiCoupledApp.py
#! usr/bin/env python
#
#
#
# need corresponding coupler controller solver
#
#
#
#
#
#
from BaseApplication import BaseApplication
import journal
class MultiCoupledApp(BaseApplication):
def __init__(self, name="CitcomS"):
BaseApplication.__init__(self, name)
self.solver = None
self.solverCommunicator = None
# list of communicators used to pass imformation between solvers
self.myPlus = []
self.remotePlus = []
# containing solver need to do more communication
self.myPlus2 = []
self.remotePlus2 = []
self.comm = None
self.rank = 0
self.nodes = 0
return
def getNodes(self):
# csolver requires nproc1 CPUs to run
s1 = self.inventory.csolver.inventory.mesher.inventory
nproc1 = s1.nproc_surf * s1.nprocx * s1.nprocy * s1.nprocz
# esolver1 requires nproc2 CPUs to run
s2 = self.inventory.esolver1.inventory.mesher.inventory
nproc2 = s2.nproc_surf * s2.nprocx * s2.nprocy * s2.nprocz
# esolver2 requires nproc3 CPUs to run
s3 = self.inventory.esolver2.inventory.mesher.inventory
nproc3 = s3.nproc_surf * s3.nprocx * s3.nprocy * s3.nprocz
return nproc1 + nproc2 + nproc3
def initialize(self):
layout = self.inventory.layout
layout.initialize(self)
self.findLayout(layout)
self.controller.initialize(self)
return
def findLayout(self, layout):
if layout.ccomm:
# This process belongs to the containing solver
self.controller = self.inventory.ccontroller
self.solver = self.inventory.csolver
self.coupler = self.inventory.ccoupler
self.solverCommunicator = layout.ccomm
self.myPlus = layout.ccommPlus1
self.remotePlus = layout.ecommPlus1
self.myPlus2 = layout.ccommPlus2
self.remotePlus2 = layout.ecommPlus2
elif layout.ecomm1:
# This process belongs to the embedded solver1
self.controller = self.inventory.econtroller1
self.solver = self.inventory.esolver1
self.coupler = self.inventory.ecoupler1
self.solverCommunicator = layout.ecomm1
self.myPlus = layout.ecommPlus1
self.remotePlus = layout.ccommPlus1
elif layout.ecomm2:
# This process belongs to the embedded solver2
self.controller = self.inventory.econtroller2
self.solver = self.inventory.esolver2
self.coupler = self.inventory.ecoupler2
self.solverCommunicator = layout.ecomm2
self.myPlus = layout.ecommPlus2
self.remotePlus = layout.ccommPlus2
else:
# This process doesn't belong to any solver
import journal
journal.warning(self.name).log("node '%d' is an orphan"
% layout.rank)
self.comm = layout.comm
self.rank = layout.rank
self.nodes = layout.nodes
return
def reportConfiguration(self):
rank = self.comm.rank
if rank != 0:
return
self._info.line("configuration:")
self._info.line(" facilities:")
self._info.line(" launcher: %r" % self.inventory.launcher.name)
self._info.line(" csolver: %r" % self.inventory.csolver.name)
self._info.line(" esolver1: %r" % self.inventory.esolver1.name)
self._info.line(" esolver2: %r" % self.inventory.esolver2.name)
self._info.line(" ccontroller: %r" % self.inventory.ccontroller.name)
self._info.line(" econtroller1: %r" % self.inventory.econtroller1.name)
self._info.line(" econtroller2: %r" % self.inventory.econtroller2.name)
self._info.line(" ccoupler: %r" % self.inventory.ccoupler.name)
self._info.line(" ecoupler1: %r" % self.inventory.ecoupler1.name)
self._info.line(" ecoupler2: %r" % self.inventory.ecoupler2.name)
self._info.line(" layout: %r" % self.inventory.layout.name)
return
class Inventory(BaseApplication.Inventory):
import pyre.inventory
import Controller
import Solver
import Coupler
import MultiLayout
ccontroller = pyre.inventory.facility(name="ccontroller",
factory=Controller.controller,
args=("ccontroller","ccontroller"))
econtroller1 = pyre.inventory.facility(name="econtroller1",
factory=Controller.controller,
args=("econtroller1","econtroller1"))
econtroller2 = pyre.inventory.facility(name="econtroller2",
factory=Controller.controller,
args=("econtroller2","econtroller2"))
ccoupler = pyre.inventory.facility("ccoupler",
factory=Coupler.multicontainingcoupler,
args=("ccoupler","ccoupler"))
ecoupler1 = pyre.inventory.facility("ecoupler1",
factory=Coupler.multiembeddedcoupler,
args=("ecoupler1","ecoupler1"))
ecoupler2 = pyre.inventory.facility("ecoupler2",
factory=Coupler.multiembeddedcoupler,
args=("ecoupler2","ecoupler2"))
csolver = pyre.inventory.facility("csolver",
factory=Solver.multicoupledRegionalSolver,
args=("csolver", "csolver"))
esolver1 = pyre.inventory.facility("esolver1",
factory=Solver.multicoupledRegionalSolver,
args=("esolver1", "esolver1"))
esolver2 = pyre.inventory.facility("esolver2",
factory=Solver.multicoupledRegionalSolver,
args=("esolver2", "esolver2"))
layout = pyre.inventory.facility("layout", factory=MultiLayout.MultiLayout,
args=("layout", "layout"))
steps = pyre.inventory.int("steps", default=1)
# version
__id__ = "$Id$"
# End of file
Computing file changes ...