[cig-commits] [commit] pluggable: Eliminated most remaining references to THREE_D_MODEL. Resurrected data files for models s362ani_prem, s362wmani, s29ea. Pushed s362ea code into a 'common' subdirectory, so that I can use svn:externals to create mirror reflections of it. Created a dummy mantle model, '3D_mantle/none', to be used when there is no 3D mantle model. (3135e94)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Mar 10 13:39:53 PDT 2014
Repository : ssh://geoshell/specfem3d_globe
On branch : pluggable
Link : https://github.com/geodynamics/specfem3d_globe/compare/0000000000000000000000000000000000000000...99d99a4dcea0911a22759b11dba98723049af96b
>---------------------------------------------------------------
commit 3135e9490ab7243eed19a4ae931d894aad1f2d13
Author: Leif Strand <leif at geodynamics.org>
Date: Tue Nov 11 22:24:06 2008 +0000
Eliminated most remaining references to THREE_D_MODEL. Resurrected
data files for models s362ani_prem, s362wmani, s29ea. Pushed s362ea
code into a 'common' subdirectory, so that I can use svn:externals to
create mirror reflections of it. Created a dummy mantle model,
'3D_mantle/none', to be used when there is no 3D mantle model.
>---------------------------------------------------------------
3135e9490ab7243eed19a4ae931d894aad1f2d13
Makefile.in | 1 +
check_buffers_1D.f90 | 4 ++--
check_buffers_2D.f90 | 4 ++--
check_buffers_corners_chunks.f90 | 4 ++--
check_buffers_faces_chunks.f90 | 4 ++--
combine_AVS_DX.f90 | 4 ++--
compute_element_properties.f90 | 10 ++++------
create_header_file.f90 | 4 ++--
create_movie_AVS_DX.f90 | 4 ++--
create_movie_GMT_global.f90 | 4 ++--
create_regions_mesh.f90 | 10 +++++-----
get_model.f90 | 3 +--
meshfem3D.f90 | 29 ++++++++++++++---------------
read_compute_parameters.f90 | 2 +-
specfem3D.f90 | 27 +++++++++++++--------------
15 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index a211e96..20688e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -186,6 +186,7 @@ include $S/MODELS/crustal/crust2.0/build.mk
include $S/MODELS/3D_mantle/s20rts/build.mk
#include $S/MODELS/3D_mantle/s362ani/build.mk
#include $S/MODELS/3D_mantle/Montagner/build.mk
+#include $S/MODELS/3D_mantle/none/build.mk
include $S/MODELS/1D_ref/prem/build.mk
#include $S/MODELS/1D_ref/iasp91/build.mk
diff --git a/check_buffers_1D.f90 b/check_buffers_1D.f90
index e2aa1c0..ec7d6d0 100644
--- a/check_buffers_1D.f90
+++ b/check_buffers_1D.f90
@@ -60,7 +60,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS, &
- NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE,THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -134,7 +134,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/check_buffers_2D.f90 b/check_buffers_2D.f90
index 4319e76..be43e22 100644
--- a/check_buffers_2D.f90
+++ b/check_buffers_2D.f90
@@ -66,7 +66,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -138,7 +138,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/check_buffers_corners_chunks.f90 b/check_buffers_corners_chunks.f90
index d34d650..cb03474 100644
--- a/check_buffers_corners_chunks.f90
+++ b/check_buffers_corners_chunks.f90
@@ -58,7 +58,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -127,7 +127,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/check_buffers_faces_chunks.f90 b/check_buffers_faces_chunks.f90
index 84c1e55..4cb08b9 100644
--- a/check_buffers_faces_chunks.f90
+++ b/check_buffers_faces_chunks.f90
@@ -62,7 +62,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -132,7 +132,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/combine_AVS_DX.f90 b/combine_AVS_DX.f90
index 1f1158d..6c8d984 100644
--- a/combine_AVS_DX.f90
+++ b/combine_AVS_DX.f90
@@ -128,7 +128,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -207,7 +207,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC_COMP, &
diff --git a/compute_element_properties.f90 b/compute_element_properties.f90
index bc7e917..5a1e43e 100644
--- a/compute_element_properties.f90
+++ b/compute_element_properties.f90
@@ -31,7 +31,7 @@
nspl,rspl,espl,espl2,ELLIPTICITY,TOPOGRAPHY,TRANSVERSE_ISOTROPY, &
ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,ISOTROPIC_3D_MANTLE,CRUSTAL,ONE_CRUST, &
myrank,ibathy_topo,ATTENUATION,ATTENUATION_3D, &
- ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ ABSORBING_CONDITIONS, &
RICB,RCMB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN, &
xelm,yelm,zelm,shape3D,dershape3D,rmin,rmax,rhostore,kappavstore,kappahstore,muvstore,muhstore,eta_anisostore, &
xixstore,xiystore,xizstore,etaxstore,etaystore,etazstore,gammaxstore,gammaystore,gammazstore, &
@@ -100,8 +100,6 @@
! correct number of spectral elements in each block depending on chunk type
integer ispec,nspec,nspec_stacey
- integer THREE_D_MODEL
-
logical ELLIPTICITY,TOPOGRAPHY
logical TRANSVERSE_ISOTROPY,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,ISOTROPIC_3D_MANTLE,CRUSTAL,ONE_CRUST
@@ -165,8 +163,8 @@
! **************
! add topography on the Moho *before* adding the 3D crustal model so that the streched
! mesh gets assigned the right model values
- if(THREE_D_MODEL/=0 .and. (idoubling(ispec)==IFLAG_CRUST .or. idoubling(ispec)==IFLAG_220_80 &
- .or. idoubling(ispec)==IFLAG_80_MOHO)) call moho_stretching(myrank,xelm,yelm,zelm,RMOHO,R220)
+ if(idoubling(ispec)==IFLAG_CRUST .or. idoubling(ispec)==IFLAG_220_80 &
+ .or. idoubling(ispec)==IFLAG_80_MOHO) call add_moho_topography(myrank,xelm,yelm,zelm,RMOHO,R220)
! compute values for the Earth model
call get_model(myrank,iregion_code,nspec, &
@@ -180,7 +178,7 @@
ISOTROPIC_3D_MANTLE,CRUSTAL,ONE_CRUST, &
ATTENUATION, ATTENUATION_3D, tau_s, tau_e_store, Qmu_store, T_c_source, &
size(tau_e_store,2), size(tau_e_store,3), size(tau_e_store,4), size(tau_e_store,5), &
- ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ ABSORBING_CONDITIONS, &
RCMB,RICB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN,&
AM_V,AM_S,AS_V)
diff --git a/create_header_file.f90 b/create_header_file.f90
index 4ef01cb..41fb370 100644
--- a/create_header_file.f90
+++ b/create_header_file.f90
@@ -42,7 +42,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NSOURCES,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -127,7 +127,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/create_movie_AVS_DX.f90 b/create_movie_AVS_DX.f90
index c30c17f..c177211 100644
--- a/create_movie_AVS_DX.f90
+++ b/create_movie_AVS_DX.f90
@@ -692,7 +692,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -756,7 +756,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/create_movie_GMT_global.f90 b/create_movie_GMT_global.f90
index 1918ea2..e770b66 100644
--- a/create_movie_GMT_global.f90
+++ b/create_movie_GMT_global.f90
@@ -74,7 +74,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -147,7 +147,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/create_regions_mesh.f90 b/create_regions_mesh.f90
index 22f3c23..bfeb5a1 100644
--- a/create_regions_mesh.f90
+++ b/create_regions_mesh.f90
@@ -40,7 +40,7 @@
myrank,LOCAL_PATH,OCEANS,ibathy_topo, &
rotation_matrix,ANGULAR_WIDTH_XI_RAD,ANGULAR_WIDTH_ETA_RAD,&
ATTENUATION,ATTENUATION_3D,SAVE_MESH_FILES, &
- NCHUNKS,INCLUDE_CENTRAL_CUBE,ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ NCHUNKS,INCLUDE_CENTRAL_CUBE,ABSORBING_CONDITIONS, &
R_CENTRAL_CUBE,RICB,RHO_OCEANS,RCMB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN, &
ner,ratio_sampling_array,doubling_index,r_bottom,r_top,this_region_has_a_doubling,CASE_3D, &
AM_V, AM_S, AS_V, &
@@ -127,7 +127,7 @@
! correct number of spectral elements in each block depending on chunk type
integer nspec,nspec_tiso,nspec_stacey
- integer NEX_XI,NEX_PER_PROC_XI,NEX_PER_PROC_ETA,NCHUNKS,THREE_D_MODEL
+ integer NEX_XI,NEX_PER_PROC_XI,NEX_PER_PROC_ETA,NCHUNKS
integer NSPEC2DMAX_XMIN_XMAX,NSPEC2DMAX_YMIN_YMAX,NSPEC2D_BOTTOM,NSPEC2D_TOP
@@ -725,7 +725,7 @@
nspl,rspl,espl,espl2,ELLIPTICITY,TOPOGRAPHY,TRANSVERSE_ISOTROPY, &
ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,ISOTROPIC_3D_MANTLE,CRUSTAL,ONE_CRUST, &
myrank,ibathy_topo,ATTENUATION,ATTENUATION_3D, &
- ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ ABSORBING_CONDITIONS, &
RICB,RCMB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN, &
xelm,yelm,zelm,shape3D,dershape3D,rmin,rmax,rhostore,kappavstore,kappahstore,muvstore,muhstore,eta_anisostore, &
xixstore,xiystore,xizstore,etaxstore,etaystore,etazstore,gammaxstore,gammaystore,gammazstore, &
@@ -924,7 +924,7 @@
nspl,rspl,espl,espl2,ELLIPTICITY,TOPOGRAPHY,TRANSVERSE_ISOTROPY, &
ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,ISOTROPIC_3D_MANTLE,CRUSTAL,ONE_CRUST, &
myrank,ibathy_topo,ATTENUATION,ATTENUATION_3D, &
- ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ ABSORBING_CONDITIONS, &
RICB,RCMB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN, &
xelm,yelm,zelm,shape3D,dershape3D,rmin,rmax,rhostore,kappavstore,kappahstore,muvstore,muhstore,eta_anisostore, &
xixstore,xiystore,xizstore,etaxstore,etaystore,etazstore,gammaxstore,gammaystore,gammazstore, &
@@ -1090,7 +1090,7 @@
nspl,rspl,espl,espl2,ELLIPTICITY,TOPOGRAPHY,TRANSVERSE_ISOTROPY, &
ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,ISOTROPIC_3D_MANTLE,CRUSTAL,ONE_CRUST, &
myrank,ibathy_topo,ATTENUATION,ATTENUATION_3D, &
- ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ ABSORBING_CONDITIONS, &
RICB,RCMB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN, &
xelm,yelm,zelm,shape3D,dershape3D,rmin,rmax,rhostore,kappavstore,kappahstore,muvstore,muhstore,eta_anisostore, &
xixstore,xiystore,xizstore,etaxstore,etaystore,etazstore,gammaxstore,gammaystore,gammazstore, &
diff --git a/get_model.f90 b/get_model.f90
index 16671df..558f704 100644
--- a/get_model.f90
+++ b/get_model.f90
@@ -36,7 +36,7 @@ subroutine get_model(myrank,iregion_code,nspec, &
rho_vp,rho_vs,nspec_stacey, &
TRANSVERSE_ISOTROPY,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,ISOTROPIC_3D_MANTLE, &
CRUSTAL,ONE_CRUST,ATTENUATION,ATTENUATION_3D,tau_s,tau_e_store,Qmu_store,T_c_source,vx,vy,vz,vnspec, &
- ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ ABSORBING_CONDITIONS, &
RCMB,RICB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN,&
AM_V, AM_S, AS_V)
@@ -96,7 +96,6 @@ subroutine get_model(myrank,iregion_code,nspec, &
! attenuation_simplex_variables
integer ispec,nspec,idoubling,iregion_code,myrank,nspec_stacey
- integer THREE_D_MODEL
logical ATTENUATION,ATTENUATION_3D,ABSORBING_CONDITIONS
logical TRANSVERSE_ISOTROPY,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,ISOTROPIC_3D_MANTLE,CRUSTAL,ONE_CRUST
diff --git a/meshfem3D.f90 b/meshfem3D.f90
index 3f50221..fea2b73 100644
--- a/meshfem3D.f90
+++ b/meshfem3D.f90
@@ -294,7 +294,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NSOURCES,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -346,7 +346,7 @@
double precision :: static_memory_size
! arrays for BCAST
- integer, dimension(37) :: bcast_integer
+ integer, dimension(36) :: bcast_integer
double precision, dimension(30) :: bcast_double_precision
logical, dimension(26) :: bcast_logical
@@ -430,7 +430,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
@@ -459,7 +459,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NSOURCES,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,&
- SIMULATION_TYPE,THREE_D_MODEL,NPROC,NPROCTOT, &
+ SIMULATION_TYPE,NPROC,NPROCTOT, &
NEX_PER_PROC_XI,NEX_PER_PROC_ETA,ratio_divide_central_cube,&
MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP/)
@@ -482,7 +482,7 @@
! broadcast the information read on the master to the nodes
call MPI_BCAST(NSOURCES,1,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
- call MPI_BCAST(bcast_integer,37,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
+ call MPI_BCAST(bcast_integer,36,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(bcast_double_precision,30,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
@@ -550,15 +550,14 @@
NUMBER_OF_THIS_RUN = bcast_integer(26)
NCHUNKS = bcast_integer(27)
SIMULATION_TYPE = bcast_integer(28)
- THREE_D_MODEL = bcast_integer(29)
- NPROC = bcast_integer(30)
- NPROCTOT = bcast_integer(31)
- NEX_PER_PROC_XI = bcast_integer(32)
- NEX_PER_PROC_ETA = bcast_integer(33)
- ratio_divide_central_cube = bcast_integer(34)
- MOVIE_VOLUME_TYPE = bcast_integer(35)
- MOVIE_START = bcast_integer(36)
- MOVIE_STOP = bcast_integer(37)
+ NPROC = bcast_integer(29)
+ NPROCTOT = bcast_integer(30)
+ NEX_PER_PROC_XI = bcast_integer(31)
+ NEX_PER_PROC_ETA = bcast_integer(32)
+ ratio_divide_central_cube = bcast_integer(33)
+ MOVIE_VOLUME_TYPE = bcast_integer(34)
+ MOVIE_START = bcast_integer(35)
+ MOVIE_STOP = bcast_integer(36)
TRANSVERSE_ISOTROPY = bcast_logical(1)
ANISOTROPIC_3D_MANTLE = bcast_logical(2)
@@ -979,7 +978,7 @@
myrank,LOCAL_PATH,OCEANS,ibathy_topo, &
rotation_matrix,ANGULAR_WIDTH_XI_RAD,ANGULAR_WIDTH_ETA_RAD, &
ATTENUATION,ATTENUATION_3D,SAVE_MESH_FILES, &
- NCHUNKS,INCLUDE_CENTRAL_CUBE,ABSORBING_CONDITIONS,THREE_D_MODEL, &
+ NCHUNKS,INCLUDE_CENTRAL_CUBE,ABSORBING_CONDITIONS, &
R_CENTRAL_CUBE,RICB,RHO_OCEANS,RCMB,R670,RMOHO,RTOPDDOUBLEPRIME,R600,R220,R771,R400,R120,R80,RMIDDLE_CRUST,ROCEAN, &
ner,ratio_sampling_array,doubling_index,r_bottom, r_top,this_region_has_a_doubling,CASE_3D, &
AM_V, AM_S,AS_V, &
diff --git a/read_compute_parameters.f90 b/read_compute_parameters.f90
index 3fcde45..94eb7a1 100644
--- a/read_compute_parameters.f90
+++ b/read_compute_parameters.f90
@@ -42,7 +42,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC, &
diff --git a/specfem3D.f90 b/specfem3D.f90
index 14d0f20..6ca00f4 100644
--- a/specfem3D.f90
+++ b/specfem3D.f90
@@ -706,7 +706,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS,&
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NSOURCES,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,SIMULATION_TYPE, &
- THREE_D_MODEL,MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
+ MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP
double precision DT,ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES,CENTER_LONGITUDE_IN_DEGREES, &
CENTER_LATITUDE_IN_DEGREES,GAMMA_ROTATION_AZIMUTH,ROCEAN,RMIDDLE_CRUST, &
@@ -782,7 +782,7 @@
logical :: CASE_3D
! arrays for BCAST
- integer, dimension(37) :: bcast_integer
+ integer, dimension(36) :: bcast_integer
double precision, dimension(30) :: bcast_double_precision
logical, dimension(33) :: bcast_logical
@@ -837,7 +837,7 @@
ROTATION,ISOTROPIC_3D_MANTLE,TOPOGRAPHY,OCEANS,MOVIE_SURFACE, &
MOVIE_VOLUME,MOVIE_VOLUME_COARSE,ATTENUATION_3D,RECEIVERS_CAN_BE_BURIED, &
PRINT_SOURCE_TIME_FUNCTION,SAVE_MESH_FILES, &
- ATTENUATION,THREE_D_MODEL,ABSORBING_CONDITIONS, &
+ ATTENUATION,ABSORBING_CONDITIONS, &
INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,LOCAL_PATH,MODEL,SIMULATION_TYPE,SAVE_FORWARD, &
NPROC,NPROCTOT,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
NSPEC_computed, &
@@ -867,7 +867,7 @@
NPROC_XI,NPROC_ETA,NTSTEP_BETWEEN_OUTPUT_SEISMOS, &
NTSTEP_BETWEEN_READ_ADJSRC,NSTEP,NSOURCES,NTSTEP_BETWEEN_FRAMES, &
NTSTEP_BETWEEN_OUTPUT_INFO,NUMBER_OF_RUNS,NUMBER_OF_THIS_RUN,NCHUNKS,&
- SIMULATION_TYPE,THREE_D_MODEL,NPROC,NPROCTOT, &
+ SIMULATION_TYPE,NPROC,NPROCTOT, &
NEX_PER_PROC_XI,NEX_PER_PROC_ETA,ratio_divide_central_cube,&
MOVIE_VOLUME_TYPE,MOVIE_START,MOVIE_STOP/)
@@ -892,7 +892,7 @@
! broadcast the information read on the master to the nodes
call MPI_BCAST(NSOURCES,1,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
- call MPI_BCAST(bcast_integer,37,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
+ call MPI_BCAST(bcast_integer,36,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(bcast_double_precision,30,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
@@ -959,15 +959,14 @@
NUMBER_OF_THIS_RUN = bcast_integer(26)
NCHUNKS = bcast_integer(27)
SIMULATION_TYPE = bcast_integer(28)
- THREE_D_MODEL = bcast_integer(29)
- NPROC = bcast_integer(30)
- NPROCTOT = bcast_integer(31)
- NEX_PER_PROC_XI = bcast_integer(32)
- NEX_PER_PROC_ETA = bcast_integer(33)
- ratio_divide_central_cube = bcast_integer(34)
- MOVIE_VOLUME_TYPE = bcast_integer(35)
- MOVIE_START = bcast_integer(36)
- MOVIE_STOP = bcast_integer(37)
+ NPROC = bcast_integer(29)
+ NPROCTOT = bcast_integer(30)
+ NEX_PER_PROC_XI = bcast_integer(31)
+ NEX_PER_PROC_ETA = bcast_integer(32)
+ ratio_divide_central_cube = bcast_integer(33)
+ MOVIE_VOLUME_TYPE = bcast_integer(34)
+ MOVIE_START = bcast_integer(35)
+ MOVIE_STOP = bcast_integer(36)
TRANSVERSE_ISOTROPY = bcast_logical(1)
ANISOTROPIC_3D_MANTLE = bcast_logical(2)
More information about the CIG-COMMITS
mailing list