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
Visc.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>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
from CitcomComponent import CitcomComponent
class Visc(CitcomComponent):
def __init__(self, name="visc", facility="visc"):
CitcomComponent.__init__(self, name, facility)
return
def setProperties(self, stream):
from CitcomSLib import Visc_set_properties
inv = self.inventory
inv.visc0 = map(float, inv.visc0)
inv.viscE = map(float, inv.viscE)
inv.viscT = map(float, inv.viscT)
inv.viscZ = map(float, inv.viscZ)
inv.sdepv_expt = map(float, inv.sdepv_expt)
inv.pdepv_a = map(float, inv.pdepv_a)
inv.pdepv_b = map(float, inv.pdepv_b)
inv.pdepv_y = map(float, inv.pdepv_y)
inv.cdepv_ff = map(float, inv.cdepv_ff)
Visc_set_properties(self.all_variables, inv, stream)
return
def updateMaterial(self):
from CitcomSLib import Visc_update_material
Visc_update_material(self.all_variables)
return
class Inventory(CitcomComponent.Inventory):
import pyre.inventory
Viscosity = pyre.inventory.str("Viscosity", default="system")
visc_smooth_method = pyre.inventory.int("visc_smooth_method", default=3)
VISC_UPDATE = pyre.inventory.bool("VISC_UPDATE", default=True)
num_mat = pyre.inventory.int("num_mat", default=4)
visc0 = pyre.inventory.list("visc0", default=[1, 1, 1, 1])
TDEPV = pyre.inventory.bool("TDEPV", default=False)
rheol = pyre.inventory.int("rheol", default=3)
viscE = pyre.inventory.list("viscE", default=[1, 1, 1, 1])
viscT = pyre.inventory.list("viscT", default=[1, 1, 1, 1])
viscZ = pyre.inventory.list("viscZ", default=[1, 1, 1, 1])
SDEPV = pyre.inventory.bool("SDEPV", default=False)
sdepv_expt = pyre.inventory.list("sdepv_expt", default=[1, 1, 1, 1])
sdepv_misfit = pyre.inventory.float("sdepv_misfit", default=0.001)
PDEPV = pyre.inventory.bool("PDEPV", default=False)
pdepv_eff = pyre.inventory.bool("pdepv_eff", default=True)
pdepv_a= pyre.inventory.list("pdepv_a", default=[1e20, 1e20, 1e20, 1e20])
pdepv_b= pyre.inventory.list("pdepv_b", default=[0, 0, 0, 0])
pdepv_y= pyre.inventory.list("pdepv_y", default=[1e20, 1e20, 1e20, 1e20])
pdepv_offset = pyre.inventory.float("pdepv_offset", default=0.0)
CDEPV = pyre.inventory.bool("CDEPV", default=False)
cdepv_ff= pyre.inventory.list("cdepv_ff", default=[1])
low_visc_channel = pyre.inventory.bool("low_visc_channel", default=False)
low_visc_wedge = pyre.inventory.bool("low_visc_wedge", default=False)
lv_min_radius = pyre.inventory.float("lv_min_radius", default=0.9764)
lv_max_radius = pyre.inventory.float("lv_max_radius", default=0.9921)
lv_channel_thickness = pyre.inventory.float("lv_channel_thickness", default=0.0047)
lv_reduction = pyre.inventory.float("lv_reduction", default=0.5)
VMIN = pyre.inventory.bool("VMIN", default=False)
visc_min = pyre.inventory.float("visc_min", default=1.0e-3)
VMAX = pyre.inventory.bool("VMAX", default=False)
visc_max = pyre.inventory.float("visc_max", default=1.0e3)
# version
__id__ = "$Id$"
# End of file
Computing file changes ...