[cig-commits] r22663 - in seismo/3D/SPECFEM3D_GLOBE: branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D trunk/src/shared
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Wed Jul 24 09:01:33 PDT 2013
Author: dkomati1
Date: 2013-07-24 09:01:33 -0700 (Wed, 24 Jul 2013)
New Revision: 22663
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/finalize_mesher.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_par.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/broadcast_computed_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/exit_mpi.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/get_model_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/memory_eval.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/model_topo_bathy.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_parameter_file.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/save_header_file.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/check_simulation_stability.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/initialize_simulation.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_forward_arrays_adios.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/save_forward_arrays_adios.F90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/specfem3D_par.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90
Log:
done with all the easy merges in src/shared
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/create_header_file/create_header_file.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -84,7 +84,7 @@
character(len=150) HEADER_FILE
integer :: NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
@@ -162,7 +162,7 @@
ratio_sampling_array,NPROCTOT, &
NSPEC,nglob,SIMULATION_TYPE,MOVIE_VOLUME,SAVE_FORWARD, &
NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
@@ -190,7 +190,7 @@
NSPEC2DMAX_YMIN_YMAX,NSPEC2DMAX_XMIN_XMAX, &
NPROC_XI,NPROC_ETA, &
NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/finalize_mesher.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/finalize_mesher.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/finalize_mesher.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -105,7 +105,7 @@
ratio_sampling_array,NPROCTOT, &
NSPEC,nglob,SIMULATION_TYPE,MOVIE_VOLUME,SAVE_FORWARD, &
NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
@@ -132,7 +132,7 @@
NSPEC2DMAX_YMIN_YMAX,NSPEC2DMAX_XMIN_XMAX, &
NPROC_XI,NPROC_ETA, &
NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_par.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_par.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_par.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -229,7 +229,7 @@
double precision :: static_memory_size
integer :: NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/broadcast_computed_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/broadcast_computed_parameters.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/broadcast_computed_parameters.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -25,7 +25,7 @@
!
!=====================================================================
- subroutine broadcast_compute_parameters(myrank,MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD,NER_CRUST, &
+ subroutine broadcast_computed_parameters(myrank,MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD,NER_CRUST, &
NER_80_MOHO,NER_220_80,NER_400_220,NER_600_400,NER_670_600,NER_771_670, &
NER_TOPDDOUBLEPRIME_771,NER_CMB_TOPDDOUBLEPRIME,NER_OUTER_CORE, &
NER_TOP_CENTRAL_CUBE_ICB,NEX_XI,NEX_ETA, &
@@ -58,10 +58,10 @@
ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,HETEROGEN_3D_MANTLE, &
ATTENUATION,ATTENUATION_NEW,ATTENUATION_3D,ANISOTROPIC_INNER_CORE,NOISE_TOMOGRAPHY)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
include "constants.h"
include "precision.h"
@@ -84,7 +84,7 @@
MOVIE_TOP,MOVIE_BOTTOM,MOVIE_WEST,MOVIE_EAST,MOVIE_NORTH,MOVIE_SOUTH, &
RMOHO_FICTITIOUS_IN_MESHER
- logical MOVIE_SURFACE,MOVIE_VOLUME,RECEIVERS_CAN_BE_BURIED,PRINT_SOURCE_TIME_FUNCTION, &
+ logical MOVIE_SURFACE,MOVIE_VOLUME,RECEIVERS_CAN_BE_BURIED,PRINT_SOURCE_TIME_FUNCTION, &
SAVE_MESH_FILES,ABSORBING_CONDITIONS,INCLUDE_CENTRAL_CUBE,INFLATE_CENTRAL_CUBE,SAVE_FORWARD, &
SAVE_ALL_SEISMOS_IN_ONE_FILE,MOVIE_COARSE,OUTPUT_SEISMOS_ASCII_TEXT,&
OUTPUT_SEISMOS_SAC_ALPHANUM,OUTPUT_SEISMOS_SAC_BINARY,&
@@ -201,7 +201,7 @@
call MPI_BCAST(DIFF_NSPEC2D_XI,NB_SQUARE_EDGES_ONEDIR*NB_CUT_CASE,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
! non-master processes set their parameters
- if (myrank /=0) then
+ if (myrank /= 0) then
! please, be careful with ordering and counting here
! integers
@@ -318,71 +318,5 @@
endif
- end subroutine broadcast_compute_parameters
+ end subroutine broadcast_computed_parameters
-
-!-------------------------------------------------------------------------------------------------
-!> Broadcast the parameters relative to GPU computing settings.
-!! \param myrank The rank of the MPI process in COMM_WORLD
-!! \param GPU_MODE Flag to indicate that GPU computing is ON or OFF.
- subroutine broadcast_gpu_parameters(myrank,GPU_MODE)
-
- implicit none
-
-! standard include of the MPI library
- include 'mpif.h'
- include "constants.h"
- include "precision.h"
-
- integer:: myrank
- logical:: GPU_MODE
- ! local parameters
- integer :: ier
-
- call MPI_BCAST(GPU_MODE,1,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
- if( ier /= 0 ) call exit_MPI(myrank,'error broadcasting GPU_MODE')
-
- end subroutine broadcast_gpu_parameters
-
-!-------------------------------------------------------------------------------------------------
-!> Broadcast the parameters relative to ADIOS output settings.
-!! \param myrank The rank of the MPI process in COMM_WORLD
-!! \param ADIOS_ENABLED Flag to indicate ADIOS output for seismograms.
-!! \param ADIOS_FOR_FORWARD_ARRAYS Flag to indicate that intermediate and
-!! forward arrays are stored with the help of ADIOS.
-subroutine broadcast_adios_parameters(myrank,ADIOS_ENABLED, &
- ADIOS_FOR_FORWARD_ARRAYS, ADIOS_FOR_MPI_ARRAYS, &
- ADIOS_FOR_ARRAYS_SOLVER, ADIOS_FOR_SOLVER_MESHFILES, &
- ADIOS_FOR_AVS_DX)
-
- implicit none
-
- ! standard include of the MPI library
- include 'mpif.h'
- include "constants.h"
- include "precision.h"
-
- integer:: myrank
- logical:: ADIOS_ENABLED, ADIOS_FOR_FORWARD_ARRAYS, ADIOS_FOR_MPI_ARRAYS, &
- ADIOS_FOR_ARRAYS_SOLVER, ADIOS_FOR_SOLVER_MESHFILES, ADIOS_FOR_AVS_DX
- ! local parameters
- integer :: ier
- call MPI_BCAST(ADIOS_ENABLED,1,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
- if( ier /= 0 ) call exit_MPI(myrank,'error broadcasting ADIOS_ENABLED')
- call MPI_BCAST(ADIOS_FOR_FORWARD_ARRAYS,1,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
- if( ier /= 0 ) call exit_MPI(myrank, &
- 'error broadcasting ADIOS_FOR_FORWARD_ARRAYS')
- call MPI_BCAST(ADIOS_FOR_MPI_ARRAYS,1,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
- if( ier /= 0 ) call exit_MPI(myrank, &
- 'error broadcasting ADIOS_FOR_MPI_ARRAYS')
- call MPI_BCAST(ADIOS_FOR_ARRAYS_SOLVER,1,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
- if( ier /= 0 ) call exit_MPI(myrank, &
- 'error broadcasting ADIOS_FOR_ARRAYS_SOLVER')
- call MPI_BCAST(ADIOS_FOR_SOLVER_MESHFILES,1,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
- if( ier /= 0 ) call exit_MPI(myrank, &
- 'error broadcasting ADIOS_FOR_SOLVER_MESHFILES')
- call MPI_BCAST(ADIOS_FOR_AVS_DX,1,MPI_LOGICAL,0,MPI_COMM_WORLD,ier)
- if( ier /= 0 ) call exit_MPI(myrank, &
- 'error broadcasting ADIOS_FOR_AVS_DX')
-
-end subroutine broadcast_adios_parameters
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/exit_mpi.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/exit_mpi.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/exit_mpi.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -30,11 +30,10 @@
! version with rank number printed in the error message
subroutine exit_MPI(myrank,error_msg)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
! identifier for error message file
@@ -67,7 +66,7 @@
! program with an error code of 30
call MPI_ABORT(MPI_COMM_WORLD,30,ier)
- ! otherwise: there is no standard behaviour to exit with an error code in fortran,
+ ! otherwise: there is no standard behaviour to exit with an error code in Fortran,
! however most compilers do recognize this as an error code stop statement;
! to check stop code in terminal: > echo $?
stop 30
@@ -84,11 +83,10 @@
! version without rank number printed in the error message
subroutine exit_MPI_without_rank(error_msg)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
character(len=*) error_msg
@@ -118,7 +116,7 @@
include "constants.h"
! only master process writes out to main output file
- ! file I/O in fortran is buffered by default
+ ! file I/O in Fortran is buffered by default
!
! note: Fortran2003 includes a FLUSH statement
! which is implemented by most compilers by now
@@ -140,11 +138,10 @@
subroutine sync_all()
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
integer :: ier,rank
! gets callers rank
@@ -162,11 +159,10 @@
subroutine irecv_cr(recvbuf, recvcount, dest, recvtag, req)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
include "precision.h"
@@ -186,11 +182,10 @@
subroutine isend_cr(sendbuf, sendcount, dest, sendtag, req)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
include "precision.h"
@@ -210,11 +205,10 @@
subroutine wait_req(req)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
integer :: req
integer, dimension(MPI_STATUS_SIZE) :: req_mpi_status
@@ -231,11 +225,10 @@
double precision function wtime()
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
wtime = MPI_WTIME()
end function wtime
@@ -246,11 +239,10 @@
subroutine min_all_i(sendbuf, recvbuf)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
include "precision.h"
@@ -268,11 +260,10 @@
subroutine max_all_i(sendbuf, recvbuf)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
include "precision.h"
@@ -290,11 +281,10 @@
subroutine max_all_cr(sendbuf, recvbuf)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
include "precision.h"
@@ -312,11 +302,10 @@
subroutine sum_all_i(sendbuf, recvbuf)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
integer :: sendbuf, recvbuf
integer :: ier
@@ -331,11 +320,10 @@
subroutine sum_all_dp(sendbuf, recvbuf)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
double precision sendbuf, recvbuf
integer ier
@@ -350,11 +338,10 @@
subroutine bcast_iproc_i(buffer,iproc)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
integer :: iproc
integer :: buffer
@@ -370,11 +357,10 @@
subroutine bcast_all_singlei(buffer)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
integer :: buffer
integer ier
@@ -390,11 +376,10 @@
subroutine recv_singlei(recvbuf, dest, recvtag)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
integer :: dest,recvtag
integer :: recvbuf
@@ -413,11 +398,10 @@
subroutine recv_i(recvbuf, recvcount, dest, recvtag)
+ use mpi
+
implicit none
-! standard include of the MPI library
- include 'mpif.h'
-
integer :: dest,recvtag
integer :: recvcount
integer,dimension(recvcount) :: recvbuf
@@ -436,12 +420,10 @@
subroutine send_i(sendbuf, sendcount, dest, sendtag)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
- !integer sendbuf,sendcount,dest,sendtag
integer dest,sendtag
integer sendcount
integer,dimension(sendcount):: sendbuf
@@ -457,12 +439,10 @@
subroutine send_singlei(sendbuf, dest, sendtag)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
- !integer sendbuf,sendcount,dest,sendtag
integer :: dest,sendtag
integer :: sendbuf
integer :: ier
@@ -477,11 +457,10 @@
subroutine world_size(size)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
integer size
integer ier
@@ -495,11 +474,10 @@
subroutine world_rank(rank)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
integer rank
integer ier
@@ -513,11 +491,10 @@
subroutine gather_all_i(sendbuf, sendcnt, recvbuf, recvcount, NPROC)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
integer sendcnt, recvcount, NPROC
integer, dimension(sendcnt) :: sendbuf
integer, dimension(recvcount,0:NPROC-1) :: recvbuf
@@ -536,11 +513,10 @@
subroutine gatherv_all_i(sendbuf, sendcnt, recvbuf, recvcount, recvoffset,recvcounttot, NPROC)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
include "precision.h"
@@ -563,11 +539,10 @@
subroutine gatherv_all_cr(sendbuf, sendcnt, recvbuf, recvcount, recvoffset,recvcounttot, NPROC)
+ use mpi
+
implicit none
- ! standard include of the MPI library
- include 'mpif.h'
-
include "constants.h"
include "precision.h"
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/get_model_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/get_model_parameters.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/get_model_parameters.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -397,7 +397,7 @@
REFERENCE_1D_MODEL = GLL_REFERENCE_1D_MODEL
THREE_D_MODEL = THREE_D_MODEL_GLL
TRANSVERSE_ISOTROPY = .true.
- ! note: after call to this routine read_compute_parameters() we will set
+ ! note: after call to this routine we will set
! mgll_v%model_gll flag and reset
! THREE_D_MODEL = THREE_D_MODEL_S29EA
! (not done here because we will use mgll_v%model_gll flag to identify this
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/memory_eval.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/memory_eval.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/memory_eval.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -32,9 +32,9 @@
ONE_CRUST,doubling_index,this_region_has_a_doubling,NCHUNKS, &
ner,NEX_PER_PROC_XI,NEX_PER_PROC_ETA, &
ratio_sampling_array,NPROCTOT, &
- NSPEC,nglob,SIMULATION_TYPE,MOVIE_VOLUME,SAVE_FORWARD, &
+ NSPEC,NGLOB,SIMULATION_TYPE,MOVIE_VOLUME,SAVE_FORWARD, &
NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
@@ -57,7 +57,7 @@
ROTATION,TOPOGRAPHY, &
ATTENUATION,ONE_CRUST,OCEANS,ABSORBING_CONDITIONS, &
MOVIE_VOLUME,SAVE_FORWARD
- integer, dimension(MAX_NUM_REGIONS), intent(in) :: NSPEC, nglob, &
+ integer, dimension(MAX_NUM_REGIONS), intent(in) :: NSPEC, NGLOB, &
NSPEC2D_BOTTOM,NSPEC2D_TOP
integer, intent(in) :: NCHUNKS,NEX_PER_PROC_XI,NEX_PER_PROC_ETA,SIMULATION_TYPE
@@ -70,7 +70,7 @@
double precision, intent(out) :: static_memory_size
integer, intent(out) :: NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
@@ -138,10 +138,10 @@
! if attenuation is off, set dummy size of arrays to one
if(ATTENUATION) then
- NSPEC_CRUST_MANTLE_ATTENUAT = NSPEC(IREGION_CRUST_MANTLE)
+ NSPEC_CRUST_MANTLE_ATTENUATION = NSPEC(IREGION_CRUST_MANTLE)
NSPEC_INNER_CORE_ATTENUATION = NSPEC(IREGION_INNER_CORE)
else
- NSPEC_CRUST_MANTLE_ATTENUAT = 1
+ NSPEC_CRUST_MANTLE_ATTENUATION = 1
NSPEC_INNER_CORE_ATTENUATION = 1
endif
@@ -207,7 +207,7 @@
! if oceans are off, set dummy size of arrays to one
if(OCEANS) then
- NGLOB_CRUST_MANTLE_OCEANS = nglob(IREGION_CRUST_MANTLE)
+ NGLOB_CRUST_MANTLE_OCEANS = NGLOB(IREGION_CRUST_MANTLE)
else
NGLOB_CRUST_MANTLE_OCEANS = 1
endif
@@ -238,11 +238,11 @@
if( NCHUNKS /= 6 .and. ABSORBING_CONDITIONS) then
! three mass matrices for the crust and mantle region: rmassx, rmassy and rmassz
static_memory_size = static_memory_size + &
- 6.d0*nglob(IREGION_CRUST_MANTLE)*dble(CUSTOM_REAL)
+ 6.d0*NGLOB(IREGION_CRUST_MANTLE)*dble(CUSTOM_REAL)
else
! one only keeps one mass matrix for the calculations: rmassz
static_memory_size = static_memory_size + &
- 4.d0*nglob(IREGION_CRUST_MANTLE)*dble(CUSTOM_REAL)
+ 4.d0*NGLOB(IREGION_CRUST_MANTLE)*dble(CUSTOM_REAL)
endif
! rhostore_crust_mantle,kappavstore_crust_mantle,muvstore_crust_mantle
@@ -268,30 +268,30 @@
! displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle
static_memory_size = static_memory_size + &
- 3.d0*dble(NDIM)*nglob(IREGION_CRUST_MANTLE)*dble(CUSTOM_REAL)
+ 3.d0*dble(NDIM)*NGLOB(IREGION_CRUST_MANTLE)*dble(CUSTOM_REAL)
! attenuation arrays
if( USE_3D_ATTENUATION_ARRAYS ) then
! one_minus_sum_beta_crust_mantle, factor_scale_crust_mantle
static_memory_size = static_memory_size + &
- 2.d0*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_ATTENUAT*dble(CUSTOM_REAL)
+ 2.d0*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_ATTENUATION*dble(CUSTOM_REAL)
! factor_common_crust_mantle
static_memory_size = static_memory_size + &
- dble(N_SLS)*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_ATTENUAT*dble(CUSTOM_REAL)
+ dble(N_SLS)*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_ATTENUATION*dble(CUSTOM_REAL)
else
! one_minus_sum_beta_crust_mantle, factor_scale_crust_mantle
static_memory_size = static_memory_size + &
- 2.d0*dble(1)*NSPEC_CRUST_MANTLE_ATTENUAT*dble(CUSTOM_REAL)
+ 2.d0*dble(1)*NSPEC_CRUST_MANTLE_ATTENUATION*dble(CUSTOM_REAL)
! factor_common_crust_mantle
static_memory_size = static_memory_size + &
- dble(N_SLS)*dble(1)*NSPEC_CRUST_MANTLE_ATTENUAT*dble(CUSTOM_REAL)
+ dble(N_SLS)*dble(1)*NSPEC_CRUST_MANTLE_ATTENUATION*dble(CUSTOM_REAL)
endif
! R_memory_crust_mantle (R_xx, R_yy, ..)
static_memory_size = static_memory_size + &
- 5.d0*dble(N_SLS)*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_ATTENUAT*dble(CUSTOM_REAL)
+ 5.d0*dble(N_SLS)*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_ATTENUATION*dble(CUSTOM_REAL)
! add arrays used to save strain for attenuation or for adjoint runs
! epsilondev_crust_mantle
@@ -331,7 +331,7 @@
! xstore_inner_core,ystore_inner_core,zstore_inner_core,rmass_inner_core
static_memory_size = static_memory_size + &
- 4.d0*nglob(IREGION_INNER_CORE)*dble(CUSTOM_REAL)
+ 4.d0*NGLOB(IREGION_INNER_CORE)*dble(CUSTOM_REAL)
! c11store_inner_core,c33store_inner_core,c12store_inner_core,c13store_inner_core,c44store_inner_core
static_memory_size = static_memory_size + &
@@ -342,7 +342,7 @@
! displ_inner_core,veloc_inner_core,accel_inner_core
static_memory_size = static_memory_size + &
- 3.d0*dble(NDIM)*nglob(IREGION_INNER_CORE)*dble(CUSTOM_REAL)
+ 3.d0*dble(NDIM)*NGLOB(IREGION_INNER_CORE)*dble(CUSTOM_REAL)
! attenuation arrays
if( USE_3D_ATTENUATION_ARRAYS ) then
@@ -392,7 +392,7 @@
! xstore_outer_core, ystore_outer_core, zstore_outer_core, rmass_outer_core,
! displ_outer_core, veloc_outer_core, accel_outer_core
static_memory_size = static_memory_size + &
- 7.d0*nglob(IREGION_OUTER_CORE)*dble(CUSTOM_REAL)
+ 7.d0*NGLOB(IREGION_OUTER_CORE)*dble(CUSTOM_REAL)
! vp_outer_core
static_memory_size = static_memory_size + &
@@ -401,8 +401,6 @@
! ispec_is_tiso_outer_core
static_memory_size = static_memory_size + NSPEC(IREGION_OUTER_CORE)*dble(SIZE_LOGICAL)
-
-
! additional arrays
! A_array_rotation,B_array_rotation
@@ -447,7 +445,7 @@
! mask_ibool
static_memory_size = static_memory_size + &
- nglob(IREGION_CRUST_MANTLE)*dble(SIZE_LOGICAL)
+ NGLOB(IREGION_CRUST_MANTLE)*dble(SIZE_LOGICAL)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/model_topo_bathy.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/model_topo_bathy.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/model_topo_bathy.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -37,11 +37,11 @@
! standard routine to setup model
+ use mpi
+
implicit none
include "constants.h"
- ! standard include of the MPI library
- include 'mpif.h'
integer :: myrank
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_parameter_file.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_parameter_file.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -28,7 +28,7 @@
!!!!!! VERY IMPORTANT
!!!!!! VERY IMPORTANT
!!!!!! VERY IMPORTANT if you add new parameters to DATA/Par_file, remember to also
-!!!!!! VERY IMPORTANT broadcast them with MPI_BCAST in src/shared/broadcast_compute_parameters.f90
+!!!!!! VERY IMPORTANT broadcast them with MPI_BCAST in src/shared/broadcast_computed_parameters.f90
!!!!!! VERY IMPORTANT otherwise the code will *NOT* work
!!!!!! VERY IMPORTANT
!!!!!! VERY IMPORTANT
@@ -217,67 +217,3 @@
call close_parameter_file()
end subroutine read_parameter_file
-
-!
-!-------------------------------------------------------------------------------------------------
-!
-
- subroutine read_gpu_mode(GPU_MODE)
-
- implicit none
- include "constants.h"
-
- logical :: GPU_MODE
-
- ! initializes flags
- GPU_MODE = .false.
-
- ! opens file Par_file
- call open_parameter_file()
-
- call read_value_logical(GPU_MODE, 'solver.GPU_MODE')
-
- ! close parameter file
- call close_parameter_file()
-
- end subroutine read_gpu_mode
-
-!
-!-------------------------------------------------------------------------------------------------
-!
- subroutine read_adios_parameters(ADIOS_ENABLED, ADIOS_FOR_FORWARD_ARRAYS, &
- ADIOS_FOR_MPI_ARRAYS, ADIOS_FOR_ARRAYS_SOLVER, &
- ADIOS_FOR_SOLVER_MESHFILES, ADIOS_FOR_AVS_DX)
-
- implicit none
- include "constants.h"
-
- logical :: ADIOS_ENABLED, ADIOS_FOR_FORWARD_ARRAYS, ADIOS_FOR_MPI_ARRAYS, &
- ADIOS_FOR_ARRAYS_SOLVER, ADIOS_FOR_SOLVER_MESHFILES, ADIOS_FOR_AVS_DX
-
- ! initializes flags
- ADIOS_ENABLED = .false.
- ADIOS_FOR_FORWARD_ARRAYS = .false.
- ADIOS_FOR_MPI_ARRAYS = .false.
- ADIOS_FOR_ARRAYS_SOLVER = .false.
- ADIOS_FOR_SOLVER_MESHFILES = .false.
- ADIOS_FOR_AVS_DX = .false.
- ! opens file Par_file
- call open_parameter_file()
- call read_value_logical(ADIOS_ENABLED, 'solver.ADIOS_ENABLED')
- if (ADIOS_ENABLED) then
- call read_value_logical(ADIOS_FOR_FORWARD_ARRAYS, &
- 'solver.ADIOS_FOR_FORWARD_ARRAYS')
- call read_value_logical(ADIOS_FOR_MPI_ARRAYS, &
- 'solver.ADIOS_FOR_MPI_ARRAYS')
- call read_value_logical(ADIOS_FOR_ARRAYS_SOLVER, &
- 'solver.ADIOS_FOR_ARRAYS_SOLVER')
- call read_value_logical(ADIOS_FOR_SOLVER_MESHFILES, &
- 'solver.ADIOS_FOR_ARRAYS_SOLVER')
- call read_value_logical(ADIOS_FOR_AVS_DX, &
- 'solver.ADIOS_FOR_AVS_DX')
- endif
- call close_parameter_file()
-
- end subroutine read_adios_parameters
-
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/save_header_file.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/save_header_file.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/save_header_file.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -27,7 +27,7 @@
! save header file OUTPUT_FILES/values_from_mesher.h
- subroutine save_header_file(NSPEC,nglob,NEX_XI,NEX_ETA,NPROC,NPROCTOT, &
+ subroutine save_header_file(NSPEC,NGLOB,NEX_XI,NEX_ETA,NPROC,NPROCTOT, &
TRANSVERSE_ISOTROPY,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
ELLIPTICITY,GRAVITY,ROTATION, &
OCEANS,ATTENUATION,ATTENUATION_NEW,ATTENUATION_3D, &
@@ -39,7 +39,7 @@
NSPEC2DMAX_YMIN_YMAX,NSPEC2DMAX_XMIN_XMAX, &
NPROC_XI,NPROC_ETA, &
NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
@@ -56,7 +56,7 @@
include "constants.h"
- integer, dimension(MAX_NUM_REGIONS) :: NSPEC, nglob
+ integer, dimension(MAX_NUM_REGIONS) :: NSPEC,NGLOB
integer NEX_XI,NEX_ETA,NPROC,NPROCTOT,NCHUNKS,NSOURCES,NSTEP
@@ -74,7 +74,7 @@
integer :: NPROC_XI,NPROC_ETA
integer :: NSPECMAX_ANISO_IC,NSPECMAX_ISO_MANTLE,NSPECMAX_TISO_MANTLE, &
- NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPECMAX_ANISO_MANTLE,NSPEC_CRUST_MANTLE_ATTENUATION, &
NSPEC_INNER_CORE_ATTENUATION, &
NSPEC_CRUST_MANTLE_STR_OR_ATT,NSPEC_INNER_CORE_STR_OR_ATT, &
NSPEC_CRUST_MANTLE_STR_AND_ATT,NSPEC_INNER_CORE_STR_AND_ATT, &
@@ -101,7 +101,7 @@
double precision rotation_matrix(3,3)
double precision vector_ori(3),vector_rotated(3)
double precision r_corner,theta_corner,phi_corner,lat,long,colat_corner
- integer :: att1,att2,att3,att4,att5
+ integer :: ATT1,ATT2,ATT3,ATT4,ATT5
integer :: ier
character(len=150) HEADER_FILE
@@ -136,15 +136,15 @@
write(IOUT,*) '!'
write(IOUT,*) '! number of processors = ',NPROCTOT ! should be = NPROC
write(IOUT,*) '!'
- write(IOUT,*) '! maximum number of points per region = ',nglob(IREGION_CRUST_MANTLE)
+ write(IOUT,*) '! maximum number of points per region = ',NGLOB(IREGION_CRUST_MANTLE)
write(IOUT,*) '!'
! use fused loops on NEC SX
write(IOUT,*) '! on NEC SX, make sure "loopcnt=" parameter'
- write(IOUT,*) '! in Makefile is greater than max vector length = ',nglob(IREGION_CRUST_MANTLE)*NDIM
+ write(IOUT,*) '! in Makefile is greater than max vector length = ',NGLOB(IREGION_CRUST_MANTLE)*NDIM
write(IOUT,*) '!'
write(IOUT,*) '! total elements per slice = ',sum(NSPEC)
- write(IOUT,*) '! total points per slice = ',sum(nglob)
+ write(IOUT,*) '! total points per slice = ',sum(NGLOB)
write(IOUT,*) '!'
write(IOUT,'(1x,a,i1,a)') '! total for full ',NCHUNKS,'-chunk mesh:'
@@ -153,11 +153,11 @@
write(IOUT,*) '! exact total number of spectral elements in entire mesh = '
write(IOUT,*) '! ',dble(NCHUNKS)*dble(NPROC)*dble(sum(NSPEC)) - subtract_central_cube_elems
write(IOUT,*) '! approximate total number of points in entire mesh = '
- write(IOUT,*) '! ',dble(NCHUNKS)*dble(NPROC)*dble(sum(nglob)) - subtract_central_cube_points
+ write(IOUT,*) '! ',dble(NCHUNKS)*dble(NPROC)*dble(sum(NGLOB)) - subtract_central_cube_points
! there are 3 DOFs in solid regions, but only 1 in fluid outer core
write(IOUT,*) '! approximate total number of degrees of freedom in entire mesh = '
- write(IOUT,*) '! ',dble(NCHUNKS)*dble(NPROC)*(3.d0*(dble(sum(nglob))) &
- - 2.d0*dble(nglob(IREGION_OUTER_CORE))) &
+ write(IOUT,*) '! ',dble(NCHUNKS)*dble(NPROC)*(3.d0*(dble(sum(NGLOB))) &
+ - 2.d0*dble(NGLOB(IREGION_OUTER_CORE))) &
- 3.d0*subtract_central_cube_points
write(IOUT,*) '!'
@@ -302,9 +302,9 @@
write(IOUT,*) 'integer, parameter :: NSPEC_OUTER_CORE = ',NSPEC(IREGION_OUTER_CORE)
write(IOUT,*) 'integer, parameter :: NSPEC_INNER_CORE = ',NSPEC(IREGION_INNER_CORE)
write(IOUT,*)
- write(IOUT,*) 'integer, parameter :: NGLOB_CRUST_MANTLE = ',nglob(IREGION_CRUST_MANTLE)
- write(IOUT,*) 'integer, parameter :: NGLOB_OUTER_CORE = ',nglob(IREGION_OUTER_CORE)
- write(IOUT,*) 'integer, parameter :: NGLOB_INNER_CORE = ',nglob(IREGION_INNER_CORE)
+ write(IOUT,*) 'integer, parameter :: NGLOB_CRUST_MANTLE = ',NGLOB(IREGION_CRUST_MANTLE)
+ write(IOUT,*) 'integer, parameter :: NGLOB_OUTER_CORE = ',NGLOB(IREGION_OUTER_CORE)
+ write(IOUT,*) 'integer, parameter :: NGLOB_INNER_CORE = ',NGLOB(IREGION_INNER_CORE)
write(IOUT,*)
write(IOUT,*) 'integer, parameter :: NSPECMAX_ANISO_IC = ',NSPECMAX_ANISO_IC
@@ -315,7 +315,7 @@
write(IOUT,*) 'integer, parameter :: NSPECMAX_ANISO_MANTLE = ',NSPECMAX_ANISO_MANTLE
write(IOUT,*)
- write(IOUT,*) 'integer, parameter :: NSPEC_CRUST_MANTLE_ATTENUAT = ',NSPEC_CRUST_MANTLE_ATTENUAT
+ write(IOUT,*) 'integer, parameter :: NSPEC_CRUST_MANTLE_ATTENUATION = ',NSPEC_CRUST_MANTLE_ATTENUATION
write(IOUT,*) 'integer, parameter :: NSPEC_INNER_CORE_ATTENUATION = ',NSPEC_INNER_CORE_ATTENUATION
write(IOUT,*)
@@ -524,9 +524,9 @@
! attenuation and/or adjoint simulations
if (ATTENUATION .or. SIMULATION_TYPE /= 1 .or. SAVE_FORWARD &
.or. (MOVIE_VOLUME .and. SIMULATION_TYPE /= 3)) then
- write(IOUT,*) 'logical, parameter :: COMPUTE_AND_STORE_STRAIN = .true. '
+ write(IOUT,*) 'logical, parameter :: COMPUTE_AND_STORE_STRAIN_VAL = .true.'
else
- write(IOUT,*) 'logical, parameter :: COMPUTE_AND_STORE_STRAIN = .false.'
+ write(IOUT,*) 'logical, parameter :: COMPUTE_AND_STORE_STRAIN_VAL = .false.'
endif
write(IOUT,*)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/check_simulation_stability.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/check_simulation_stability.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/check_simulation_stability.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -149,7 +149,7 @@
call max_all_cr(b_Ufluidnorm,b_Ufluidnorm_all)
endif
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
if( .not. GPU_MODE) then
! on CPU
Strain_norm = maxval(abs(eps_trace_over_3_crust_mantle))
@@ -183,7 +183,7 @@
write(IMAIN,*) 'Max non-dimensional potential Ufluid in fluid in all slices for back prop.= ',b_Ufluidnorm_all
endif
- if(COMPUTE_AND_STORE_STRAIN) then
+ if(COMPUTE_AND_STORE_STRAIN_VAL) then
write(IMAIN,*) 'Max of strain, eps_trace_over_3_crust_mantle =',Strain_norm_all
write(IMAIN,*) 'Max of strain, epsilondev_crust_mantle =',Strain2_norm_all
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_element.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -78,7 +78,7 @@
! memory variables for attenuation
! memory variables R_ij are stored at the local rather than global level
! to allow for optimization of cache access by compiler
- real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_xx,R_yy,R_xy,R_xz,R_yz
+ real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: R_xx,R_yy,R_xy,R_xz,R_yz
real(kind=CUSTOM_REAL),dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE) :: epsilon_trace_over_3
@@ -172,7 +172,7 @@
duzdxl_plus_duxdzl = duzdxl + duxdzl
duzdyl_plus_duydzl = duzdyl + duydzl
- if ( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN ) then
+ if ( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL ) then
! temporary variables used for fixing attenuation in a consistent way
duxdxl_att = xixl*tempx1_att(i,j,k) + etaxl*tempx2_att(i,j,k) + gammaxl*tempx3_att(i,j,k)
duxdyl_att = xiyl*tempx1_att(i,j,k) + etayl*tempx2_att(i,j,k) + gammayl*tempx3_att(i,j,k)
@@ -206,7 +206,7 @@
epsilondev_loc(5,i,j,k) = 0.5_CUSTOM_REAL * duzdyl_plus_duydzl_att
else
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
templ = ONE_THIRD * (duxdxl + duydyl + duzdzl)
if(NSPEC_CRUST_MANTLE_STRAIN_ONLY == 1) then
ispec_strain = 1
@@ -465,7 +465,7 @@
! memory variables for attenuation
! memory variables R_ij are stored at the local rather than global level
! to allow for optimization of cache access by compiler
- real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_xx,R_yy,R_xy,R_xz,R_yz
+ real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: R_xx,R_yy,R_xy,R_xz,R_yz
real(kind=CUSTOM_REAL),dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE) :: epsilon_trace_over_3
@@ -576,7 +576,7 @@
duzdxl_plus_duxdzl = duzdxl + duxdzl
duzdyl_plus_duydzl = duzdyl + duydzl
- if ( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN ) then
+ if ( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL ) then
! temporary variables used for fixing attenuation in a consistent way
duxdxl_att = xixl*tempx1_att(i,j,k) + etaxl*tempx2_att(i,j,k) + gammaxl*tempx3_att(i,j,k)
duxdyl_att = xiyl*tempx1_att(i,j,k) + etayl*tempx2_att(i,j,k) + gammayl*tempx3_att(i,j,k)
@@ -610,7 +610,7 @@
epsilondev_loc(5,i,j,k) = 0.5_CUSTOM_REAL * duzdyl_plus_duydzl_att
else
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
templ = ONE_THIRD * (duxdxl + duydyl + duzdzl)
if(NSPEC_CRUST_MANTLE_STRAIN_ONLY == 1) then
ispec_strain = 1
@@ -1064,7 +1064,7 @@
! memory variables for attenuation
! memory variables R_ij are stored at the local rather than global level
! to allow for optimization of cache access by compiler
- real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_xx,R_yy,R_xy,R_xz,R_yz
+ real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: R_xx,R_yy,R_xy,R_xz,R_yz
real(kind=CUSTOM_REAL),dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE) :: epsilon_trace_over_3
@@ -1164,7 +1164,7 @@
duzdxl_plus_duxdzl = duzdxl + duxdzl
duzdyl_plus_duydzl = duzdyl + duydzl
- if ( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN ) then
+ if ( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL ) then
! temporary variables used for fixing attenuation in a consistent way
duxdxl_att = xixl*tempx1_att(i,j,k) + etaxl*tempx2_att(i,j,k) + gammaxl*tempx3_att(i,j,k)
duxdyl_att = xiyl*tempx1_att(i,j,k) + etayl*tempx2_att(i,j,k) + gammayl*tempx3_att(i,j,k)
@@ -1198,7 +1198,7 @@
epsilondev_loc(5,i,j,k) = 0.5_CUSTOM_REAL * duzdyl_plus_duydzl_att
else
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
templ = ONE_THIRD * (duxdxl + duydyl + duzdzl)
if(NSPEC_CRUST_MANTLE_STRAIN_ONLY == 1) then
ispec_strain = 1
@@ -1525,7 +1525,7 @@
! memory variables for attenuation
! memory variables R_ij are stored at the local rather than global level
! to allow for optimization of cache access by compiler
- real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_xx,R_yy,R_xy,R_xz,R_yz
+ real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: R_xx,R_yy,R_xy,R_xz,R_yz
! variable sized array variables
integer :: vx,vy,vz,vnspec
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -227,7 +227,7 @@
tempz3l = tempz3l + displ_crust_mantle(3,iglob)*hp3
enddo
- if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN ) then
+ if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL ) then
! temporary variables used for fixing attenuation in a consistent way
tempx1l_att = tempx1l
@@ -310,7 +310,7 @@
duzdxl_plus_duxdzl = duzdxl + duxdzl
duzdyl_plus_duydzl = duzdyl + duydzl
- if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN ) then
+ if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL ) then
! temporary variables used for fixing attenuation in a consistent way
duxdxl_att = xixl*tempx1l_att + etaxl*tempx2l_att + gammaxl*tempx3l_att
duxdyl_att = xiyl*tempx1l_att + etayl*tempx2l_att + gammayl*tempx3l_att
@@ -343,7 +343,7 @@
epsilondev_loc(5,i,j,k) = 0.5 * duzdyl_plus_duydzl_att
else
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
if(NSPEC_CRUST_MANTLE_STRAIN_ONLY == 1) then
ispec_strain = 1
else
@@ -938,7 +938,7 @@
endif
! save deviatoric strain for Runge-Kutta scheme
- if(COMPUTE_AND_STORE_STRAIN) then
+ if(COMPUTE_AND_STORE_STRAIN_VAL) then
!epsilondev(:,:,:,:,ispec) = epsilondev_loc(:,:,:,:)
do k=1,NGLLZ
do j=1,NGLLY
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_Dev.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -215,7 +215,7 @@
enddo
enddo
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN) then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL) then
if(ATTENUATION_NEW_VAL) then
! takes new routines
@@ -318,7 +318,7 @@
enddo
enddo
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN) then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL) then
! temporary variables used for fixing attenuation in a consistent way
do j=1,m2
do i=1,m1
@@ -589,7 +589,7 @@
endif
! save deviatoric strain for Runge-Kutta scheme
- if(COMPUTE_AND_STORE_STRAIN) then
+ if(COMPUTE_AND_STORE_STRAIN_VAL) then
epsilondev_xx(:,:,:,ispec) = epsilondev_loc(1,:,:,:)
epsilondev_yy(:,:,:,ispec) = epsilondev_loc(2,:,:,:)
epsilondev_xy(:,:,:,ispec) = epsilondev_loc(3,:,:,:)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_crust_mantle_noDev.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -103,7 +103,7 @@
! for attenuation
real(kind=CUSTOM_REAL) R_xx_val,R_yy_val
- real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_memory
+ real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: R_memory
logical :: PARTIAL_PHYS_DISPERSION_ONLY
! [alpha,beta,gamma]val reduced to N_SLS and factor_common to N_SLS*NUM_NODES
@@ -258,7 +258,7 @@
!for LDDRK
integer :: istage
- real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_memory_lddrk
+ real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: R_memory_lddrk
real(kind=CUSTOM_REAL),dimension(N_SLS) :: tau_sigma_CUSTOM_REAL
! ****************************************************
@@ -381,7 +381,7 @@
duzdyl_plus_duydzl = duzdyl + duydzl
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
if(NSPEC_CRUST_MANTLE_STRAIN_ONLY == 1) then
ispec_strain = 1
else
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_elastic.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -113,7 +113,7 @@
! uses Deville (2002) optimizations
! crust/mantle region
call compute_forces_crust_mantle_Dev( NSPEC_CRUST_MANTLE_STR_OR_ATT,NGLOB_CRUST_MANTLE, &
- NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPEC_CRUST_MANTLE_ATTENUATION, &
deltat, &
displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle, &
phase_is_inner, &
@@ -144,7 +144,7 @@
! no Deville optimization
! crust/mantle region
call compute_forces_crust_mantle( NSPEC_CRUST_MANTLE_STR_OR_ATT,NGLOB_CRUST_MANTLE, &
- NSPEC_CRUST_MANTLE_ATTENUAT, &
+ NSPEC_CRUST_MANTLE_ATTENUATION, &
deltat, &
displ_crust_mantle,veloc_crust_mantle,accel_crust_mantle, &
phase_is_inner, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -211,7 +211,7 @@
tempz3l = tempz3l + displ_inner_core(3,iglob)*hp3
enddo
- if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN ) then
+ if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL ) then
! temporary variables used for fixing attenuation in a consistent way
tempx1l_att = tempx1l
@@ -294,7 +294,7 @@
duzdxl_plus_duxdzl = duzdxl + duxdzl
duzdyl_plus_duydzl = duzdyl + duydzl
- if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN ) then
+ if( ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL ) then
! temporary variables used for fixing attenuation in a consistent way
duxdxl_att = xixl*tempx1l_att + etaxl*tempx2l_att + gammaxl*tempx3l_att
duxdyl_att = xiyl*tempx1l_att + etayl*tempx2l_att + gammayl*tempx3l_att
@@ -327,7 +327,7 @@
epsilondev_loc(5,i,j,k) = 0.5 * duzdyl_plus_duydzl_att
else
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
if(NSPEC_INNER_CORE_STRAIN_ONLY == 1) then
ispec_strain = 1
else
@@ -688,7 +688,7 @@
endif
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
! save deviatoric strain for Runge-Kutta scheme
!epsilondev(:,:,:,:,ispec) = epsilondev_loc(:,:,:,:)
do k=1,NGLLZ
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_Dev.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -234,7 +234,7 @@
enddo
enddo
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN) then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL) then
if(ATTENUATION_NEW_VAL) then
! takes new routines
! use first order Taylor expansion of displacement for local storage of stresses
@@ -286,7 +286,7 @@
enddo
enddo
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN) then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL) then
! temporary variables used for fixing attenuation in a consistent way
do j=1,m2
do i=1,m1
@@ -343,7 +343,7 @@
enddo
enddo
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN) then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL) then
! temporary variables used for fixing attenuation in a consistent way
do j=1,m1
do i=1,m1
@@ -400,7 +400,7 @@
enddo
enddo
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN) then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL) then
! temporary variables used for fixing attenuation in a consistent way
do j=1,m1
do i=1,m2
@@ -472,7 +472,7 @@
duzdxl_plus_duxdzl = duzdxl + duxdzl
duzdyl_plus_duydzl = duzdyl + duydzl
- if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN) then
+ if(ATTENUATION_VAL .and. COMPUTE_AND_STORE_STRAIN_VAL) then
! temporary variables used for fixing attenuation in a consistent way
duxdxl_att = xixl*tempx1_att(i,j,k) + etaxl*tempx2_att(i,j,k) + gammaxl*tempx3_att(i,j,k)
duxdyl_att = xiyl*tempx1_att(i,j,k) + etayl*tempx2_att(i,j,k) + gammayl*tempx3_att(i,j,k)
@@ -506,7 +506,7 @@
epsilondev_loc(5,i,j,k) = 0.5 * duzdyl_plus_duydzl_att
else
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
if(NSPEC_INNER_CORE_STRAIN_ONLY == 1) then
ispec_strain = 1
else
@@ -873,7 +873,7 @@
endif
! save deviatoric strain for Runge-Kutta scheme
- if(COMPUTE_AND_STORE_STRAIN) then
+ if(COMPUTE_AND_STORE_STRAIN_VAL) then
epsilondev_xx(:,:,:,ispec) = epsilondev_loc(1,:,:,:)
epsilondev_yy(:,:,:,ispec) = epsilondev_loc(2,:,:,:)
epsilondev_xy(:,:,:,ispec) = epsilondev_loc(3,:,:,:)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/compute_forces_inner_core_noDev.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -213,7 +213,7 @@
!for LDDRK
integer :: istage
- real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: R_memory_lddrk
+ real(kind=CUSTOM_REAL), dimension(5,N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: R_memory_lddrk
real(kind=CUSTOM_REAL),dimension(N_SLS) :: tau_sigma_CUSTOM_REAL
! ****************************************************
@@ -339,7 +339,7 @@
duzdyl_plus_duydzl = duzdyl + duydzl
! compute deviatoric strain
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
if(NSPEC_INNER_CORE_STRAIN_ONLY == 1) then
ispec_strain = 1
else
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/initialize_simulation.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/initialize_simulation.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -476,8 +476,8 @@
! checks attenuation
if( ATTENUATION_VAL ) then
- if (NSPEC_CRUST_MANTLE_ATTENUAT /= NSPEC_CRUST_MANTLE) &
- call exit_MPI(myrank, 'NSPEC_CRUST_MANTLE_ATTENUAT /= NSPEC_CRUST_MANTLE, exit')
+ if (NSPEC_CRUST_MANTLE_ATTENUATION /= NSPEC_CRUST_MANTLE) &
+ call exit_MPI(myrank, 'NSPEC_CRUST_MANTLE_ATTENUATION /= NSPEC_CRUST_MANTLE, exit')
if (NSPEC_INNER_CORE_ATTENUATION /= NSPEC_INNER_CORE) &
call exit_MPI(myrank, 'NSPEC_INNER_CORE_ATTENUATION /= NSPEC_INNER_CORE, exit')
endif
@@ -485,11 +485,11 @@
! checks strain storage
if (ATTENUATION_VAL .or. SIMULATION_TYPE /= 1 .or. SAVE_FORWARD &
.or. (MOVIE_VOLUME .and. SIMULATION_TYPE /= 3)) then
- if( COMPUTE_AND_STORE_STRAIN .neqv. .true. ) &
- call exit_MPI(myrank, 'error in compiled compute_and_store_strain parameter, please recompile solver 19')
+ if( COMPUTE_AND_STORE_STRAIN_VAL .neqv. .true. ) &
+ call exit_MPI(myrank, 'error in compiled COMPUTE_AND_STORE_STRAIN_VAL parameter, please recompile solver 19')
else
- if( COMPUTE_AND_STORE_STRAIN .neqv. .false. ) &
- call exit_MPI(myrank, 'error in compiled compute_and_store_strain parameter, please recompile solver 20')
+ if( COMPUTE_AND_STORE_STRAIN_VAL .neqv. .false. ) &
+ call exit_MPI(myrank, 'error in compiled COMPUTE_AND_STORE_STRAIN_VAL parameter, please recompile solver 20')
endif
if (SIMULATION_TYPE == 3 .and. (ANISOTROPIC_3D_MANTLE_VAL .or. ANISOTROPIC_INNER_CORE_VAL)) &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/prepare_timerun.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -1062,7 +1062,7 @@
endif
- if (COMPUTE_AND_STORE_STRAIN) then
+ if (COMPUTE_AND_STORE_STRAIN_VAL) then
if(MOVIE_VOLUME .and. (MOVIE_VOLUME_TYPE == 2 .or. MOVIE_VOLUME_TYPE == 3)) then
Iepsilondev_xx_crust_mantle(:,:,:,:) = 0._CUSTOM_REAL
Iepsilondev_yy_crust_mantle(:,:,:,:) = 0._CUSTOM_REAL
@@ -1491,7 +1491,7 @@
ROTATION_VAL, &
ATTENUATION_VAL,ATTENUATION_NEW_VAL, &
USE_ATTENUATION_MIMIC,USE_3D_ATTENUATION_ARRAYS, &
- COMPUTE_AND_STORE_STRAIN, &
+ COMPUTE_AND_STORE_STRAIN_VAL, &
ANISOTROPIC_3D_MANTLE_VAL,ANISOTROPIC_INNER_CORE_VAL, &
SAVE_BOUNDARY_MESH, &
USE_MESH_COLORING_GPU, &
@@ -1587,7 +1587,7 @@
! prepares attenuation arrays
- if( COMPUTE_AND_STORE_STRAIN ) then
+ if( COMPUTE_AND_STORE_STRAIN_VAL ) then
if(myrank == 0 ) write(IMAIN,*) " loading strain"
call prepare_fields_strain_device(Mesh_pointer, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_forward_arrays_adios.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_forward_arrays_adios.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/read_forward_arrays_adios.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -180,7 +180,7 @@
call adios_perform_reads(adios_handle, adios_err)
call check_adios_err(myrank,adios_err)
- local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUAT
+ local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUATION
start(1) = local_dim*myrank; count(1) = local_dim
call adios_selection_boundingbox (sel , 1, start, count)
call adios_schedule_read(adios_handle, sel, "R_xx_crust_mantle/array", 0, 1, &
@@ -385,7 +385,7 @@
endif
if (ATTENUATION_VAL) then
- local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUAT
+ local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUATION
start(1) = local_dim*myrank; count(1) = local_dim
call adios_selection_boundingbox (sel , 1, start, count)
call adios_schedule_read(adios_handle, sel, "R_xx_crust_mantle/array", 0, 1, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/save_forward_arrays_adios.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/save_forward_arrays_adios.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/save_forward_arrays_adios.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -284,7 +284,7 @@
integer :: local_dim
- local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUAT
+ local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUATION
call define_adios_global_real_1d_array(adios_group, &
"R_xx_crust_mantle", local_dim, group_size_inc)
call define_adios_global_real_1d_array(adios_group, &
@@ -500,7 +500,7 @@
integer :: local_dim, adios_err
- local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUAT
+ local_dim = N_SLS*NGLLX*NGLLY*NGLLZ*NSPEC_CRUST_MANTLE_ATTENUATION
call adios_set_path (adios_handle, "R_xx_crust_mantle", adios_err)
call check_adios_err(myrank,adios_err)
call write_1D_global_array_adios_dims(adios_handle, local_dim, sizeprocs)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/specfem3D_par.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/specfem3D_par.F90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/specfem3D/specfem3D_par.F90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -393,7 +393,7 @@
one_minus_sum_beta_crust_mantle, factor_scale_crust_mantle
real(kind=CUSTOM_REAL), dimension(N_SLS,ATT1,ATT2,ATT3,ATT4) :: &
factor_common_crust_mantle
- real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUAT) :: &
+ real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_ATTENUATION) :: &
R_xx_crust_mantle,R_yy_crust_mantle,R_xy_crust_mantle,R_xz_crust_mantle,R_yz_crust_mantle
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_CRUST_MANTLE_STR_OR_ATT) :: &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/broadcast_computed_parameters.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -67,7 +67,6 @@
implicit none
-! standard include of the MPI library
include "constants.h"
include "precision.h"
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -96,17 +96,17 @@
! count anisotropic elements
do ilayer = 1, NUMBER_OF_MESH_LAYERS
- if(doubling_index(ilayer) == IFLAG_220_80 .or. doubling_index(ilayer) == IFLAG_80_MOHO) then
- ner_without_doubling = ner(ilayer)
- if(this_region_has_a_doubling(ilayer)) then
- ner_without_doubling = ner_without_doubling - 2
- ispec_aniso = ispec_aniso + &
- (NSPEC_DOUBLING_SUPERBRICK*(NEX_PER_PROC_XI/ratio_sampling_array(ilayer)/2)* &
- (NEX_PER_PROC_ETA/ratio_sampling_array(ilayer)/2))
- endif
- ispec_aniso = ispec_aniso + &
- ((NEX_PER_PROC_XI/ratio_sampling_array(ilayer))*(NEX_PER_PROC_ETA/ratio_sampling_array(ilayer))*ner_without_doubling)
+ if(doubling_index(ilayer) == IFLAG_220_80 .or. doubling_index(ilayer) == IFLAG_80_MOHO) then
+ ner_without_doubling = ner(ilayer)
+ if(this_region_has_a_doubling(ilayer)) then
+ ner_without_doubling = ner_without_doubling - 2
+ ispec_aniso = ispec_aniso + &
+ (NSPEC_DOUBLING_SUPERBRICK*(NEX_PER_PROC_XI/ratio_sampling_array(ilayer)/2)* &
+ (NEX_PER_PROC_ETA/ratio_sampling_array(ilayer)/2))
endif
+ ispec_aniso = ispec_aniso + &
+ ((NEX_PER_PROC_XI/ratio_sampling_array(ilayer))*(NEX_PER_PROC_ETA/ratio_sampling_array(ilayer))*ner_without_doubling)
+ endif
enddo
! define static size of the arrays whose size depends on logical tests
@@ -393,7 +393,7 @@
static_memory_size = static_memory_size + &
2.d0*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_OUTER_CORE_ADJOINT*dble(CUSTOM_REAL)
-! b_R_memory_inner_core
+ ! b_R_memory_inner_core
!! ZN ZN this has now been suppressed to save as much memory as possible to undo attenuation
!!! b_epsilondev_inner_core
!!! b_eps_trace_over_3_inner_core
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -906,12 +906,10 @@
end subroutine rcp_check_parameters
-
!
!-------------------------------------------------------------------------------------------------
!
-
subroutine rcp_define_all_layers(NER_CRUST,NER_80_MOHO,NER_220_80,&
NER_400_220,NER_600_400,NER_670_600,NER_771_670, &
NER_TOPDDOUBLEPRIME_771,NER_CMB_TOPDDOUBLEPRIME,NER_OUTER_CORE, &
@@ -960,8 +958,6 @@
integer, dimension(MAX_NUMBER_OF_MESH_LAYERS) :: doubling_index
double precision, dimension(MAX_NUMBER_OF_MESH_LAYERS) :: rmins,rmaxs
-
-
! find element below top of which we should implement the second doubling in the mantle
! locate element closest to optimal value
distance_min = HUGEVAL
@@ -2240,8 +2236,6 @@
integer :: last_doubling_layer, cut_doubling, nglob_int_surf_xi, nglob_int_surf_eta,nglob_ext_surf,&
normal_doubling, nglob_center_edge, nglob_corner_edge, nglob_border_edge
-
-
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!
!!!!!! 1D case
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90 2013-07-24 15:33:12 UTC (rev 22662)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90 2013-07-24 16:01:33 UTC (rev 22663)
@@ -267,4 +267,3 @@
call close_parameter_file()
end subroutine read_parameter_file
-
More information about the CIG-COMMITS
mailing list