[cig-commits] r3979 - in mc/3D/CitcomS/trunk: . bin lib module module/Exchanger

leif at geodynamics.org leif at geodynamics.org
Thu Jul 6 17:54:37 PDT 2006 

Author: leif
Date: 2006-07-06 17:54:37 -0700 (Thu, 06 Jul 2006)
New Revision: 3979

Added:
   mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
   mc/3D/CitcomS/trunk/lib/BC_util.c
   mc/3D/CitcomS/trunk/lib/Citcom_init.c
   mc/3D/CitcomS/trunk/lib/Construct_arrays.c
   mc/3D/CitcomS/trunk/lib/Convection.c
   mc/3D/CitcomS/trunk/lib/Drive_solvers.c
   mc/3D/CitcomS/trunk/lib/Element_calculations.c
   mc/3D/CitcomS/trunk/lib/Full_boundary_conditions.c
   mc/3D/CitcomS/trunk/lib/Full_geometry_cartesian.c
   mc/3D/CitcomS/trunk/lib/Full_lith_age_read_files.c
   mc/3D/CitcomS/trunk/lib/Full_obsolete.c
   mc/3D/CitcomS/trunk/lib/Full_parallel_related.c
   mc/3D/CitcomS/trunk/lib/Full_read_input_from_files.c
   mc/3D/CitcomS/trunk/lib/Full_solver.c
   mc/3D/CitcomS/trunk/lib/Full_sphere_related.c
   mc/3D/CitcomS/trunk/lib/Full_version_dependent.c
   mc/3D/CitcomS/trunk/lib/General_matrix_functions.c
   mc/3D/CitcomS/trunk/lib/Global_operations.c
   mc/3D/CitcomS/trunk/lib/Initial_temperature.c
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Interuption.c
   mc/3D/CitcomS/trunk/lib/Lith_age.c
   mc/3D/CitcomS/trunk/lib/Nodal_mesh.c
   mc/3D/CitcomS/trunk/lib/Obsolete.c
   mc/3D/CitcomS/trunk/lib/Output.c
   mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c
   mc/3D/CitcomS/trunk/lib/Parallel_util.c
   mc/3D/CitcomS/trunk/lib/Parsing.c
   mc/3D/CitcomS/trunk/lib/Phase_change.c
   mc/3D/CitcomS/trunk/lib/Problem_related.c
   mc/3D/CitcomS/trunk/lib/Process_buoyancy.c
   mc/3D/CitcomS/trunk/lib/Regional_boundary_conditions.c
   mc/3D/CitcomS/trunk/lib/Regional_geometry_cartesian.c
   mc/3D/CitcomS/trunk/lib/Regional_lith_age_read_files.c
   mc/3D/CitcomS/trunk/lib/Regional_obsolete.c
   mc/3D/CitcomS/trunk/lib/Regional_parallel_related.c
   mc/3D/CitcomS/trunk/lib/Regional_read_input_from_files.c
   mc/3D/CitcomS/trunk/lib/Regional_solver.c
   mc/3D/CitcomS/trunk/lib/Regional_sphere_related.c
   mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c
   mc/3D/CitcomS/trunk/lib/Shape_functions.c
   mc/3D/CitcomS/trunk/lib/Size_does_matter.c
   mc/3D/CitcomS/trunk/lib/Solver_conj_grad.c
   mc/3D/CitcomS/trunk/lib/Solver_multigrid.c
   mc/3D/CitcomS/trunk/lib/Sphere_harmonics.c
   mc/3D/CitcomS/trunk/lib/Sphere_util.c
   mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c
   mc/3D/CitcomS/trunk/lib/Topo_gravity.c
   mc/3D/CitcomS/trunk/lib/Tracer_advection.c
   mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
   mc/3D/CitcomS/trunk/lib/advection.h
   mc/3D/CitcomS/trunk/lib/advection_diffusion.h
   mc/3D/CitcomS/trunk/lib/citcom_init.h
   mc/3D/CitcomS/trunk/lib/convection_variables.h
   mc/3D/CitcomS/trunk/lib/drive_solvers.h
   mc/3D/CitcomS/trunk/lib/element_definitions.h
   mc/3D/CitcomS/trunk/lib/global_defs.h
   mc/3D/CitcomS/trunk/lib/initial_temperature.h
   mc/3D/CitcomS/trunk/lib/interuption.h
   mc/3D/CitcomS/trunk/lib/lith_age.h
   mc/3D/CitcomS/trunk/lib/output.h
   mc/3D/CitcomS/trunk/lib/parallel_related.h
   mc/3D/CitcomS/trunk/lib/parsing.h
   mc/3D/CitcomS/trunk/lib/phase_change.h
   mc/3D/CitcomS/trunk/lib/solver.h
   mc/3D/CitcomS/trunk/lib/sphere_communication.h
   mc/3D/CitcomS/trunk/lib/temperature_descriptions.h
   mc/3D/CitcomS/trunk/lib/tracer_defs.h
   mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h
