[cig-commits] [commit] master: Merge branch 'master' of https://github.com/geodynamics/axisem into HEAD (25673d1)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Oct 17 05:49:10 PDT 2014
Repository : https://github.com/geodynamics/axisem
On branch : master
Link : https://github.com/geodynamics/axisem/compare/5406393c6d68c31d85ff7c409fd334d40e5a0841...4dd1b3a956953c6b78c14f54de0cf0f9a6479485
>---------------------------------------------------------------
commit 25673d173de3e85c53b084e393d7ca7e8e4b369f
Merge: c1b8fda b6457db
Author: Simon Stähler <staehler at geophysik.uni-muenchen.de>
Date: Fri Oct 17 14:44:42 2014 +0200
Merge branch 'master' of https://github.com/geodynamics/axisem into HEAD
Conflicts:
SOLVER/Makefile.TEMPLATE
>---------------------------------------------------------------
25673d173de3e85c53b084e393d7ca7e8e4b369f
SOLVER/Makefile.TEMPLATE | 109 +-
SOLVER/analytic_mapping.f90 | 263 +---
SOLVER/analytic_semi_mapping.f90 | 7 +-
SOLVER/analytic_spheroid_mapping.f90 | 10 +-
SOLVER/apply_masks.f90 | 17 +-
SOLVER/attenuation.f90 | 5 +-
SOLVER/clocks.f90 | 114 +-
SOLVER/commpi.F90 | 97 +-
SOLVER/commun.F90 | 15 +-
SOLVER/data_comm.f90 | 6 +-
SOLVER/data_heterogeneous.f90 | 45 +-
SOLVER/data_io.f90 | 24 +-
SOLVER/data_matr.f90 | 13 +-
SOLVER/data_mesh.f90 | 8 +-
SOLVER/data_pointwise.f90 | 6 +-
SOLVER/data_proc.f90 | 7 +-
SOLVER/data_source.f90 | 4 +-
SOLVER/data_spec.f90 | 26 +-
SOLVER/data_time.f90 | 2 +
SOLVER/def_grid.f90 | 77 +-
SOLVER/def_precomp_terms.f90 | 181 ++-
SOLVER/geom_transf.f90 | 307 -----
SOLVER/get_mesh.f90 | 14 +-
SOLVER/get_model.F90 | 174 +--
SOLVER/global_parameters.f90 | 28 +-
SOLVER/inparam_advanced.TEMPLATE | 19 +-
SOLVER/interpolation.f90 | 50 +-
SOLVER/lateral_heterogeneities.F90 | 6 +-
SOLVER/list.f90 | 50 +-
SOLVER/main.f90 | 164 +--
SOLVER/makemake.pl | 16 +-
SOLVER/meshes_io.F90 | 77 +-
SOLVER/nc_helpers.F90 | 460 +++++++
SOLVER/nc_routines.F90 | 1336 ++++++-------------
SOLVER/nc_snapshots.F90 | 236 ++++
SOLVER/parameters.F90 | 71 +-
SOLVER/pointwise_derivatives.f90 | 196 +--
SOLVER/rotations.f90 | 18 +-
SOLVER/seismograms.f90 | 259 +---
SOLVER/source.f90 | 3 +-
SOLVER/splib.f90 | 58 +-
SOLVER/stiffness.f90 | 2327 ----------------------------------
SOLVER/stiffness_di.f90 | 829 ++++++++++++
SOLVER/stiffness_fluid.f90 | 221 ++++
SOLVER/stiffness_mono.f90 | 593 +++++++++
SOLVER/stiffness_quad.f90 | 779 ++++++++++++
SOLVER/subpar_mapping.f90 | 742 +----------
SOLVER/time_evol_wave.F90 | 138 +-
SOLVER/unrolled_loops.f90 | 58 +-
SOLVER/utlity.f90 | 94 +-
SOLVER/wavefields_io.f90 | 5 +-
make_axisem.macros.TEMPLATE | 11 +-
52 files changed, 4395 insertions(+), 5980 deletions(-)
diff --cc SOLVER/Makefile.TEMPLATE
index af8fb4d,b1fd8b6..2e49bfb
--- a/SOLVER/Makefile.TEMPLATE
+++ b/SOLVER/Makefile.TEMPLATE
@@@ -3,32 -3,37 +3,39 @@@ PROG = axise
include ../make_axisem.macros
SRCS = background_models.F90 commpi.F90 commun.F90 get_model.F90 \
- lateral_heterogeneities.F90 meshes_io.F90 nc_routines.F90 \
- parameters.F90 time_evol_wave.F90 analytic_mapping.f90 \
- analytic_semi_mapping.f90 analytic_spheroid_mapping.f90 \
- apply_masks.f90 attenuation.f90 clocks.f90 data_comm.f90 \
- data_heterogeneous.f90 data_io.f90 data_matr.f90 data_mesh.f90 \
- data_pointwise.f90 data_proc.f90 data_source.f90 data_spec.f90 \
- data_time.f90 def_grid.f90 def_precomp_terms.f90 geom_transf.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.f90 subpar_mapping.f90 \
- unrolled_loops.f90 utlity.f90 wavefields_io.f90 ftz.c pthread.c
+ lateral_heterogeneities.F90 meshes_io.F90 nc_helpers.F90 \
+ nc_routines.F90 nc_snapshots.F90 parameters.F90 time_evol_wave.F90 \
+ analytic_mapping.f90 analytic_semi_mapping.f90 \
+ analytic_spheroid_mapping.f90 apply_masks.f90 attenuation.f90 \
+ clocks.f90 data_comm.f90 data_heterogeneous.f90 data_io.f90 \
+ data_matr.f90 data_mesh.f90 data_pointwise.f90 data_proc.f90 \
+ data_source.f90 data_spec.f90 data_time.f90 def_grid.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.f90 subpar_mapping.f90 unrolled_loops.f90 \
- utlity.f90 wavefields_io.f90 ftz.c pthread.c
++ 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
OBJS = background_models.o commpi.o commun.o get_model.o \
- lateral_heterogeneities.o meshes_io.o nc_routines.o parameters.o \
- time_evol_wave.o analytic_mapping.o analytic_semi_mapping.o \
- analytic_spheroid_mapping.o apply_masks.o attenuation.o clocks.o \
- data_comm.o data_heterogeneous.o data_io.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 geom_transf.o get_mesh.o \
+ lateral_heterogeneities.o meshes_io.o nc_helpers.o nc_routines.o \
+ nc_snapshots.o parameters.o time_evol_wave.o analytic_mapping.o \
+ analytic_semi_mapping.o analytic_spheroid_mapping.o apply_masks.o \
+ attenuation.o clocks.o data_comm.o data_heterogeneous.o data_io.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 \
-- stiffness.o subpar_mapping.o unrolled_loops.o utlity.o \
-- wavefields_io.o ftz.o pthread.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
ifeq ($(strip $(USE_NETCDF)),true)
- FFLAGS += -Dunc
+ FFLAGS += -Denable_netcdf
+ ifeq ($(strip $(USE_PAR_NETCDF)),true)
+ FFLAGS += -Denable_parallel_netcdf
+ endif
+
ifdef NETCDF_PATH
LIBS = -L $(strip $(NETCDF_PATH))/lib -lnetcdff -Wl,-rpath,$(strip $(NETCDF_PATH))/lib
INCLUDE = -I $(strip $(NETCDF_PATH))/include
@@@ -42,12 -47,9 +49,12 @@@ els
endif
ifeq ($(strip $(SERIAL)),true)
- FFLAGS += -Dserial
- LDFLAGS += -pthread
+ FFLAGS += -Dserial
+ LDFLAGS += -pthread
endif
+ifeq ($(strip $(INCLUDE_MPI)),true)
+ FFLAGS += -Dinclude_mpi
+endif
# cancel m2c implicit rule
@@@ -117,20 -122,19 +127,25 @@@ pointwise_derivatives.o: data_mesh.o da
global_parameters.o unrolled_loops.o Makefile ../make_axisem.macros
rotations.o: data_io.o data_mesh.o data_proc.o data_source.o \
global_parameters.o Makefile ../make_axisem.macros
- seismograms.o: commun.o data_io.o data_mesh.o data_pointwise.o data_proc.o \
- data_source.o data_time.o global_parameters.o nc_routines.o \
- pointwise_derivatives.o rotations.o utlity.o Makefile ../make_axisem.macros
+ seismograms.o: commun.o data_io.o data_mesh.o data_proc.o data_source.o \
+ data_time.o global_parameters.o nc_routines.o rotations.o utlity.o Makefile ../make_axisem.macros
source.o: apply_masks.o commun.o data_io.o data_mesh.o data_proc.o \
- data_source.o data_spec.o data_time.o global_parameters.o \
- nc_routines.o pointwise_derivatives.o utlity.o Makefile ../make_axisem.macros
+ 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.o: attenuation.o data_matr.o data_mesh.o data_source.o data_spec.o \
++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 \
global_parameters.o unrolled_loops.o Makefile ../make_axisem.macros
++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: data_mesh.o data_spec.o geom_transf.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 \
- data_source.o global_parameters.o nc_routines.o \
+ data_source.o global_parameters.o nc_routines.o nc_snapshots.o \
pointwise_derivatives.o Makefile ../make_axisem.macros
background_models.o: data_proc.o global_parameters.o interpolation.o Makefile ../make_axisem.macros
commpi.o: clocks.o data_comm.o data_io.o data_mesh.o data_proc.o data_time.o \
@@@ -154,7 -163,7 +174,8 @@@ time_evol_wave.o: apply_masks.o attenua
data_matr.o data_mesh.o data_pointwise.o data_proc.o data_source.o \
data_time.o def_precomp_terms.o global_parameters.o meshes_io.o \
nc_routines.o parameters.o pointwise_derivatives.o rotations.o \
-- seismograms.o source.o stiffness.o wavefields_io.o Makefile ../make_axisem.macros
++ seismograms.o source.o stiffness_di.o stiffness_fluid.o \
++ stiffness_mono.o stiffness_quad.o wavefields_io.o Makefile ../make_axisem.macros
ftz.o: Makefile ../make_axisem.macros
pthread.o: Makefile ../make_axisem.macros
kdtree2.o: Makefile ../make_axisem.macros
diff --cc SOLVER/makemake.pl
index feaebbc,503937e..252dd98
--- a/SOLVER/makemake.pl
+++ b/SOLVER/makemake.pl
@@@ -72,14 -76,10 +76,14 @@@ print MAKEFILE " INCLUDE = \n"
print MAKEFILE "endif\n\n";
print MAKEFILE "ifeq (\$(strip \$(SERIAL)),true)\n";
- print MAKEFILE " FFLAGS += -Dserial\n";
- print MAKEFILE " LDFLAGS += -pthread\n";
+ print MAKEFILE " FFLAGS += -Dserial\n";
+ print MAKEFILE " LDFLAGS += -pthread\n";
print MAKEFILE "endif\n";
+print MAKEFILE "ifeq (\$(strip \$(INCLUDE_MPI)),true)\n";
+print MAKEFILE " FFLAGS += -Dinclude_mpi\n";
+print MAKEFILE "endif\n";
+
print MAKEFILE "\n\n";
print MAKEFILE "# cancel m2c implicit rule \n";
print MAKEFILE "%.o : %.mod \n ";
diff --cc make_axisem.macros.TEMPLATE
index d2fca10,f48bc8b..1facc71
--- a/make_axisem.macros.TEMPLATE
+++ b/make_axisem.macros.TEMPLATE
@@@ -14,14 -15,9 +15,14 @@@ USE_PAR_NETCDF = fals
NETCDF_PATH = # e.g. $(HOME)/local, uses /usr/include if not defined
# compile without MPI (possible values: 'false', 'true')
- # make sure to build mesh with one processor
+ # make sure to build mesh with one processor, USE_PAR_NETCDF needs to be false
SERIAL = false
+# Include the file mpif.h, instead of using the FORTRAN MPI module
+# Sometimes necessary when the local OpenMPI-version was not compiled with the
+# same version of the compiler than the one specified as $FC
+INCLUDE_MPI = false
+
####################################
# Choose compiler names and flags: #
####################################
More information about the CIG-COMMITS
mailing list