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
pasteCitcomData.py
#!/usr/bin/env python
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
#<LicenseText>
#
# CitcomS.py by Eh Tan, Eun-seo Choi, and Pururav Thoutireddy.
# Copyright (C) 2007, 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 CitcomS data together
Usage: pasteCitcomData.py datadir datafile field1,field2[,...] rank step save_dir
datadir: directory of the output files
datafile: prefix of the output files
field1, field2, ...: the fields to be pasted (e.g.: coord, velo)
rank: MPI rank of the output
step: time step of the output
save_dir: directory for the pasted file
'''
def run(datadir, datafile, fields, rank, step, save_dir):
datadir = expand_datadir(datadir, rank)
outfile = '%s/%s.%s.%d.%d.pasted' % (save_dir, datafile, fields,
rank, step)
f = open(outfile, 'w')
try:
paste(datadir, datafile, fields, rank, step, f)
finally:
f.close()
return
def paste(datadir, datafile, fields, rank, step, stream=None):
if stream is None:
import sys
stream = sys.stdout
files = []
for infix in fields.split(','):
f = open_file(datadir, datafile, infix, rank, step)
strip_headerlines(f, infix)
files.append(f)
paste_files_and_write(stream, *files)
return
def expand_datadir(datadir, rank):
'''Expand the special strings in datadir
'''
##
s = "%HOSTNAME"
try:
datadir.index(s)
except: pass
else:
from socket import gethostname
datadir = datadir.replace(s, gethostname())
##
s = "%RANK"
try:
datadir.index(s)
except: pass
else:
datadir = datadir.replace(s, str(rank))
##
if datadir == "%DATADIR":
fp = os.popen("citcoms_datadir", "r")
datadir = fp.readline().strip()
fp.close()
return datadir
def open_file(datadir, datafile, infix, rank, step):
if infix == 'coord':
filename = '%s/%s.%s.%d' % (datadir, datafile, infix, rank)
else:
filename = '%s/%s.%s.%d.%d' % (datadir, datafile, infix, rank, step)
f = open(filename, 'r')
return f
def strip_headerlines(f, infix):
'''Remove the header lines from f
'''
# how many header lines for each infix
headers = {'coord': 1,
'botm': 1,
'comp_nd': 2,
'pressure': 2,
'stress': 2,
'surf': 1,
'velo': 2,
'visc': 1}
nlines = headers[infix]
for i in range(nlines):
f.readline()
return
def paste_files_and_write(stream, *files):
# zip all file iterators in one
from itertools import izip
lines = izip(*files)
# read all files simulataneously
for line in lines:
line = ' '.join([x.strip() for x in line]) + '\n'
stream.write(line)
return
if __name__ == '__main__':
import sys
if len(sys.argv) < 6:
print __doc__
sys.exit()
datadir = sys.argv[1]
datafile = sys.argv[2]
fields = sys.argv[3]
rank = int(sys.argv[4])
step = int(sys.argv[5])
save_dir = sys.argv[6]
run(datadir, datafile, fields, rank, step, save_dir)
# End of file
Computing file changes ...