Removed:
   mc/3D/CitcomS/trunk/lib/Common/
   mc/3D/CitcomS/trunk/lib/Full/
   mc/3D/CitcomS/trunk/lib/Regional/
Modified:
   mc/3D/CitcomS/trunk/bin/Makefile.am
   mc/3D/CitcomS/trunk/configure.ac
   mc/3D/CitcomS/trunk/lib/Makefile.am
   mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am
   mc/3D/CitcomS/trunk/module/Makefile.am
Log:
Avoid shared libraries altogether when embedding.
Shared libs are very likely to fail with static MPICH...
this was confirmed when the link failed on Eh's iBook.

Also completed the Full/Regional merge by flatting
the directory structure under 'lib'.


Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am	2006-07-06 23:58:43 UTC (rev 3978)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am	2006-07-07 00:54:37 UTC (rev 3979)
@@ -25,7 +25,6 @@
 # $Id$
 
 bin_PROGRAMS = CitcomSFull CitcomSRegional
-noinst_PROGRAMS =
 noinst_SCRIPTS =
 
 if COND_PYRE
@@ -35,12 +34,13 @@
 
 if COND_EMBEDDING
     bin_PROGRAMS += pycitcoms
-    noinst_PROGRAMS += pycitcoms-noinst
     INTERPRETER = $(bindir)/pycitcoms
-    noinstINTERPRETER = $$here/pycitcoms-noinst
+    noinstINTERPRETER = $$here/pycitcoms
+    libCitcomS = $(top_builddir)/lib/libCitcomS.a
 else
     INTERPRETER = $(PYTHON)
     noinstINTERPRETER = $(PYTHON)
+    libCitcomS = $(top_builddir)/lib/libCitcomS.la
 endif
 
 endif
@@ -48,7 +48,7 @@
 CC = $(MPICC)
 CXX = $(MPICXX)
 INCLUDES = \
-	-I$(top_srcdir)/lib/Common \
+	-I$(top_srcdir)/lib \
 	$(MPIINCLUDES)
 
 if COND_PYRE
@@ -61,10 +61,10 @@
 # legacy drivers
 CitcomSFull_SOURCES = Citcom.c
 CitcomSFull_CPPFLAGS = -DCITCOMS_SOLVER_FULL
-CitcomSFull_LDADD = $(top_builddir)/lib/libCitcomS.la $(MPILIBS)
+CitcomSFull_LDADD = $(libCitcomS) $(MPILIBS) $(LIBM)
 CitcomSRegional_SOURCES = Citcom.c
 CitcomSRegional_CPPFLAGS =
-CitcomSRegional_LDADD = $(top_builddir)/lib/libCitcomS.la $(MPILIBS)
+CitcomSRegional_LDADD = $(libCitcomS) $(MPILIBS) $(LIBM)
 
 # citcoms (top-level Python script)
 citcoms: $(srcdir)/citcoms.in
@@ -86,37 +86,24 @@
 EXTRA_DIST = citcoms.in
 
 # pycitcoms (libCitcomS + CitcomSmodule + libExchanger +
-# Exchangermodule + embedded Python interpreter).  A special
-# 'pycitcoms-noinst' is also created in the build directory, as the
-# 'pycitcoms' libtool wrapper script is unusable as an interpreter.
+# Exchangermodule + embedded Python interpreter)
 pycitcoms_SOURCES = pycitcoms.cc
-pycitcoms_LDADD = $(pycitcomsldadd)
-pycitcoms_noinst_SOURCES = pycitcoms.cc
-pycitcoms_noinst_LDFLAGS = -no-install
-pycitcoms_noinst_LDADD = $(pycitcomsldadd)
-pycitcomsldadd = \
+pycitcoms_LDADD = \
 	$(top_builddir)/module/libPyxMPImodule.a \
 	$(top_builddir)/module/Exchanger/libExchangermodule.a \
 	$(top_builddir)/module/libCitcomSmodule.a \
