Skip to main content

Browse the archive

Revision 13492bf45888f5b55d194881d9da8b9040b9984e authored by Thorsten Becker on 29 August 2007, 00:51:20 UTC, committed by Thorsten Becker on 29 August 2007, 00:51:20 UTC 
When checking in my changes, I had to resolve a conflict for
 
lib/Instructions.c by hand, which I hope I did properly. Here are my changes:

- renamed CONTOL structure members ORTHO and ORTHOZ to CITCOM_ORTHO and CITCOM_ORTHOZ
  Those were never used and conflicted with definitions in GMT gmt.h

- Added a higher frequency heat flow output option like so:

 
write_q_files=1                       # option to write heat flux to files qt.dat and qb.dat 
                                      # at intervals smaller than storage_spacing (0)


- Added the capability to read in initial temperatures from netcdf grd files, if -USE_GGRD is used. 
  Lot of options, like so:

#
# read initial temperature conditions from grd files (default values in parentheses)
#
tic_method=4                          # read initial temperature from netcdf GRD files (off)

ggrd_tinit_scale_with_prem=off        # scale the temperature with PREM densities (off)

ggrd_tinit_scale=1.0                  # scaling factor to apply to read in scalars f (1.0)

ggrd_tinit_offset=-0.5                 # offset, T = f * scale + offset + tm   (0.0)
                                       # where tm is the mean between top and bottom TBC values
                                       # if the bottom is flux, will use 1 for bottom TBC value

ggrd_tinit_gfile="../../data/tomography/s20a_smean_new_age/t" # prefix of grd files, will 
                                                              # try to read t.1.grd, t.2.grd ... t.n.grd
                                                              # where n is the number of layers in the depth file
ggrd_tinit_dfile="../../data/tomography/s20a_smean_new_age/tdepth.dat" # file with layer depths in km from bottom up

ggrd_tinit_prem_file="../../progs/src/hc-svn/prem/prem.dat"  # PREM data file
ggrd_tinit_override_tbc=on            # override temperature boundary conditions (off)
1 parent 3ba2a04
Raw File
Makefile.am 
## Process this file with automake to produce Makefile.in
##
##<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>

# $Id$


ACLOCAL_AMFLAGS = -I ./m4

if COND_PYRE
    MAYBE_PYRE = CitcomS etc examples module tests visual
endif

SUBDIRS = lib $(MAYBE_PYRE) bin

EXTRA_DIST = \
	setup.py \
	archimedes/__init__.py

if COND_PYRE
install-data-hook:
	top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
		cd $(top_srcdir) && \
		$(PYTHON) setup.py install_deps -H None -f $$top_builddir/deps --prefix=$(prefix) && \
		$(PYTHON) setup.py egg_info -e $(pythondir)
endif


## end of Makefile.am
back to top