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
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$
INCLUDES = -I$(top_srcdir)/lib
AM_CPPFLAGS =
if COND_HDF5
AM_CPPFLAGS += -DUSE_HDF5
endif
bin_PROGRAMS = CitcomSFull CitcomSRegional
if COND_PYRE
bin_SCRIPTS = citcoms
if COND_EMBEDDING
bin_PROGRAMS += pycitcoms mpipycitcoms
endif
if COND_EXCHANGER
PYLINK = $(CXXLINK)
MAYBE_WITH_EXCHANGER = -DWITH_EXCHANGER
if COND_EMBEDDING
MAYBE_EXCHANGER_MODULE = $(top_builddir)/module/Exchanger/libExchangerLibmodule.a
else
MAYBE_EXCHANGER_MODULE = $(top_builddir)/module/Exchanger/ExchangerLibmodule.la
endif
else
PYLINK = $(LINK)
MAYBE_WITH_EXCHANGER =
MAYBE_EXCHANGER_MODULE =
endif
else
bin_SCRIPTS =
endif
######## legacy drivers ########
CitcomSFull_SOURCES = Citcom.c CitcomSFull.c
CitcomSFull_LDADD = $(libCitcomS)
CitcomSRegional_SOURCES = Citcom.c CitcomSRegional.c
CitcomSRegional_LDADD = $(libCitcomS)
######## pyrized driver ########
abs_top_builddir = @abs_top_builddir@
abs_builddir = @abs_builddir@
if COND_EMBEDDING
INTERPRETER = $(bindir)/pycitcoms
noinstINTERPRETER = $(abs_builddir)/pycitcoms
noinstPYTHONPATH = $(abs_top_builddir)/python
libCitcomS = $(top_builddir)/lib/libCitcomS.a
else
INTERPRETER = $(PYTHON)
noinstINTERPRETER = $(PYTHON)
noinstPYTHONPATH = $(abs_top_builddir)/python:$(abs_top_builddir)/module/.libs
libCitcomS = $(top_builddir)/lib/libCitcomS.la
endif
if COND_PYRE
INCLUDES += \
-I$(top_srcdir)/module \
-I$(top_srcdir)/module/Exchanger \
$(PYTHON_EGG_CPPFLAGS) \
-I$(PYTHON_INCDIR)
endif
# citcoms (top-level Python script)
do_build = sed -e s%[@]INTERPRETER[@]%$(noinstINTERPRETER)%g -e s%[@]PYTHONPATH[@]%$(noinstPYTHONPATH)%g
do_install = sed -e s%[@]INTERPRETER[@]%$(INTERPRETER)%g -e s%[@]PYTHONPATH[@]%$(PYTHONPATH)%g
citcoms: $(srcdir)/citcoms.in Makefile
$(do_build) < $(srcdir)/citcoms.in > $@ || (rm -f $@ && exit 1)
chmod +x $@
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p.in"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p.in; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " $(do_install) '$$d$$p.in' > '$(DESTDIR)$(bindir)/$$f'"; \
$(do_install) "$$d$$p.in" > "$(DESTDIR)$(bindir)/$$f"; \
echo " chmod +x '$(DESTDIR)$(bindir)/$$f'"; \
chmod +x "$(DESTDIR)$(bindir)/$$f"; \
else :; fi; \
done
EXTRA_DIST = citcoms.in
CLEANFILES = $(bin_SCRIPTS)
# pycitcoms (libCitcomS + CitcomSLibmodule + embedded Python interpreter)
pycitcoms_SOURCES = pycitcoms.c dummy.cc
pycitcoms_CFLAGS = $(MAYBE_WITH_EXCHANGER)
pycitcoms_LDADD = \
$(top_builddir)/module/libCitcomSLibmodule.a \
$(MAYBE_EXCHANGER_MODULE) \
$(libCitcomS)
pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES)
@rm -f pycitcoms$(EXEEXT)
$(PYLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
$(pycitcoms_LDFLAGS) $(pycitcoms_OBJECTS) $(pycitcoms_LDADD) \
$(PYTHON_EGG_LDFLAGS) \
$(PYTHON_BLDLIBRARY) \
$(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
$(LIBS) \
$(PYTHON_LDLAST)
# pycitcoms (libCitcomS + CitcomSLibmodule + embedded Python interpreter)
mpipycitcoms_SOURCES = pycitcoms.c dummy.cc
mpipycitcoms_CFLAGS = -DUSE_MPI $(MAYBE_WITH_EXCHANGER)
mpipycitcoms_LDADD = \
$(top_builddir)/module/libCitcomSLibmodule.a \
$(MAYBE_EXCHANGER_MODULE) \
$(libCitcomS)
mpipycitcoms$(EXEEXT): $(mpipycitcoms_OBJECTS) $(mpipycitcoms_DEPENDENCIES)
@rm -f mpipycitcoms$(EXEEXT)
$(PYLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
$(mpipycitcoms_LDFLAGS) $(mpipycitcoms_OBJECTS) $(mpipycitcoms_LDADD) \
$(PYTHON_EGG_LDFLAGS) \
$(PYTHON_BLDLIBRARY) \
$(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
$(LIBS) \
$(PYTHON_LDLAST)
## end of Makefile.am
Computing file changes ...