[cig-commits] r22668 - in seismo/3D/SPECFEM3D_GLOBE: branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared trunk/src/shared
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Wed Jul 24 14:52:17 PDT 2013
Author: dkomati1
Date: 2013-07-24 14:52:17 -0700 (Wed, 24 Jul 2013)
New Revision: 22668
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/auto_ner.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/memory_eval.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_compute_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/save_header_file.F90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/auto_ner.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/model_topo_bathy.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.F90
Log:
done with easy merges in src/shared
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/auto_ner.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/auto_ner.f90 2013-07-24 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/auto_ner.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -76,7 +76,7 @@
MIN_GLL_POINT_SPACING_5 = 0.1730d0
! element at inner core
- elem_size = RADIAL_LEN_RATIO_CENTRAL_CUBE * ((WIDTH * DEGREES_TO_RADIANS ) * RADIUS_INNER_CORE) / &
+ elem_size = RADIAL_LEN_RATIO_CENTRAL_CUBE * ((WIDTH * DEGREES_TO_RADIANS) * RADIUS_INNER_CORE) / &
( dble(NEX_MAX) / DOUBLING_INNER_CORE )
! minimum grid point spacing
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 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/memory_eval.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -310,12 +310,10 @@
static_memory_size = static_memory_size + &
dble(NDIM)*dble(NGLLX)*dble(NGLLY)*NSPEC2D_TOP(IREGION_CRUST_MANTLE)*dble(CUSTOM_REAL)
-
! rho_vp_crust_mantle,rho_vs_crust_mantle
static_memory_size = static_memory_size + &
2.d0*dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_CRUST_MANTLE_STACEY*dble(CUSTOM_REAL)
-
! inner core
! ibool_inner_core
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_compute_parameters.f90 2013-07-24 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/read_compute_parameters.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -60,7 +60,6 @@
WRITE_SEISMOGRAMS_BY_MASTER,SAVE_ALL_SEISMOS_IN_ONE_FILE,&
USE_BINARY_FOR_LARGE_FILE,EMULATE_ONLY,NOISE_TOMOGRAPHY)
-
implicit none
include "constants.h"
@@ -148,7 +147,6 @@
integer :: tmp_sum_nglob2D_xi, tmp_sum_nglob2D_eta,divider,nglob_edges_h,nglob_edge_v,to_remove
-
! reads in Par_file values
call read_parameter_file(OUTPUT_FILES, &
LOCAL_PATH,LOCAL_TMP_PATH,MODEL, &
@@ -297,7 +295,6 @@
! total number of processors in the full Earth composed of the six chunks
NPROCTOT = NCHUNKS * NPROC
-
! definition of general mesh parameters
call define_all_layers(NER_CRUST,NER_80_MOHO,NER_220_80,&
NER_400_220,NER_600_400,NER_670_600,NER_771_670, &
@@ -314,7 +311,6 @@
DEPTH_FOURTH_DOUBLING_REAL,distance,distance_min,zval,&
doubling_index,rmins,rmaxs)
-
! calculates number of elements (NSPEC)
call count_elements(NEX_XI,NEX_ETA,NEX_PER_PROC_XI,NPROC,&
NEX_PER_PROC_ETA,ratio_divide_central_cube,&
@@ -333,7 +329,6 @@
tmp_sum_nglob2D_xi, tmp_sum_nglob2D_eta,divider,nglob_edges_h,&
nglob_edge_v,to_remove)
-
! calculates number of points (NGLOB)
call count_points(NEX_PER_PROC_XI,NEX_PER_PROC_ETA,ratio_divide_central_cube,&
NSPEC1D_RADIAL,NGLOB1D_RADIAL, &
@@ -369,10 +364,9 @@
double precision ANGULAR_WIDTH_XI_IN_DEGREES,ANGULAR_WIDTH_ETA_IN_DEGREES
- logical ATTENUATION,ATTENUATION_NEW,ABSORBING_CONDITIONS,&
- INCLUDE_CENTRAL_CUBE,OUTPUT_SEISMOS_SAC_ALPHANUM
+ logical ATTENUATION,ATTENUATION_NEW,ABSORBING_CONDITIONS, &
+ INCLUDE_CENTRAL_CUBE,OUTPUT_SEISMOS_SAC_ALPHANUM
-
! checks parameters
if(NCHUNKS /= 1 .and. NCHUNKS /= 2 .and. NCHUNKS /= 3 .and. NCHUNKS /= 6) &
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 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/shared/save_header_file.F90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -493,7 +493,7 @@
write(IOUT,*) 'integer, parameter :: NSPEC2D_ICB = ',NSPEC2D_ICB
write(IOUT,*)
- ! deville routines only implemented for NGLLX = NGLLY = NGLLZ = 5
+ ! Deville routines only implemented for NGLLX = NGLLY = NGLLZ = 5
if( NGLLX == 5 .and. NGLLY == 5 .and. NGLLZ == 5 ) then
write(IOUT,*) 'logical, parameter :: USE_DEVILLE_PRODUCTS_VAL = .true.'
else
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/auto_ner.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/auto_ner.f90 2013-07-24 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/auto_ner.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -74,7 +74,7 @@
P_VELOCITY_MAX = 11.02827d0
MIN_GLL_POINT_SPACING_5 = 0.1730d0
- DT = ( RADIAL_LEN_RATIO_CENTRAL_CUBE * ((WIDTH * (PI / 180.0d0)) * RADIUS_INNER_CORE) / &
+ DT = ( RADIAL_LEN_RATIO_CENTRAL_CUBE * ((WIDTH * DEGREES_TO_RADIANS) * RADIUS_INNER_CORE) / &
( dble(NEX_MAX) / DOUBLING_INNER_CORE ) / P_VELOCITY_MAX) * &
MIN_GLL_POINT_SPACING_5 * MAXIMUM_STABILITY_CONDITION
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-24 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/memory_eval.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -397,7 +397,7 @@
!! 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
-! rho_kl_inner_core,beta_kl_inner_core, alpha_kl_inner_core
+ ! rho_kl_inner_core,beta_kl_inner_core, alpha_kl_inner_core
! static_memory_size = static_memory_size + (5.d0*dble(N_SLS) + 9.d0)* &
static_memory_size = static_memory_size + (5.d0*dble(N_SLS) + 3.d0)* &
dble(NGLLX)*dble(NGLLY)*dble(NGLLZ)*NSPEC_INNER_CORE_ADJOINT*dble(CUSTOM_REAL)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/model_topo_bathy.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/model_topo_bathy.f90 2013-07-24 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/model_topo_bathy.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -51,8 +51,15 @@
! local parameters
integer :: ier
- if(myrank == 0) call read_topo_bathy_file(ibathy_topo)
+ if(myrank == 0) then
+ ! user output
+ write(IMAIN,*)
+ write(IMAIN,*) 'incorporating topography'
+ ! read/save topo file on master
+ call read_topo_bathy_file(ibathy_topo)
+ endif
+
! broadcast the information read on the master to the nodes
call MPI_BCAST(ibathy_topo,NX_BATHY*NY_BATHY,MPI_INTEGER,0,MPI_COMM_WORLD,ier)
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 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_compute_parameters.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -315,7 +315,6 @@
! total number of processors in the full Earth composed of the six chunks
NPROCTOT = NCHUNKS * NPROC
-
! definition of general mesh parameters
call rcp_define_all_layers(NER_CRUST,NER_80_MOHO,NER_220_80,&
NER_400_220,NER_600_400,NER_670_600,NER_771_670, &
@@ -332,7 +331,6 @@
DEPTH_FOURTH_DOUBLING_REAL,distance,distance_min,zval,&
doubling_index,rmins,rmaxs)
-
! calculates number of elements (NSPEC)
call rcp_count_elements(NEX_XI,NEX_ETA,NEX_PER_PROC_XI,NPROC,&
NEX_PER_PROC_ETA,ratio_divide_central_cube,&
@@ -351,7 +349,6 @@
tmp_sum_nglob2D_xi, tmp_sum_nglob2D_eta,divider,nglob_edges_h,&
nglob_edge_v,to_remove)
-
! calculates number of points (NGLOB)
call rcp_count_points(NEX_PER_PROC_XI,NEX_PER_PROC_ETA,ratio_divide_central_cube,&
NSPEC1D_RADIAL,NGLOB1D_RADIAL, &
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 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/read_parameter_file.f90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -263,7 +263,7 @@
call read_value_logical(ADIOS_FOR_AVS_DX, 'solver.ADIOS_FOR_AVS_DX', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_AVS_DX'
- ! closes parameter file
+ ! close parameter file
call close_parameter_file()
end subroutine read_parameter_file
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.F90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.F90 2013-07-24 21:32:22 UTC (rev 22667)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/shared/save_header_file.F90 2013-07-24 21:52:17 UTC (rev 22668)
@@ -545,7 +545,7 @@
write(IOUT,*) 'integer, parameter :: NSPEC2D_ICB = ',NSPEC2D_ICB
write(IOUT,*)
- ! deville routines only implemented for NGLLX = NGLLY = NGLLZ = 5
+ ! Deville routines only implemented for NGLLX = NGLLY = NGLLZ = 5
if( NGLLX == 5 .and. NGLLY == 5 .and. NGLLZ == 5 ) then
write(IOUT,*) 'logical, parameter :: USE_DEVILLE_PRODUCTS_VAL = .true.'
else
More information about the CIG-COMMITS
mailing list