-	$(top_builddir)/lib/libCitcomS.la
-pycitcomslink = $(CXXLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED)
-pycitcomslibs = \
-	-lExchanger -l_mpimodule -ljournal \
-	$(PYTHON_BLDLIBRARY) \
-	$(MPILIBS) \
-	$(FCLIBS) \
-	$(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
-	$(LIBS) \
-	$(PYTHON_LDLAST)
+	$(libCitcomS) \
+	$(LIBM)
 pycitcoms$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES) 
 	@rm -f pycitcoms$(EXEEXT)
-	$(pycitcomslink) \
+	$(CXXLINK) $(PYTHON_LDFLAGS) $(PYTHON_LINKFORSHARED) \
 		$(pycitcoms_LDFLAGS) $(pycitcoms_OBJECTS) $(pycitcoms_LDADD) \
-		$(pycitcomslibs)
-pycitcoms-noinst$(EXEEXT): $(pycitcoms_OBJECTS) $(pycitcoms_DEPENDENCIES) 
-	@rm -f pycitcoms-noinst$(EXEEXT)
-	$(pycitcomslink) \
-		$(pycitcoms_noinst_LDFLAGS) $(pycitcoms_noinst_OBJECTS) $(pycitcoms_noinst_LDADD) \
-		$(pycitcomslibs)
+		-lExchanger -l_mpimodule -ljournal \
+		$(PYTHON_BLDLIBRARY) \
+		$(MPILIBS) \
+		$(FCLIBS) \
+		$(PYTHON_LIBS) $(PYTHON_MODLIBS) $(PYTHON_SYSLIBS) \
+		$(LIBS) \
+		$(PYTHON_LDLAST)
 
 ## end of Makefile.am

Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2006-07-06 23:58:43 UTC (rev 3978)
+++ mc/3D/CitcomS/trunk/configure.ac	2006-07-07 00:54:37 UTC (rev 3979)
@@ -91,7 +91,7 @@
 fi
 CIT_PROG_MPICC
 CIT_PROG_MPICXX
-CC=$MPICXX
+CC=$MPICC
 CXX=$MPICXX
 if test "$want_pyre" = yes; then
     CIT_PROG_PYCONFIG
@@ -134,6 +134,8 @@
     AC_CHECK_FUNC(sqrt, , [
         AC_CHECK_LIB(m, sqrt, [
             LIBM="-lm"
+        ], [
+            AC_MSG_ERROR([math library not found; try setting LIBM])
         ])
     ])
 fi

Copied: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Advection_diffusion.c)

Copied: mc/3D/CitcomS/trunk/lib/BC_util.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/BC_util.c)

Copied: mc/3D/CitcomS/trunk/lib/Citcom_init.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Citcom_init.c)

Copied: mc/3D/CitcomS/trunk/lib/Construct_arrays.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Construct_arrays.c)

Copied: mc/3D/CitcomS/trunk/lib/Convection.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Convection.c)

Copied: mc/3D/CitcomS/trunk/lib/Drive_solvers.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Drive_solvers.c)

Copied: mc/3D/CitcomS/trunk/lib/Element_calculations.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Element_calculations.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_boundary_conditions.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Boundary_conditions.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_geometry_cartesian.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Geometry_cartesian.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_lith_age_read_files.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Lith_age_read_files.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_obsolete.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Obsolete.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_parallel_related.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Parallel_related.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_read_input_from_files.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Read_input_from_files.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_solver.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Solver.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_sphere_related.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Sphere_related.c)

Copied: mc/3D/CitcomS/trunk/lib/Full_version_dependent.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Full/Version_dependent.c)

Copied: mc/3D/CitcomS/trunk/lib/General_matrix_functions.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/General_matrix_functions.c)

Copied: mc/3D/CitcomS/trunk/lib/Global_operations.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Global_operations.c)

Copied: mc/3D/CitcomS/trunk/lib/Initial_temperature.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Initial_temperature.c)

Copied: mc/3D/CitcomS/trunk/lib/Instructions.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Instructions.c)

Copied: mc/3D/CitcomS/trunk/lib/Interuption.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Interuption.c)

Copied: mc/3D/CitcomS/trunk/lib/Lith_age.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Lith_age.c)

Modified: mc/3D/CitcomS/trunk/lib/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/lib/Makefile.am	2006-07-06 23:58:43 UTC (rev 3978)
+++ mc/3D/CitcomS/trunk/lib/Makefile.am	2006-07-07 00:54:37 UTC (rev 3979)
@@ -24,90 +24,98 @@
 
 # $Id$
 
