[cig-commits] [commit] master: Update Makefiles (a1f1bf5)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Fri Oct 17 11:52:52 PDT 2014 

Repository : https://github.com/geodynamics/axisem

On branch  : master
Link       : https://github.com/geodynamics/axisem/compare/2125407ff45c6576784a2169142d63e16d8913cc...a1f1bf51ac75f33f58f72f6087d3b1f98040ab74

>---------------------------------------------------------------

commit a1f1bf51ac75f33f58f72f6087d3b1f98040ab74
Author: Simon Stähler <staehler at geophysik.uni-muenchen.de>
Date:   Fri Oct 17 20:53:14 2014 +0200

    Update Makefiles


>---------------------------------------------------------------

a1f1bf51ac75f33f58f72f6087d3b1f98040ab74
 MESHER/Makefile.TEMPLATE | 12 +++++-------
 SOLVER/Makefile.TEMPLATE | 22 +++++++++-------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/MESHER/Makefile.TEMPLATE b/MESHER/Makefile.TEMPLATE
index e71da17..aa942ed 100644
--- a/MESHER/Makefile.TEMPLATE
+++ b/MESHER/Makefile.TEMPLATE
@@ -8,18 +8,17 @@ SRCS =	background_models.F90 test_bkgrdmodel.F90 analytic_mapping.f90 \
 	data_grid.f90 data_mesh.f90 data_numbering.f90 data_pdb.f90 \
 	data_spec.f90 data_time.f90 discont_meshing.f90 gllmeshgen.f90 \
 	global_parameters.f90 input.f90 interpolation.f90 main.f90 \
-	mapping_spheroid.f90 mesh_info.f90 meshgen.f90 \
-	model_discontinuities.f90 numbering.f90 parallelization.f90 pdb.f90 \
-	sorting.f90 splib.f90 subpar_mapping.f90
+	mesh_info.f90 meshgen.f90 model_discontinuities.f90 numbering.f90 \
+	parallelization.f90 pdb.f90 sorting.f90 splib.f90 subpar_mapping.f90
 
 OBJS =	background_models.o test_bkgrdmodel.o analytic_mapping.o \
 	analytic_semi_mapping.o analytic_spheroid_mapping.o clocks.o \
 	data_bkgrdmodel.o data_coarse.o data_diag.o data_gllmesh.o \
 	data_grid.o data_mesh.o data_numbering.o data_pdb.o data_spec.o \
 	data_time.o discont_meshing.o gllmeshgen.o global_parameters.o \
-	input.o interpolation.o main.o mapping_spheroid.o mesh_info.o \
-	meshgen.o model_discontinuities.o numbering.o parallelization.o pdb.o \
-	sorting.o splib.o subpar_mapping.o
+	input.o interpolation.o main.o mesh_info.o meshgen.o \
+	model_discontinuities.o numbering.o parallelization.o pdb.o sorting.o \
+	splib.o subpar_mapping.o
 
 ifeq ($(strip $(USE_NETCDF)),true)
    FFLAGS += -Dunc
@@ -84,7 +83,6 @@ interpolation.o: global_parameters.o Makefile ../make_axisem.macros
 main.o: clocks.o data_bkgrdmodel.o data_grid.o data_mesh.o data_time.o \
 	discont_meshing.o gllmeshgen.o input.o mesh_info.o meshgen.o \
 	numbering.o parallelization.o pdb.o test_bkgrdmodel.o Makefile ../make_axisem.macros 
-mapping_spheroid.o: global_parameters.o Makefile ../make_axisem.macros 
 mesh_info.o: data_bkgrdmodel.o data_diag.o data_gllmesh.o data_grid.o \
 	data_mesh.o data_numbering.o data_spec.o global_parameters.o Makefile ../make_axisem.macros 
 meshgen.o: analytic_spheroid_mapping.o data_bkgrdmodel.o data_coarse.o \
diff --git a/SOLVER/Makefile.TEMPLATE b/SOLVER/Makefile.TEMPLATE
index 2e49bfb..d06b2b4 100644
--- a/SOLVER/Makefile.TEMPLATE
+++ b/SOLVER/Makefile.TEMPLATE
@@ -13,9 +13,9 @@ SRCS =	background_models.F90 commpi.F90 commun.F90 get_model.F90 \
 	def_precomp_terms.f90 get_mesh.f90 global_parameters.f90 \
 	interpolation.f90 kdtree2.f90 list.f90 main.f90 \
 	pointwise_derivatives.f90 rotations.f90 seismograms.f90 source.f90 \
-	splib.f90 stiffness_di.f90 stiffness_fluid.f90 stiffness_mono.f90 \
-	stiffness_quad.f90 subpar_mapping.f90 unrolled_loops.f90 utlity.f90 \
-	wavefields_io.f90 ftz.c pthread.c
+	stiffness_di.f90 stiffness_fluid.f90 stiffness_mono.f90 \
+	stiffness_quad.f90 unrolled_loops.f90 utlity.f90 wavefields_io.f90 \
+	ftz.c pthread.c
 
 OBJS =	background_models.o commpi.o commun.o get_model.o \
 	lateral_heterogeneities.o meshes_io.o nc_helpers.o nc_routines.o \
