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
batchcombine.py
#!/usr/bin/env python
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
#<LicenseText>
#
# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
# Copyright (C) 2002-2005, California Institute of Technology.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#</LicenseText>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
'''
Paste and combine Citcom data
Usage: batchcombine.py <machinefile | node-list> datadir datafile timestep nodex nodey nodez ncap nprocx nprocy nprocz [fields [ncompositions]]
'''
def machinefile2nodes(machinefile, totalnodes):
nodelist = machinefile2nodelist(machinefile, totalnodes)
nodes = nodelist2nodes(nodelist)
return nodes
def machinefile2nodelist(machinefile, totalnodes):
'''Read the machinefile to get a list of machine names. If machinefile
is not readable, treat it as a string containing the machine names.
Return the list of machine names. The length of the list is totalnodes.
'''
try:
nodelist = file(machinefile).readlines()
except IOError:
nodelist = machinefile.split()
# check the length of nodelist
n = len(nodelist)
if not n == totalnodes:
print 'WARNING: length of machinefile does not match number of processors, try to duplicate machinefile...'
if (totalnodes > n) and ((totalnodes % n) == 0):
# try to match number of processors by duplicating nodelist
nodelist *= (totalnodes / n)
else:
raise ValueError, 'incorrect machinefile size'
return nodelist
def nodelist2nodes(nodelist):
# generate a string of machine names
nodes = ' '.join([x.strip() for x in nodelist])
return nodes
def batchpaste(datadir, datafile, fields, timestep, nodes):
from socket import gethostname
hostname = gethostname()
import os
cwd = os.getcwd()
for rank, node in enumerate(nodes):
if node == 'localhost' or node == hostname:
# local paste
import pasteCitcomData
pasteCitcomData.run(datadir, datafile, fields, rank, timestep, cwd)
else:
# remote paste
# replace 'rsh' with 'ssh' if necessary
remote_shell = 'rsh'
cmd = '%(remote_shell)s %(node)s pasteCitcomData.py %(datadir)s %(datafile)s %(fields)s %(rank)d %(timestep)d %(cwd)s' % vars()
os.system(cmd)
return
def batchcombine(nodes, datadir, datafile, timestep, nodex, nodey, nodez,
ncap, nprocx, nprocy, nprocz, fields,
ncompositions):
# paste
batchpaste(datadir, datafile, fields, timestep, nodes)
# combine
import combine
combined_files = combine.combine(datafile, fields, timestep,
nodex, nodey, nodez,
ncap, nprocx, nprocy, nprocz)
# delete pasted files
import glob
filenames = glob.glob('%(datafile)s.*.%(timestep)d.pasted' % vars())
import os
for filename in filenames:
os.remove(filename)
# create .general file
import dxgeneral
dxgeneral.write(fields, ncompositions, combined_files)
return
if __name__ == '__main__':
import sys
if not (12 <= len(sys.argv) <= 14):
print __doc__
sys.exit(1)
machinefile = sys.argv[1]
datadir = sys.argv[2]
datafile = sys.argv[3]
timestep = int(sys.argv[4])
nodex = int(sys.argv[5])
nodey = int(sys.argv[6])
nodez = int(sys.argv[7])
ncap = int(sys.argv[8])
nprocx = int(sys.argv[9])
nprocy = int(sys.argv[10])
nprocz = int(sys.argv[11])
fields = 'coord,velo,visc'
ncompositions = 0
if len(sys.argv) >= 13:
fields = sys.argv[12]
if len(sys.argv) == 14:
ncompositions = int(sys.argv[13])
totalnodes = nprocx * nprocy * nprocz * ncap
nodelist = machinefile2nodelist(machinefile, totalnodes)
batchcombine(nodelist, datadir, datafile, timestep, nodex, nodey, nodez,
ncap, nprocx, nprocy, nprocz, fields, ncompositions)
# version
# $Id$
# End of file
Computing file changes ...