-lib_LTLIBRARIES = libCitcomS.la
-noinst_LTLIBRARIES = libFull.la libRegional.la
+noinst_LIBRARIES =
+lib_LTLIBRARIES =
 
-CC = $(MPICC)
-INCLUDES = -I$(top_srcdir)/lib/Common $(MPIINCLUDES)
+if COND_EMBEDDING
+    # static library
+    noinst_LIBRARIES += libCitcomS.a
+else
+    # shared library (libtool)
+    lib_LTLIBRARIES += libCitcomS.la
+endif
 
-libCitcomS_la_SOURCES = \
-	Common/Advection_diffusion.c \
-	Common/advection_diffusion.h \
-	Common/advection.h \
-	Common/BC_util.c \
-	Common/Citcom_init.c \
-	Common/citcom_init.h \
-	Common/Construct_arrays.c \
-	Common/Convection.c \
-	Common/convection_variables.h \
-	Common/Drive_solvers.c \
-	Common/drive_solvers.h \
-	Common/Element_calculations.c \
-	Common/element_definitions.h \
-	Common/General_matrix_functions.c \
-	Common/global_defs.h \
-	Common/Global_operations.c \
-	Common/Initial_temperature.c \
-	Common/initial_temperature.h \
-	Common/Instructions.c \
-	Common/Interuption.c \
-	Common/interuption.h \
-	Common/lith_age.h \
-	Common/Lith_age.c \
-	Common/Nodal_mesh.c \
-	Common/Output.c \
-	Common/output.h \
-	Common/Pan_problem_misc_functions.c \
-	Common/parallel_related.h \
-	Common/Parallel_util.c \
-	Common/Parsing.c \
-	Common/parsing.h \
-	Common/Phase_change.c \
-	Common/phase_change.h \
-	Common/Problem_related.c \
-	Common/Process_buoyancy.c \
-	Common/Shape_functions.c \
-	Common/Size_does_matter.c \
-	Common/Solver_conj_grad.c \
-	Common/Solver_multigrid.c \
-	Common/sphere_communication.h \
-	Common/Sphere_harmonics.c \
-	Common/Sphere_util.c \
-	Common/Stokes_flow_Incomp.c \
-	Common/temperature_descriptions.h \
-	Common/Topo_gravity.c \
-	Common/Tracer_advection.c \
-	Common/tracer_defs.h \
-	Common/viscosity_descriptions.h \
-	Common/Viscosity_structures.c
-libCitcomS_la_LIBADD = libFull.la libRegional.la $(LIBM)
+# static library
+libCitcomS_a_CFLAGS = $(AM_CFLAGS) # hack for automake
+libCitcomS_a_SOURCES = $(sources)
+
+# shared library (libtool)
+libCitcomS_la_LIBADD = $(LIBM)
 libCitcomS_la_LDFLAGS = -release $(VERSION)
+libCitcomS_la_SOURCES = $(sources)
 
-libFull_la_CFLAGS = $(AM_CFLAGS) # hack for automake
-libFull_la_SOURCES = \
-	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
+CC = $(MPICC)
+INCLUDES = -I$(top_srcdir)/lib/Common $(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 \
+	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 \
+	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 \
+	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
 
-libRegional_la_CFLAGS = $(AM_CFLAGS) # hack for automake
-libRegional_la_SOURCES = \
-	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 = \
-	Common/Obsolete.c \
-	Full/Obsolete.c \
-	Regional/Obsolete.c
+	Obsolete.c \
+	Full_obsolete.c \
+	Regional_obsolete.c
 
 ## end of Makefile.am

Copied: mc/3D/CitcomS/trunk/lib/Nodal_mesh.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Nodal_mesh.c)

Copied: mc/3D/CitcomS/trunk/lib/Obsolete.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Obsolete.c)

Copied: mc/3D/CitcomS/trunk/lib/Output.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Output.c)

Copied: mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Pan_problem_misc_functions.c)

Copied: mc/3D/CitcomS/trunk/lib/Parallel_util.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Parallel_util.c)

Copied: mc/3D/CitcomS/trunk/lib/Parsing.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Parsing.c)

Copied: mc/3D/CitcomS/trunk/lib/Phase_change.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Phase_change.c)

Copied: mc/3D/CitcomS/trunk/lib/Problem_related.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Problem_related.c)

Copied: mc/3D/CitcomS/trunk/lib/Process_buoyancy.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Process_buoyancy.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_boundary_conditions.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Boundary_conditions.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_geometry_cartesian.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Geometry_cartesian.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_lith_age_read_files.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Lith_age_read_files.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_obsolete.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Obsolete.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_parallel_related.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Parallel_related.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_read_input_from_files.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Read_input_from_files.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_solver.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Solver.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_sphere_related.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Sphere_related.c)