@@ -25,10 +25,9 @@ OBJS =	background_models.o commpi.o commun.o get_model.o \
 	data_matr.o data_mesh.o data_pointwise.o data_proc.o data_source.o \
 	data_spec.o data_time.o def_grid.o def_precomp_terms.o get_mesh.o \
 	global_parameters.o interpolation.o kdtree2.o list.o main.o \
-	pointwise_derivatives.o rotations.o seismograms.o source.o splib.o \
+	pointwise_derivatives.o rotations.o seismograms.o source.o \
 	stiffness_di.o stiffness_fluid.o stiffness_mono.o stiffness_quad.o \
-	subpar_mapping.o unrolled_loops.o utlity.o wavefields_io.o ftz.o \
-	pthread.o
+	unrolled_loops.o utlity.o wavefields_io.o ftz.o pthread.o
 
 ifeq ($(strip $(USE_NETCDF)),true)
    FFLAGS += -Denable_netcdf
@@ -89,7 +88,7 @@ utils:
 	$(FC) $(FFLAGS) -c $(INCLUDE) $<
 
 analytic_mapping.o: analytic_semi_mapping.o analytic_spheroid_mapping.o \
-	data_mesh.o global_parameters.o subpar_mapping.o Makefile ../make_axisem.macros 
+	data_mesh.o global_parameters.o Makefile ../make_axisem.macros 
 analytic_semi_mapping.o: global_parameters.o Makefile ../make_axisem.macros 
 analytic_spheroid_mapping.o: data_mesh.o global_parameters.o Makefile ../make_axisem.macros 
 apply_masks.o: global_parameters.o Makefile ../make_axisem.macros 
@@ -101,7 +100,7 @@ data_comm.o: global_parameters.o list.o Makefile ../make_axisem.macros
 data_heterogeneous.o: global_parameters.o Makefile ../make_axisem.macros 
 data_io.o: global_parameters.o Makefile ../make_axisem.macros 
 data_matr.o: global_parameters.o Makefile ../make_axisem.macros 
-data_mesh.o: data_io.o global_parameters.o Makefile ../make_axisem.macros 
+data_mesh.o: data_io.o data_spec.o global_parameters.o Makefile ../make_axisem.macros 
 data_pointwise.o: global_parameters.o Makefile ../make_axisem.macros 
 data_proc.o:  Makefile ../make_axisem.macros 
 data_source.o: global_parameters.o Makefile ../make_axisem.macros 
@@ -109,12 +108,11 @@ data_spec.o: global_parameters.o Makefile ../make_axisem.macros
 data_time.o: global_parameters.o Makefile ../make_axisem.macros 
 def_grid.o: analytic_mapping.o apply_masks.o commun.o data_comm.o data_io.o \
 	data_mesh.o data_pointwise.o data_proc.o data_spec.o get_mesh.o \
-	global_parameters.o splib.o utlity.o Makefile ../make_axisem.macros 
+	global_parameters.o utlity.o Makefile ../make_axisem.macros 
 def_precomp_terms.o: analytic_mapping.o attenuation.o background_models.o \
 	commun.o data_io.o data_matr.o data_mesh.o data_pointwise.o \
 	data_proc.o data_source.o data_spec.o def_grid.o get_mesh.o \
-	get_model.o global_parameters.o pointwise_derivatives.o splib.o \
-	utlity.o Makefile ../make_axisem.macros 
+	get_model.o global_parameters.o pointwise_derivatives.o utlity.o Makefile ../make_axisem.macros 
 get_mesh.o: background_models.o commun.o data_comm.o data_io.o data_mesh.o \
 	data_proc.o data_time.o global_parameters.o Makefile ../make_axisem.macros 
 global_parameters.o:  Makefile ../make_axisem.macros 
@@ -132,7 +130,6 @@ seismograms.o: commun.o data_io.o data_mesh.o data_proc.o data_source.o \
 source.o: apply_masks.o commun.o data_io.o data_mesh.o data_proc.o \
 	data_source.o data_time.o global_parameters.o nc_routines.o \
 	pointwise_derivatives.o utlity.o Makefile ../make_axisem.macros 
-splib.o: global_parameters.o Makefile ../make_axisem.macros 
 stiffness_di.o: attenuation.o data_matr.o data_mesh.o data_source.o \
 	data_spec.o global_parameters.o unrolled_loops.o Makefile ../make_axisem.macros 
 stiffness_fluid.o: data_matr.o data_mesh.o data_source.o data_spec.o \
@@ -141,7 +138,6 @@ stiffness_mono.o: attenuation.o data_matr.o data_mesh.o data_source.o \
 	data_spec.o global_parameters.o unrolled_loops.o Makefile ../make_axisem.macros 
 stiffness_quad.o: attenuation.o data_matr.o data_mesh.o data_source.o \
 	data_spec.o global_parameters.o unrolled_loops.o Makefile ../make_axisem.macros 
-subpar_mapping.o: global_parameters.o Makefile ../make_axisem.macros 
 unrolled_loops.o: data_mesh.o global_parameters.o Makefile ../make_axisem.macros 
 utlity.o: analytic_mapping.o data_mesh.o data_spec.o global_parameters.o Makefile ../make_axisem.macros 
 wavefields_io.o: data_io.o data_mesh.o data_pointwise.o data_proc.o \

More information about the CIG-COMMITS mailing list