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
combine.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>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
'''
Combine the pasted Citcom Data
usage: combine.py datafile timestep nodex nodey nodez ncap nprocx nprocy nprocz
'''
class Combine(object):
def __init__(self, nodex, nodey, nodez, nprocx, nprocy, nprocz):
self.nodex = nodex
self.nodey = nodey
self.nodez = nodez
self.nprocx = nprocx
self.nprocy = nprocy
self.nprocz = nprocz
# data storage
self.saved = range(nodex * nodey * nodez)
return
def readData(self, filename, headlines=1):
fp = file(filename, 'r')
# discard the header
for i in range(headlines):
header = fp.readline()
#print header
return fp.readlines()
def join(self, data, me):
# processor geometry
nprocx = self.nprocx
nprocy = self.nprocy
nprocz = self.nprocz
mylocz = me % nprocz
mylocx = ((me - mylocz) / nprocz) % nprocx
mylocy = (((me - mylocz) / nprocz - mylocx) / nprocx) % nprocy
#print me, mylocx, mylocy, mylocz
# mesh geometry
nodex = self.nodex
nodey = self.nodey
nodez = self.nodez
mynodex = 1 + (nodex-1)/nprocx
mynodey = 1 + (nodey-1)/nprocy
mynodez = 1 + (nodez-1)/nprocz
if not len(data) == mynodex * mynodey * mynodez:
raise ValueError, "incorrect data size"
mynxs = (mynodex - 1) * mylocx
mynys = (mynodey - 1) * mylocy
mynzs = (mynodez - 1) * mylocz
n = 0
for i in range(mynys, mynys+mynodey):
for j in range(mynxs, mynxs + mynodex):
for k in range(mynzs, mynzs + mynodez):
m = k + j * nodez + i * nodex * nodez
self.saved[m] = data[n]
n += 1
return
def write(self, filename):
fp = file(filename, 'w')
header = '%d x %d x %d\n' % (self.nodex, self.nodey, self.nodez)
#print header
fp.write(header)
fp.writelines(self.saved)
return
##############################################
def combine(prefix, opts, step, nodex, nodey, nodez,
ncap, nprocx, nprocy, nprocz):
combined_files = []
nproc_per_cap = nprocx * nprocy * nprocz
for i in range(ncap):
cb = Combine(nodex, nodey, nodez, nprocx, nprocy, nprocz)
for n in range(i * nproc_per_cap, (i+1) * nproc_per_cap):
filename = '%s.%s.%d.%d.pasted' % (prefix, opts, n, step)
print 'reading', filename
data = cb.readData(filename, 0)
cb.join(data, n)
if opts == 'coord,velo,visc':
filename = '%s.cap%02d.%d' % (prefix, i, step)
else:
filename = '%s.opt%02d.%d' % (prefix, i, step)
print 'writing', filename
cb.write(filename)
combined_files.append(filename)
return combined_files
if __name__ == '__main__':
import sys
if not len(sys.argv) == 10:
print __doc__
sys.exit(1)
prefix = sys.argv[1]
step = int(sys.argv[2])
nodex = int(sys.argv[3])
nodey = int(sys.argv[4])
nodez = int(sys.argv[5])
ncap = int(sys.argv[6])
nprocx = int(sys.argv[7])
nprocy = int(sys.argv[8])
nprocz = int(sys.argv[9])
combine(prefix, step, nodex, nodey, nodez,
ncap, nprocx, nprocy, nprocz)
# version
# $Id$
# End of file
Computing file changes ...