[cig-commits] r5060 - in mc/3D/CitcomS/trunk: . CitcomS bin etc lib
module
leif at geodynamics.org
leif at geodynamics.org
Tue Oct 17 04:00:23 PDT 2006
Author: leif
Date: 2006-10-17 04:00:23 -0700 (Tue, 17 Oct 2006)
New Revision: 5060
Removed:
mc/3D/CitcomS/trunk/CitcomS/Makefile.am
mc/3D/CitcomS/trunk/bin/Makefile.am
mc/3D/CitcomS/trunk/etc/Makefile.am
mc/3D/CitcomS/trunk/lib/Makefile.am
mc/3D/CitcomS/trunk/module/Makefile.am
Modified:
mc/3D/CitcomS/trunk/Makefile.am
Log:
Fixed legacy build.
Deleted: mc/3D/CitcomS/trunk/CitcomS/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Makefile.am 2006-10-17 09:18:15 UTC (rev 5059)
+++ mc/3D/CitcomS/trunk/CitcomS/Makefile.am 2006-10-17 11:00:23 UTC (rev 5060)
@@ -1,73 +0,0 @@
-## 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$
-
-nobase_pkgpython_PYTHON = \
- __init__.py \
- BaseApplication.py \
- Components/__init__.py \
- Components/Advection_diffusion/Advection_diffusion.py \
- Components/Advection_diffusion/__init__.py \
- Components/BC.py \
- Components/CitcomComponent.py \
- Components/CodecConfig.py \
- Components/Const.py \
- Components/HackedConfigParser.py \
- Components/IC.py \
- Components/Output.py \
- Components/Launchers.py \
- Components/Param.py \
- Components/Phase.py \
- Components/Sphere/__init__.py \
- Components/Sphere/FullSphere.py \
- Components/Sphere/RegionalSphere.py \
- Components/Sphere/Sphere.py \
- Components/Stokes_solver/Incompressible.py \
- Components/Stokes_solver/__init__.py \
- Components/Tracer.py \
- Components/Visc.py \
- Controller.py \
- CoupledApp.py \
- Coupler/__init__.py \
- Coupler/ContainingCoupler.py \
- Coupler/EmbeddedCoupler.py \
- Coupler/Inlet.py \
- Coupler/Outlet.py \
- Layout.py \
- SimpleApp.py \
- Solver/__init__.py \
- Solver/CoupledFullSolver.py \
- Solver/CoupledRegionalSolver.py \
- Solver/CoupledSolver.py \
- Solver/FullSolver.py \
- Solver/RegionalSolver.py \
- Solver/Solver.py
-
-nodist_pkgpython_PYTHON = \
- config.py
-config.py: $(top_builddir)/portinfo $(top_builddir)/Makefile
- $(PYCONFIG) -h $(top_builddir)/portinfo -m $(top_builddir)/Makefile -o $@
-CLEANFILES = $(nodist_pkgpython_PYTHON)
-
-## end of Makefile.am
Modified: mc/3D/CitcomS/trunk/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/Makefile.am 2006-10-17 09:18:15 UTC (rev 5059)
+++ mc/3D/CitcomS/trunk/Makefile.am 2006-10-17 11:00:23 UTC (rev 5060)
@@ -29,9 +29,11 @@
bin_PROGRAMS = CitcomSFull CitcomSRegional
+CitcomSFull_CPPFLAGS = -I$(top_srcdir)/lib
CitcomSFull_SOURCES = Citcom.c CitcomSFull.c
CitcomSFull_LDADD = libCitcomS.a
+CitcomSRegional_CPPFLAGS = -I$(top_srcdir)/lib
CitcomSRegional_SOURCES = Citcom.c CitcomSRegional.c
CitcomSRegional_LDADD = libCitcomS.a
Deleted: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am 2006-10-17 09:18:15 UTC (rev 5059)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am 2006-10-17 11:00:23 UTC (rev 5060)
@@ -1,151 +0,0 @@
-## Process this file with automake to produce Makefile.in
-##
-##<LicenseText>
-##
-## CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
-## Clint Conrad, Michael Gurnis, and Eun-seo Choi.
-## Copyright (C) 1994-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$
-
-bin_PROGRAMS = CitcomSFull CitcomSRegional
-bin_SCRIPTS =
-
-abs_top_srcdir = @abs_top_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_builddir = @abs_builddir@
-
-if COND_PYRE
-
-bin_SCRIPTS += citcoms coupledcitcoms
-
-if COND_EMBEDDING
- INTERPRETER = $(bindir)/$(PYCITCOMS)
- noinstINTERPRETER = $(abs_builddir)/$(PYCITCOMS)
- noinstPYTHONPATH = $(abs_top_srcdir)
- libCitcomS = $(top_builddir)/lib/libCitcomS.a
-else
- INTERPRETER = $(PYTHON)
- noinstINTERPRETER = $(PYTHON)
- noinstPYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/module/.libs:$(abs_top_builddir)/module/Exchanger/.libs
- libCitcomS = $(top_builddir)/lib/libCitcomS.la
-endif
-
-if COND_EXCHANGER
- bin_PROGRAMS += pycppcitcoms
- PYCITCOMS = pycppcitcoms
- MAYBE_EXCHANGER_INCLUDES = -I$(top_srcdir)/module/Exchanger
-else
- bin_PROGRAMS += pycitcoms
- PYCITCOMS = pycitcoms
- MAYBE_EXCHANGER_INCLUDES =
-endif
-
-endif
-
-CC = $(MPICC)
-CXX = $(MPICXX)
-INCLUDES = \
- -I$(top_srcdir)/lib \
- $(MPIINCLUDES)
-
-if COND_PYRE
-INCLUDES += \
- -I$(top_srcdir)/module \
- $(MAYBE_EXCHANGER_INCLUDES) \
- $(PYTHON_EGG_CPPFLAGS) \
- -I$(PYTHON_INCDIR)
-endif
-
-# legacy drivers
-CitcomSFull_SOURCES = Citcom.c
-CitcomSFull_CPPFLAGS = -DCITCOMS_SOLVER_FULL
-CitcomSFull_LDADD = $(libCitcomS) $(MPILIBS) $(LIBHDF5) $(LIBM)
-CitcomSRegional_SOURCES = Citcom.c
-CitcomSRegional_CPPFLAGS =
-CitcomSRegional_LDADD = $(libCitcomS) $(MPILIBS) $(LIBHDF5) $(LIBM)
-
-if COND_HDF5
- CitcomSFull_CPPFLAGS += -DUSE_HDF5
- CitcomSRegional_CPPFLAGS += -DUSE_HDF5
-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 $@
-coupledcitcoms: $(srcdir)/coupledcitcoms.in Makefile
- $(do_build) < $(srcdir)/coupledcitcoms.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"; then d=; else d="$(srcdir)/"; fi; \
- if test -f $$d$$p; 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 coupledcitcoms.in
-CLEANFILES = $(bin_SCRIPTS)
-
-# pycitcoms (libCitcomS + CitcomSLibmodule + embedded Python interpreter)
-pycitcoms_SOURCES = pycitcoms.c
-pycitcoms_LDADD = \
- $(top_builddir)/module/libCitcomSLibmodule.a \
- $(libCitcomS) \
- $(LIBHDF5) \
- $(LIBM)
-pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES)
- @rm -f pycitcoms$(EXEEXT)
- $(LINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
- $(pycitcoms_LDFLAGS) $(pycitcoms_OBJECTS) $(pycitcoms_LDADD) \
- $(PYTHON_EGG_LDFLAGS) \
- $(PYTHON_BLDLIBRARY) \
- $(MPILIBS) \
- $(FCLIBS) \
- $(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
- $(LIBS) \
- $(PYTHON_LDLAST)
-
-# pycppcitcoms (libCitcomS + CitcomSLibmodule + libExchanger +
-# ExchangerLibmodule + embedded Python interpreter)
-pycppcitcoms_SOURCES = pycppcitcoms.cc
-pycppcitcoms_LDADD = \
- $(top_builddir)/module/Exchanger/libExchangerLibmodule.a \
- $(pycitcoms_LDADD)
-pycppcitcoms$(EXEEXT): $(pycppcitcoms_OBJECTS) $(pycppcitcoms_DEPENDENCIES)
- @rm -f pycitcoms$(EXEEXT)
- $(CXXLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
- $(pycppcitcoms_LDFLAGS) $(pycppcitcoms_OBJECTS) $(pycppcitcoms_LDADD) \
- $(PYTHON_EGG_LDFLAGS) \
- $(PYTHON_BLDLIBRARY) \
- $(MPILIBS) \
- $(FCLIBS) \
- $(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
- $(LIBS) \
- $(PYTHON_LDLAST)
-
-## end of Makefile.am
Deleted: mc/3D/CitcomS/trunk/etc/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/etc/Makefile.am 2006-10-17 09:18:15 UTC (rev 5059)
+++ mc/3D/CitcomS/trunk/etc/Makefile.am 2006-10-17 11:00:23 UTC (rev 5060)
@@ -1,36 +0,0 @@
-## 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$
-
-dist_pkgsysconf_DATA = \
- full.odb \
- full-sphere.odb \
- incomp-newtonian.odb \
- incomp-non-newtonian.odb \
- regional.odb \
- regional-sphere.odb \
- temp.odb \
- __vault__.odb
-
-## end of Makefile.am
Deleted: mc/3D/CitcomS/trunk/lib/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/lib/Makefile.am 2006-10-17 09:18:15 UTC (rev 5059)
+++ mc/3D/CitcomS/trunk/lib/Makefile.am 2006-10-17 11:00:23 UTC (rev 5060)
@@ -1,129 +0,0 @@
-## Process this file with automake to produce Makefile.in
-##
-##<LicenseText>
-##
-## CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
-## Clint Conrad, Michael Gurnis, and Eun-seo Choi.
-## Copyright (C) 1994-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$
-
-noinst_LIBRARIES =
-lib_LTLIBRARIES =
-
-if COND_EMBEDDING
- # static library
- noinst_LIBRARIES += libCitcomS.a
-else
- # shared library (libtool)
- lib_LTLIBRARIES += libCitcomS.la
-endif
-
-# static library
-libCitcomS_a_CFLAGS = $(AM_CFLAGS) # hack for automake
-libCitcomS_a_SOURCES = $(sources)
-
-# shared library (libtool)
-libCitcomS_la_LIBADD = $(LIBM) $(LIBHDF5)
-libCitcomS_la_LDFLAGS = -release $(VERSION)
-libCitcomS_la_SOURCES = $(sources)
-
-if COND_HDF5
- libCitcomS_a_CFLAGS += -DUSE_HDF5
-endif
-
-CC = $(MPICC)
-INCLUDES = $(MPIINCLUDES)
-sources = \
- Advection_diffusion.c \
- advection_diffusion.h \
- advection.h \
- BC_util.c \
- Citcom_init.c \
- citcom_init.h \
- Construct_arrays.c \
- Convection.c \
- convection_variables.h \
- Drive_solvers.c \
- drive_solvers.h \
- Element_calculations.c \
- element_definitions.h \
- General_matrix_functions.c \
- global_defs.h \
- Global_operations.c \
- hdf5_related.h \
- Initial_temperature.c \
- initial_temperature.h \
- Instructions.c \
- Interuption.c \
- interuption.h \
- lith_age.h \
- Lith_age.c \
- Nodal_mesh.c \
- Output.c \
- output.h \
- Output_h5.c \
- output_h5.h \
- Pan_problem_misc_functions.c \
- parallel_related.h \
- Parallel_util.c \
- Parsing.c \
- parsing.h \
- Phase_change.c \
- phase_change.h \
- Problem_related.c \
- Process_buoyancy.c \
- Shape_functions.c \
- Size_does_matter.c \
- Solver_conj_grad.c \
- Solver_multigrid.c \
- solver.h \
- sphere_communication.h \
- Sphere_harmonics.c \
- Sphere_util.c \
- Stokes_flow_Incomp.c \
- temperature_descriptions.h \
- Topo_gravity.c \
- Tracer_advection.c \
- tracer_defs.h \
- viscosity_descriptions.h \
- Viscosity_structures.c \
- Full_boundary_conditions.c \
- Full_geometry_cartesian.c \
- Full_lith_age_read_files.c \
- Full_parallel_related.c \
- Full_read_input_from_files.c \
- Full_solver.c \
- Full_sphere_related.c \
- Full_version_dependent.c \
- Regional_boundary_conditions.c \
- Regional_geometry_cartesian.c \
- Regional_lith_age_read_files.c \
- Regional_parallel_related.c \
- Regional_read_input_from_files.c \
- Regional_solver.c \
- Regional_sphere_related.c \
- Regional_version_dependent.c
-
-EXTRA_DIST = \
- Obsolete.c \
- Full_obsolete.c \
- Regional_obsolete.c
-
-## end of Makefile.am
Deleted: mc/3D/CitcomS/trunk/module/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Makefile.am 2006-10-17 09:18:15 UTC (rev 5059)
+++ mc/3D/CitcomS/trunk/module/Makefile.am 2006-10-17 11:00:23 UTC (rev 5060)
@@ -1,53 +0,0 @@
-## 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$
-
-noinst_LIBRARIES = libCitcomSLib.a
-
-CitcomSLib_a_CPPFLAGS = -I$(top_srcdir)/lib
-
-CitcomSLib_a_SOURCES = \
- CitcomSmodule.c \
- CitcomSmodule.h \
- advdiffu.c \
- advdiffu.h \
- bindings.c \
- bindings.h \
- exceptions.c \
- exceptions.h \
- getProperty.h \
- initial_conditions.c \
- initial_conditions.h \
- mesher.c \
- mesher.h \
- misc.c \
- misc.h \
- outputs.c \
- outputs.h \
- setProperties.c \
- setProperties.h \
- stokes_solver.c \
- stokes_solver.h
-
-## end of Makefile.am
More information about the cig-commits
mailing list