Copied: mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Regional/Version_dependent.c)

Copied: mc/3D/CitcomS/trunk/lib/Shape_functions.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Shape_functions.c)

Copied: mc/3D/CitcomS/trunk/lib/Size_does_matter.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Size_does_matter.c)

Copied: mc/3D/CitcomS/trunk/lib/Solver_conj_grad.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Solver_conj_grad.c)

Copied: mc/3D/CitcomS/trunk/lib/Solver_multigrid.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Solver_multigrid.c)

Copied: mc/3D/CitcomS/trunk/lib/Sphere_harmonics.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Sphere_harmonics.c)

Copied: mc/3D/CitcomS/trunk/lib/Sphere_util.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Sphere_util.c)

Copied: mc/3D/CitcomS/trunk/lib/Stokes_flow_Incomp.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Stokes_flow_Incomp.c)

Copied: mc/3D/CitcomS/trunk/lib/Topo_gravity.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Topo_gravity.c)

Copied: mc/3D/CitcomS/trunk/lib/Tracer_advection.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Tracer_advection.c)

Copied: mc/3D/CitcomS/trunk/lib/Viscosity_structures.c (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/Viscosity_structures.c)

Copied: mc/3D/CitcomS/trunk/lib/advection.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/advection.h)

Copied: mc/3D/CitcomS/trunk/lib/advection_diffusion.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/advection_diffusion.h)

Copied: mc/3D/CitcomS/trunk/lib/citcom_init.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/citcom_init.h)

Copied: mc/3D/CitcomS/trunk/lib/convection_variables.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/convection_variables.h)

Copied: mc/3D/CitcomS/trunk/lib/drive_solvers.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/drive_solvers.h)

Copied: mc/3D/CitcomS/trunk/lib/element_definitions.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/element_definitions.h)

Copied: mc/3D/CitcomS/trunk/lib/global_defs.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/global_defs.h)

Copied: mc/3D/CitcomS/trunk/lib/initial_temperature.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/initial_temperature.h)

Copied: mc/3D/CitcomS/trunk/lib/interuption.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/interuption.h)

Copied: mc/3D/CitcomS/trunk/lib/lith_age.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/lith_age.h)

Copied: mc/3D/CitcomS/trunk/lib/output.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/output.h)

Copied: mc/3D/CitcomS/trunk/lib/parallel_related.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/parallel_related.h)

Copied: mc/3D/CitcomS/trunk/lib/parsing.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/parsing.h)

Copied: mc/3D/CitcomS/trunk/lib/phase_change.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/phase_change.h)

Copied: mc/3D/CitcomS/trunk/lib/solver.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/solver.h)

Copied: mc/3D/CitcomS/trunk/lib/sphere_communication.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/sphere_communication.h)

Copied: mc/3D/CitcomS/trunk/lib/temperature_descriptions.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/temperature_descriptions.h)

Copied: mc/3D/CitcomS/trunk/lib/tracer_defs.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/tracer_defs.h)

Copied: mc/3D/CitcomS/trunk/lib/viscosity_descriptions.h (from rev 3977, mc/3D/CitcomS/trunk/lib/Common/viscosity_descriptions.h)

Modified: mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am	2006-07-06 23:58:43 UTC (rev 3978)
+++ mc/3D/CitcomS/trunk/module/Exchanger/Makefile.am	2006-07-07 00:54:37 UTC (rev 3979)
@@ -49,7 +49,7 @@
 CXX = $(MPICXX)
 CXXLD = @CXX@
 INCLUDES = \
-	-I$(top_srcdir)/lib/Common \
+	-I$(top_srcdir)/lib \
 	-I$(PYTHON_INCDIR) \
 	$(MPIINCLUDES)
 

Modified: mc/3D/CitcomS/trunk/module/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/module/Makefile.am	2006-07-06 23:58:43 UTC (rev 3978)
+++ mc/3D/CitcomS/trunk/module/Makefile.am	2006-07-07 00:54:37 UTC (rev 3979)
@@ -62,7 +62,7 @@
 CXX = $(MPICXX)
 INCLUDES = \
 	-I$(top_srcdir)/module/Regional \
-	-I$(top_srcdir)/lib/Common \
+	-I$(top_srcdir)/lib \
 	-I$(PYTHON_INCDIR) \
 	$(MPIINCLUDES)

More information about the cig-commits mailing list