[cig-commits] r22667 - in seismo/3D/SPECFEM3D_GLOBE: branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D trunk/src/auxiliaries trunk/src/meshfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Wed Jul 24 14:32:22 PDT 2013
Author: dkomati1
Date: 2013-07-24 14:32:22 -0700 (Wed, 24 Jul 2013)
New Revision: 22667
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/compute_element_properties.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_eta.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_xi.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_absorb.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_models.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1066a.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1dref.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_aniso_mantle.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_attenuation.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crust.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crustmaps.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_epcrust.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_eucrust.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s20rts.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s362ani.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s40rts.f90
seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/add_topography.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/compute_element_properties.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_1D_buffers.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_perm_color.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D_models.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_1066a.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_aniso_mantle.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_atten3D_QRFSI12.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_attenuation.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crust.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crustmaps.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_epcrust.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_eucrust.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_jp3d.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_ppm.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s20rts.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s362ani.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s40rts.f90
seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/moho_stretching.f90
Log:
done with easy merges in src/meshfem3D
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/add_topography.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -35,8 +35,6 @@
implicit none
-! include "constants.h"
-
integer :: myrank
double precision,dimension(NGNOD) :: xelm,yelm,zelm
@@ -98,11 +96,6 @@
! than using control nodes
! Hejun Zhu, OCT16, 2009
- ! input parameters: myrank,
- ! xstore,ystore,zstore,
- ! ispec,nspec,
- ! ibathy_topo
-
subroutine add_topography_gll(myrank,xstore,ystore,zstore,ispec,nspec, &
ibathy_topo)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/compute_element_properties.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/compute_element_properties.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/compute_element_properties.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -41,8 +41,6 @@
use meshfem3D_models_par
-! use meshfem3D_par,only: R220
-
implicit none
! correct number of spectral elements in each block depending on chunk type
@@ -195,7 +193,6 @@
call compute_element_GLL_locations(xelm,yelm,zelm,ispec,nspec, &
xstore,ystore,zstore,shape3D)
-
! computes velocity/density/... values for the chosen Earth model
! (only needed for second meshing phase)
if( ipass == 2 ) then
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_eta.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_eta.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_eta.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -215,6 +215,5 @@
if(npoin2D_eta_all(2) > NGLOB2DMAX_YMIN_YMAX .or. npoin2D_eta_all(2) /= npoin2D_eta) &
call exit_MPI(myrank,'incorrect iboolright_eta read')
-
end subroutine get_MPI_cutplanes_eta
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_xi.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_xi.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_MPI_cutplanes_xi.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -92,7 +92,7 @@
if( DEBUG ) then
! global point number and coordinates left MPI cut-plane
open(unit=10,file=prname(1:len_trim(prname))//'iboolleft_xi.txt', &
- status='unknown',iostat=ier)
+ status='unknown',iostat=ier)
if( ier /= 0 ) then
if( myrank == 0 ) then
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_absorb.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_absorb.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/get_absorb.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -144,14 +144,12 @@
open(unit=27,file=prname(1:len_trim(prname))//'stacey.bin', &
status='unknown',form='unformatted',action='write',iostat=ier)
if( ier /= 0 ) call exit_MPI(myrank,'error opening stacey.bin file')
-
write(27) nimin
write(27) nimax
write(27) njmin
write(27) njmax
write(27) nkmin_xi
write(27) nkmin_eta
-
close(27)
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_models.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_models.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/meshfem3D_models.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -164,7 +164,7 @@
! sets up attenuation coefficients according to the chosen, "pure" 1D model
! (including their 1D-crustal profiles)
call model_attenuation_setup(myrank,REFERENCE_1D_MODEL,RICB,RCMB, &
- R670,R220,R80,AM_V,AM_S,AS_V,CRUSTAL)
+ R670,R220,R80,AM_V,AM_S,AS_V,CRUSTAL)
endif
endif
@@ -219,7 +219,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine meshfem3D_models_get1D_val(myrank,iregion_code,idoubling, &
r_prem,rho,vpv,vph,vsv,vsh,eta_aniso, &
Qkappa,Qmu,RICB,RCMB, &
@@ -615,7 +614,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine meshfem3D_models_get3Dcrust_val(iregion_code,xmesh,ymesh,zmesh,r, &
vpv,vph,vsv,vsh,rho,eta_aniso,dvp, &
c11,c12,c13,c14,c15,c16,c22,c23,c24,c25, &
@@ -802,7 +800,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine meshfem3D_models_getatten_val(idoubling,xmesh,ymesh,zmesh,r_prem, &
tau_e,tau_s,T_c_source, &
moho,Qmu,Qkappa,elem_in_crust)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1066a.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1066a.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1066a.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -83,7 +83,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine model_1066a(x,rho,vp,vs,Qkappa,Qmu,iregion_code)
use model_1066a_par
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1dref.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1dref.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_1dref.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -54,7 +54,7 @@
integer, parameter :: NR_REF = 750
! model_1dref_variables
- double precision, dimension(:),allocatable :: &
+ double precision, dimension(:), allocatable :: &
Mref_V_radius_ref,Mref_V_density_ref, &
Mref_V_vpv_ref,Mref_V_vph_ref, &
Mref_V_vsv_ref,Mref_V_vsh_ref, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_aniso_mantle.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_aniso_mantle.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_aniso_mantle.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -89,7 +89,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine model_aniso_mantle(r,theta,phi,rho, &
c11,c12,c13,c14,c15,c16, &
c22,c23,c24,c25,c26,c33,c34,c35,c36,c44,c45,c46,c55,c56,c66)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_atten3D_QRFSI12.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -133,7 +133,10 @@
! get the dq model coefficients
open(unit=10,file=QRFSI12,status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening model file QRFSI12.dat')
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(QRFSI12), '": ', ier
+ call exit_MPI(0, 'error model QRFSI12')
+ endif
do k=1,NKQ
read(10,*)index
@@ -168,7 +171,10 @@
! get the depths and 1/Q values of the reference model
open(11,file=QRFSI12_ref,status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening model file ref_QRFSI12')
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(QRFSI12_ref), '": ', ier
+ call exit_MPI(0, 'error model QRFSI12')
+ endif
do j=1,NDEPTHS_REFQ
read(11,*)QRFSI12_Q_refdepth(j),QRFSI12_Q_refqmu(j)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_attenuation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_attenuation.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_attenuation.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -58,7 +58,6 @@
! number = {3},
! doi = {10.1785/0120090263}}
!
-!
!--------------------------------------------------------------------------------------------------
subroutine model_attenuation_broadcast(myrank,AM_V,MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crust.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crust.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -87,14 +87,12 @@
call MPI_BCAST(abbreviation,NCAP_CRUST*NCAP_CRUST,MPI_CHARACTER,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(code,2*NKEYS_CRUST,MPI_CHARACTER,0,MPI_COMM_WORLD,ier)
-
end subroutine model_crust_broadcast
!
!-------------------------------------------------------------------------------------------------
!
-
subroutine model_crust(lat,lon,x,vp,vs,rho,moho,found_crust,elem_in_crust)
use model_crust_par
@@ -206,7 +204,10 @@
call get_value_string(CNtype2, 'model.CNtype2', 'DATA/crust2.0/CNtype2.txt')
open(unit=1,file=CNtype2,status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening file CNtype2.txt of crust2.0 model')
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(CNtype2), '": ', ier
+ call exit_MPI(0, 'error model crust2.0')
+ endif
do ila=1,NCAP_CRUST/2
read(1,*) icolat,(abbreviation(ila,i),i=1,NCAP_CRUST)
@@ -215,7 +216,10 @@
call get_value_string(CNtype2_key_modif, 'model.CNtype2_key_modif', 'DATA/crust2.0/CNtype2_key_modif.txt')
open(unit=1,file=CNtype2_key_modif,status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening file CNtype2_key_modif.txt of crust2.0 model')
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(CNtype2_key_modif), '": ', ier
+ call exit_MPI(0, 'error model crust2.0')
+ endif
h_moho_min = HUGEVAL
h_moho_max = -HUGEVAL
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crustmaps.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crustmaps.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_crustmaps.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -117,7 +117,6 @@
call MPI_BCAST(velocssp,NLAYERS_CRUSTMAP,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(densitysp,NLAYERS_CRUSTMAP,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
-
end subroutine model_crustmaps_broadcast
!
@@ -225,8 +224,6 @@
enddo
close(1)
-
-
open(unit=1,file=eucrustp3,status='old',action='read')
do ila=1,180*CRUSTMAP_RESOLUTION
read(1,*) (velocp(ila,iln,1),iln=1,360*CRUSTMAP_RESOLUTION)
@@ -320,7 +317,6 @@
! print *,'thicknessnp(',l,')',thicknessnp(l)
enddo
-
end subroutine read_general_crustmap
!
@@ -332,7 +328,6 @@
! Matthias Meschede
! read smooth crust2.0 model (0.25 degree resolution) with eucrust
! based on software routines provided with the crust2.0 model by Bassin et al.
-!
use model_crustmaps_par
@@ -406,7 +401,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine read_crustmaps(lat,lon,velp,vels,rhos,thicks)
! crustal vp and vs in km/s, layer thickness in km
@@ -417,7 +411,6 @@
include "constants.h"
-
! argument variables
double precision lat,lon
double precision rhos(5),thicks(5),velp(5),vels(5)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_epcrust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_epcrust.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_epcrust.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -68,7 +68,7 @@
include "constants.h"
- integer:: myrank,ier
+ integer :: myrank,ier
! allocates arrays for model
allocate(lon_ep(EPCRUST_NLON,EPCRUST_NLAT), &
@@ -122,7 +122,10 @@
call get_value_string(EPCRUST_FNM,'model.EPCRUST_FNM',PATHNAME_EPCRUST)
open(unit=1001,file=trim(EPCRUST_FNM),status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening file for EPcrust')
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(EPCRUST_FNM), '": ', ier
+ call exit_MPI(0, 'error model epcrust')
+ endif
read(1001,*) header
@@ -255,7 +258,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine epcrust_smooth_base(x,y,x1,y1,weight)
use model_epcrust_par,only: NTHETA_EP,NPHI_EP,cap_degree_EP
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_eucrust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_eucrust.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_eucrust.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -130,7 +130,10 @@
! opens data file
call get_value_string(filename, 'model.eu', 'DATA/eucrust-07/ds01.txt')
open(unit=11,file=filename,status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening EUcrust file')
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(filename), '": ', ier
+ call exit_MPI(0, 'error model eucrust')
+ endif
! skip first line
read(11,*)
@@ -302,7 +305,7 @@
double precision,external :: crust_eu
! local variables
- integer i,j,k !,icolat,ilon,ierr
+ integer i,j,k !,icolat,ilon,ier
integer itheta,iphi,npoints
double precision theta,phi,sint,cost,sinp,cosp,dtheta,dphi,cap_area,wght,total,valuel
double precision r_rot,theta_rot,phi_rot
@@ -320,7 +323,7 @@
!call icolat_ilon(lat,lon,icolat,ilon)
!crustaltype=abbreviation(icolat,ilon)
- !call get_crust_structure(crustaltype,velp,vels,rho,thick,code,thlr,velocp,velocs,dens,ierr)
+ !call get_crust_structure(crustaltype,velp,vels,rho,thick,code,thlr,velocp,velocs,dens,ier)
! uncomment the following line to use as is, without smoothing
! value = func(lat,lon,x,value,found)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_ppm.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -391,7 +391,6 @@
if( weight_sum > 1.e-15) dvs = dvs / weight_sum
-
! store min/max
max_dvs = PPM_max_dvs
min_dvs = PPM_min_dvs
@@ -402,8 +401,6 @@
PPM_max_dvs = max_dvs
PPM_min_dvs = min_dvs
- !write(IMAIN,*) ' dvs = ',sngl(dvs),' weight: ',sngl(weight_sum),(sngl((2*PI*sigma_h**2)*sqrt(2*PI)*sigma_v))
-
if( SCALE_MODEL ) then
! scale density and shear velocity
drho = SCALE_RHO*dvs
@@ -507,7 +504,7 @@
xstore,ystore,zstore,rhostore,dvpstore, &
kappavstore,kappahstore,muvstore,muhstore,eta_anisostore,&
nspec,HETEROGEN_3D_MANTLE, &
- NEX_XI,NCHUNKS,ABSORBING_CONDITIONS )
+ NEX_XI,NCHUNKS,ABSORBING_CONDITIONS)
! smooth model parameters
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s20rts.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s20rts.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s20rts.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -232,7 +232,7 @@
!----------------------------------
!
- subroutine s20rts_splhsetup()!!!!!!!!!!!!!!(spknt,qq0,qq)
+ subroutine s20rts_splhsetup()
use model_s20rts_par
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s362ani.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s362ani.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s362ani.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -144,7 +144,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine read_model_s362ani(THREE_D_MODEL, &
THREE_D_MODEL_S362ANI,THREE_D_MODEL_S362WMANI, &
THREE_D_MODEL_S362ANI_PREM,THREE_D_MODEL_S29EA)
@@ -934,6 +933,7 @@
hsplfile,refmodel,kernstri,desckern)
implicit none
+ include "constants.h"
integer, parameter :: mxhpar=2
integer, parameter :: mxkern=200
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s40rts.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s40rts.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_s40rts.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -123,8 +123,10 @@
! S40RTS degree 40 S model from Ritsema
open(unit=10,file=S40RTS,status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening file S40RTS.dat')
-
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(S40RTS), '": ', ier
+ call exit_MPI(0, 'error model s40rts')
+ endif
do k=0,NK_20
do l=0,NS_40
read(10,*) S40RTS_V_dvs_a(k,l,0),(S40RTS_V_dvs_a(k,l,m),S40RTS_V_dvs_b(k,l,m),m=1,l)
@@ -134,8 +136,10 @@
! P12 degree 12 P model from Ritsema
open(unit=10,file=P12,status='old',action='read',iostat=ier)
- if( ier /= 0 ) call exit_MPI(0,'error opening file P12.dat')
-
+ if ( ier /= 0 ) then
+ write(IMAIN,*) 'error opening "', trim(P12), '": ', ier
+ call exit_MPI(0, 'error model s40rts')
+ endif
do k=0,NK_20
do l=0,12
read(10,*) S40RTS_V_dvp_a(k,l,0),(S40RTS_V_dvp_a(k,l,m),S40RTS_V_dvp_b(k,l,m),m=1,l)
@@ -235,7 +239,7 @@
!----------------------------------
- subroutine s40rts_splhsetup()!!!!!!!!!!!!!!(spknt,qq0,qq)
+ subroutine s40rts_splhsetup()
use model_s40rts_par
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/SPECFEM3D_GLOBE_SUNFLOWER/src/meshfem3D/model_sea99_s.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -42,8 +42,8 @@
module model_sea99_s_par
- double precision,dimension(:,:,:),allocatable :: sea99_vs
- double precision,dimension(:),allocatable :: sea99_depth
+ double precision,dimension(:,:,:), allocatable :: sea99_vs
+ double precision,dimension(:), allocatable :: sea99_depth
double precision :: sea99_ddeg
double precision :: alatmin
double precision :: alatmax
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/auxiliaries/combine_AVS_DX.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -138,8 +138,7 @@
RMOHO,R80,R120,R220,R400,R600,R670,R771,RTOPDDOUBLEPRIME,RCMB,RICB, &
R_CENTRAL_CUBE,RHO_TOP_OC,RHO_BOTTOM_OC,RHO_OCEANS,HDUR_MOVIE, &
MOVIE_TOP,MOVIE_BOTTOM,MOVIE_WEST,MOVIE_EAST,MOVIE_NORTH,MOVIE_SOUTH, &
- RMOHO_FICTITIOUS_IN_MESHER, &
- RATIO_BY_WHICH_TO_INCREASE_IT
+ RMOHO_FICTITIOUS_IN_MESHER,RATIO_BY_WHICH_TO_INCREASE_IT
logical TRANSVERSE_ISOTROPY,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
CRUSTAL,ELLIPTICITY,GRAVITY,ONE_CRUST,ROTATION,ISOTROPIC_3D_MANTLE,HETEROGEN_3D_MANTLE, &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/add_topography.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/add_topography.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/add_topography.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -94,13 +94,7 @@
! than using control nodes
! Hejun Zhu, OCT16, 2009
- ! input parameters: myrank,
- ! xstore,ystore,zstore,
- ! ispec,nspec,
- ! ibathy_topo
- ! R220
-
- subroutine add_topography_gll(myrank,xstore,ystore,zstore,ispec,nspec,&
+ subroutine add_topography_gll(myrank,xstore,ystore,zstore,ispec,nspec, &
ibathy_topo,R220)
implicit none
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/calc_jacobian.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -59,9 +59,8 @@
double precision, dimension(NGLLX):: xigll
double precision, dimension(NGLLY):: yigll
double precision, dimension(NGLLZ):: zigll
- logical::ACTUALLY_STORE_ARRAYS
+ logical :: ACTUALLY_STORE_ARRAYS
-
! output results
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,nspec) :: &
xixstore,xiystore,xizstore,etaxstore,etaystore,etazstore,&
@@ -199,32 +198,32 @@
gammay = (xeta*zxi-xxi*zeta) * jacobian_inv
gammaz = (xxi*yeta-xeta*yxi) * jacobian_inv
- ! resave the derivatives and the jacobian
- ! distinguish between single and double precision for reals
- if (ACTUALLY_STORE_ARRAYS) then
- if(CUSTOM_REAL == SIZE_REAL) then
- xixstore(i,j,k,ispec) = sngl(xix)
- xiystore(i,j,k,ispec) = sngl(xiy)
- xizstore(i,j,k,ispec) = sngl(xiz)
- etaxstore(i,j,k,ispec) = sngl(etax)
- etaystore(i,j,k,ispec) = sngl(etay)
- etazstore(i,j,k,ispec) = sngl(etaz)
- gammaxstore(i,j,k,ispec) = sngl(gammax)
- gammaystore(i,j,k,ispec) = sngl(gammay)
- gammazstore(i,j,k,ispec) = sngl(gammaz)
- else
- xixstore(i,j,k,ispec) = xix
- xiystore(i,j,k,ispec) = xiy
- xizstore(i,j,k,ispec) = xiz
- etaxstore(i,j,k,ispec) = etax
- etaystore(i,j,k,ispec) = etay
- etazstore(i,j,k,ispec) = etaz
- gammaxstore(i,j,k,ispec) = gammax
- gammaystore(i,j,k,ispec) = gammay
- gammazstore(i,j,k,ispec) = gammaz
- endif
- endif
- enddo
+ ! resave the derivatives and the jacobian
+ ! distinguish between single and double precision for reals
+ if (ACTUALLY_STORE_ARRAYS) then
+ if(CUSTOM_REAL == SIZE_REAL) then
+ xixstore(i,j,k,ispec) = sngl(xix)
+ xiystore(i,j,k,ispec) = sngl(xiy)
+ xizstore(i,j,k,ispec) = sngl(xiz)
+ etaxstore(i,j,k,ispec) = sngl(etax)
+ etaystore(i,j,k,ispec) = sngl(etay)
+ etazstore(i,j,k,ispec) = sngl(etaz)
+ gammaxstore(i,j,k,ispec) = sngl(gammax)
+ gammaystore(i,j,k,ispec) = sngl(gammay)
+ gammazstore(i,j,k,ispec) = sngl(gammaz)
+ else
+ xixstore(i,j,k,ispec) = xix
+ xiystore(i,j,k,ispec) = xiy
+ xizstore(i,j,k,ispec) = xiz
+ etaxstore(i,j,k,ispec) = etax
+ etaystore(i,j,k,ispec) = etay
+ etazstore(i,j,k,ispec) = etaz
+ gammaxstore(i,j,k,ispec) = gammax
+ gammaystore(i,j,k,ispec) = gammay
+ gammazstore(i,j,k,ispec) = gammaz
+ endif
+ endif
+ enddo
enddo
enddo
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/compute_element_properties.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/compute_element_properties.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/compute_element_properties.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -45,9 +45,7 @@
implicit none
- !include "constants.h"
-
-! correct number of spectral elements in each block depending on chunk type
+ ! correct number of spectral elements in each block depending on chunk type
integer ispec,nspec,nspec_stacey,ATT1,ATT2,ATT3
logical ABSORBING_CONDITIONS,ACTUALLY_STORE_ARRAYS,USE_FULL_TISO_MANTLE,ATTENUATION_1D_WITH_3D_STORAGE
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_1D_buffers.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_1D_buffers.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_1D_buffers.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -267,7 +267,7 @@
mask_ibool(ibool(ix,iy,iz,ispec)) = .true.
npoin1D = npoin1D + 1
write(10,*) ibool(ix,iy,iz,ispec), xstore(ix,iy,iz,ispec), &
- ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
+ ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
endif
enddo
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_eta.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -80,7 +80,7 @@
! determine if the element falls on the left MPI cut plane
!
-! global point number and coordinates left MPI cut-plane
+ ! global point number and coordinates left MPI cut-plane
open(unit=10,file=prname(1:len_trim(prname))//'iboolleft_eta.txt',status='unknown')
! erase the logical mask used to mark points already found
@@ -104,17 +104,17 @@
mask_ibool(ibool(ix,iy,iz,ispec)) = .true.
npoin2D_eta = npoin2D_eta + 1
write(10,*) ibool(ix,iy,iz,ispec), xstore(ix,iy,iz,ispec), &
- ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
+ ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
endif
enddo
enddo
endif
enddo
-! put flag to indicate end of the list of points
+ ! put flag to indicate end of the list of points
write(10,*) '0 0 0. 0. 0.'
-! write total number of points
+ ! write total number of points
write(10,*) npoin2D_eta
close(10)
@@ -127,7 +127,7 @@
!
nspec2Dtheor = NSPEC2D_XI_FACE(iregion,2)
-! global point number and coordinates right MPI cut-plane
+ ! global point number and coordinates right MPI cut-plane
open(unit=10,file=prname(1:len_trim(prname))//'iboolright_eta.txt',status='unknown')
! erase the logical mask used to mark points already found
@@ -151,22 +151,22 @@
mask_ibool(ibool(ix,iy,iz,ispec)) = .true.
npoin2D_eta = npoin2D_eta + 1
write(10,*) ibool(ix,iy,iz,ispec), xstore(ix,iy,iz,ispec), &
- ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
+ ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
endif
enddo
enddo
endif
enddo
-! put flag to indicate end of the list of points
+ ! put flag to indicate end of the list of points
write(10,*) '0 0 0. 0. 0.'
-! write total number of points
+ ! write total number of points
write(10,*) npoin2D_eta
close(10)
-! compare number of surface elements detected to analytical value
+ ! compare number of surface elements detected to analytical value
if(ispecc2 /= nspec2Dtheor) call exit_MPI(myrank,'error MPI cut-planes detection in eta=right')
end subroutine get_MPI_cutplanes_eta
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_MPI_cutplanes_xi.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -117,17 +117,17 @@
mask_ibool(ibool(ix,iy,iz,ispec)) = .true.
npoin2D_xi = npoin2D_xi + 1
write(10,*) ibool(ix,iy,iz,ispec), xstore(ix,iy,iz,ispec), &
- ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
+ ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
endif
enddo
enddo
endif
enddo
-! put flag to indicate end of the list of points
+ ! put flag to indicate end of the list of points
write(10,*) '0 0 0. 0. 0.'
-! write total number of points
+ ! write total number of points
write(10,*) npoin2D_xi
close(10)
@@ -142,7 +142,7 @@
!
nspec2Dtheor = NSPEC2D_ETA_FACE(iregion,2)
-! global point number and coordinates right MPI cut-plane
+ ! global point number and coordinates right MPI cut-plane
open(unit=10,file=prname(1:len_trim(prname))//'iboolright_xi.txt', &
status='unknown',iostat=ier)
if( ier /= 0 ) call exit_mpi(myrank,'error creating iboolright_xi.txt for this process')
@@ -167,17 +167,17 @@
mask_ibool(ibool(ix,iy,iz,ispec)) = .true.
npoin2D_xi = npoin2D_xi + 1
write(10,*) ibool(ix,iy,iz,ispec), xstore(ix,iy,iz,ispec), &
- ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
+ ystore(ix,iy,iz,ispec),zstore(ix,iy,iz,ispec)
endif
enddo
enddo
endif
enddo
-! put flag to indicate end of the list of points
+ ! put flag to indicate end of the list of points
write(10,*) '0 0 0. 0. 0.'
-! write total number of points
+ ! write total number of points
write(10,*) npoin2D_xi
close(10)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_model.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -324,8 +324,11 @@
tau_e_store(:,i,j,k,ispec) = tau_e(:)
Qmu_store(i,j,k,ispec) = Qmu
else
- tau_e_store(:,1,1,1,ispec) = tau_e(:)
- Qmu_store(1,1,1,ispec) = Qmu
+ ! store values from mid-point for whole element
+ if( i == NGLLX/2 .and. j == NGLLY/2 .and. k == NGLLZ/2 ) then
+ tau_e_store(:,1,1,1,ispec) = tau_e(:)
+ Qmu_store(1,1,1,ispec) = Qmu
+ endif
endif
endif
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_perm_color.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_perm_color.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/get_perm_color.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -822,7 +822,7 @@
double precision, intent(inout), dimension(NGLLX,NGLLY,NGLLZ,nspec) :: array_to_permute,temp_array
- integer old_ispec,new_ispec
+ integer :: old_ispec,new_ispec
! copy the original array
temp_array(:,:,:,:) = array_to_permute(:,:,:,:)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D_models.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D_models.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/meshfem3D_models.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -552,8 +552,8 @@
else
! sets up attenuation coefficients according to the chosen, "pure" 1D model
! (including their 1D-crustal profiles)
- call model_attenuation_setup(REFERENCE_1D_MODEL, RICB, RCMB, &
- R670, R220, R80,AM_V,M1066a_V,Mak135_V,Mref_V,SEA1DM_V,AM_S,AS_V)
+ call model_attenuation_setup(REFERENCE_1D_MODEL,RICB,RCMB, &
+ R670,R220,R80,AM_V,M1066a_V,Mak135_V,Mref_V,SEA1DM_V,AM_S,AS_V)
endif
endif
@@ -631,7 +631,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine meshfem3D_models_get1D_val(myrank,iregion_code,idoubling, &
r_prem,rho,vpv,vph,vsv,vsh,eta_aniso, &
Qkappa,Qmu,RICB,RCMB, &
@@ -1031,7 +1030,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine meshfem3D_models_get3Dcrust_val(iregion_code,xmesh,ymesh,zmesh,r, &
vpv,vph,vsv,vsh,rho,eta_aniso,dvp, &
c11,c12,c13,c14,c15,c16,c22,c23,c24,c25, &
@@ -1219,7 +1217,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine meshfem3D_models_getatten_val(idoubling,xmesh,ymesh,zmesh,r_prem, &
tau_e,tau_s,T_c_source, &
moho,Qmu,Qkappa,elem_in_crust)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_1066a.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_1066a.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_1066a.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -67,7 +67,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine model_1066a(x,rho,vp,vs,Qkappa,Qmu,iregion_code,M1066a_V)
implicit none
@@ -144,9 +143,9 @@
! make sure Vs is zero in the outer core even if roundoff errors on depth
! also set fictitious attenuation to a very high value (attenuation is not used in the fluid)
if(iregion_code == IREGION_OUTER_CORE) then
- vs = 0.dd0
- Qkappa = 3000.dd0
- Qmu = 3000.dd0
+ vs = 0.d0
+ Qkappa = 3000.d0
+ Qmu = 3000.d0
endif
! non-dimensionalize
@@ -179,8 +178,9 @@
type (model_1066a_variables) M1066a_V
! model_1066a_variables
- logical USE_EXTERNAL_CRUSTAL_MODEL
+ logical :: USE_EXTERNAL_CRUSTAL_MODEL
+ ! local parameters
integer :: i
! define all the values in the model
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_aniso_mantle.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_aniso_mantle.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_aniso_mantle.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -40,7 +40,6 @@
!
!--------------------------------------------------------------------------------------------------
-
subroutine model_aniso_mantle_broadcast(myrank,AMM_V)
! standard routine to setup model
@@ -83,7 +82,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine model_aniso_mantle(r,theta,phi,rho, &
c11,c12,c13,c14,c15,c16, &
c22,c23,c24,c25,c26,c33,c34,c35,c36,c44,c45,c46,c55,c56,c66, &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_atten3D_QRFSI12.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_atten3D_QRFSI12.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_atten3D_QRFSI12.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -47,7 +47,6 @@
!
!--------------------------------------------------------------------------------------------------
-
subroutine model_atten3D_QRFSI12_broadcast(myrank,QRFSI12_Q)
! standard routine to setup model
@@ -84,7 +83,6 @@
if(myrank == 0) write(IMAIN,*) 'read 3D attenuation model'
-
end subroutine
!
@@ -109,11 +107,12 @@
type (model_atten3D_QRFSI12_variables) QRFSI12_Q
! three_d_model_atten3D_QRFSI12_variables
- integer j,k,l,m
- integer index,ll,mm,ier
- double precision v1,v2
+ ! local parameters
+ integer :: j,k,l,m,ier
+ integer :: index,ll,mm
+ double precision :: v1,v2
- character(len=150) QRFSI12,QRFSI12_ref
+ character(len=150) :: QRFSI12,QRFSI12_ref
! read in QRFSI12
! hard-wire for now
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_attenuation.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_attenuation.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_attenuation.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -58,7 +58,6 @@
! number = {3},
! doi = {10.1785/0120090263}}
!
-!
!--------------------------------------------------------------------------------------------------
subroutine model_attenuation_broadcast(myrank,AM_V,MIN_ATTENUATION_PERIOD,MAX_ATTENUATION_PERIOD)
@@ -98,6 +97,7 @@
integer :: myrank
integer :: ier
+ ! master process determines period ranges
if(myrank == 0) call read_attenuation_model(MIN_ATTENUATION_PERIOD, MAX_ATTENUATION_PERIOD, AM_V)
if(myrank /= 0) allocate(AM_V%Qtau_s(N_SLS))
@@ -110,7 +110,7 @@
call MPI_BCAST(AM_V%Qtau_s(2), 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ier)
call MPI_BCAST(AM_V%Qtau_s(3), 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ier)
- end subroutine
+ end subroutine model_attenuation_broadcast
!
!-------------------------------------------------------------------------------------------------
@@ -304,7 +304,6 @@
call MPI_COMM_RANK(MPI_COMM_WORLD, myrank, ier)
if(myrank > 0) return
-
! uses "pure" 1D models including their 1D-crust profiles
! (uses USE_EXTERNAL_CRUSTAL_MODEL set to false)
if(REFERENCE_1D_MODEL == REFERENCE_MODEL_PREM) then
@@ -330,10 +329,12 @@
endif
! sets up attenuation storage (for all possible Qmu values defined in the 1D models)
- allocate(AM_V%Qr(AM_V%Qn))
- allocate(AM_V%Qmu(AM_V%Qn))
- allocate(AM_V%interval_Q(AM_V%Qn))
- allocate(AM_V%Qtau_e(N_SLS,AM_V%Qn))
+ allocate(AM_V%Qr(AM_V%Qn), &
+ AM_V%Qmu(AM_V%Qn), &
+ AM_V%interval_Q(AM_V%Qn), &
+ AM_V%Qtau_e(N_SLS,AM_V%Qn), &
+ stat=ier)
+ if( ier /= 0 ) call exit_MPI(myrank,'error allocating AM_V arrays')
if(REFERENCE_1D_MODEL == REFERENCE_MODEL_PREM) then
AM_V%Qr(:) = (/ 0.0d0, RICB, RICB, RCMB, RCMB, R670, R670, R220, R220, R80, R80, R_EARTH /)
@@ -472,7 +473,7 @@
type (model_attenuation_storage_var) AM_S
! model_attenuation_storage_var
- integer ier
+ integer :: ier
double precision :: Qmu
double precision, dimension(N_SLS) :: tau_e
integer :: rw
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crust.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crust.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -74,14 +74,12 @@
call MPI_BCAST(CM_V%abbreviation,NCAP_CRUST*NCAP_CRUST,MPI_CHARACTER,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(CM_V%code,2*NKEYS_CRUST,MPI_CHARACTER,0,MPI_COMM_WORLD,ier)
-
end subroutine model_crust_broadcast
!
!-------------------------------------------------------------------------------------------------
!
-
subroutine model_crust(lat,lon,x,vp,vs,rho,moho,found_crust,CM_V,elem_in_crust)
implicit none
@@ -234,16 +232,17 @@
call exit_MPI(0, 'error model crust2.0')
endif
- h_moho_min=HUGEVAL
- h_moho_max=-HUGEVAL
+ h_moho_min = HUGEVAL
+ h_moho_max = -HUGEVAL
+
do ikey=1,NKEYS_CRUST
read (1,"(a2)") CM_V%code(ikey)
read (1,*) (CM_V%velocp(ikey,i),i=1,NLAYERS_CRUST)
read (1,*) (CM_V%velocs(ikey,i),i=1,NLAYERS_CRUST)
read (1,*) (CM_V%dens(ikey,i),i=1,NLAYERS_CRUST)
read (1,*) (CM_V%thlr(ikey,i),i=1,NLAYERS_CRUST-1),CM_V%thlr(ikey,NLAYERS_CRUST)
- if(CM_V%thlr(ikey,NLAYERS_CRUST) > h_moho_max) h_moho_max=CM_V%thlr(ikey,NLAYERS_CRUST)
- if(CM_V%thlr(ikey,NLAYERS_CRUST) < h_moho_min) h_moho_min=CM_V%thlr(ikey,NLAYERS_CRUST)
+ if(CM_V%thlr(ikey,NLAYERS_CRUST) > h_moho_max) h_moho_max = CM_V%thlr(ikey,NLAYERS_CRUST)
+ if(CM_V%thlr(ikey,NLAYERS_CRUST) < h_moho_min) h_moho_min = CM_V%thlr(ikey,NLAYERS_CRUST)
enddo
close(1)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crustmaps.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crustmaps.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_crustmaps.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -106,7 +106,6 @@
call MPI_BCAST(GC_V%velocssp,NLAYERS_CRUSTMAP,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(GC_V%densitysp,NLAYERS_CRUSTMAP,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
-
end subroutine model_crustmaps_broadcast
!
@@ -240,7 +239,6 @@
! Matthias Meschede
! read smooth crust2.0 model (0.25 degree resolution) with eucrust
! based on software routines provided with the crust2.0 model by Bassin et al.
-!
implicit none
include "constants.h"
@@ -339,7 +337,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine read_crustmaps(lat,lon,velp,vels,rhos,thicks,GC_V)
! crustal vp and vs in km/s, layer thickness in km
@@ -348,7 +345,6 @@
include "constants.h"
-
! argument variables
double precision lat,lon
double precision rhos(5),thicks(5),velp(5),vels(5)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_epcrust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_epcrust.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_epcrust.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -32,7 +32,6 @@
! GJI, 185 (1), pages 352-364
!--------------------------------------------------------------------------------------------------
-
subroutine model_epcrust_broadcast(myrank,EPCRUST)
use mpi
@@ -50,26 +49,27 @@
double precision,dimension(EPCRUST_NLON,EPCRUST_NLAT,EPCRUST_NLAYER):: rho_ep
end type model_epcrust_variables
type (model_epcrust_variables) EPCRUST
- integer:: myrank,ierr
+ integer :: myrank,ier
+
! read EPCRUST model on master
if(myrank == 0) call read_epcrust_model(EPCRUST)
! broadcast EPCRUST model
call MPI_BCAST(EPCRUST%lon_ep,EPCRUST_NLON*EPCRUST_NLAT, &
- MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ierr)
+ MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(EPCRUST%lat_ep,EPCRUST_NLON*EPCRUST_NLAT, &
- MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ierr)
+ MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(EPCRUST%topo_ep,EPCRUST_NLON*EPCRUST_NLAT, &
- MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ierr)
+ MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(EPCRUST%thickness_ep,EPCRUST_NLON*EPCRUST_NLAT*EPCRUST_NLAYER, &
- MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ierr)
+ MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(EPCRUST%vp_ep,EPCRUST_NLON*EPCRUST_NLAT*EPCRUST_NLAYER, &
- MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ierr)
+ MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(EPCRUST%vs_ep,EPCRUST_NLON*EPCRUST_NLAT*EPCRUST_NLAYER, &
- MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ierr)
+ MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
call MPI_BCAST(EPCRUST%rho_ep,EPCRUST_NLON*EPCRUST_NLAT*EPCRUST_NLAYER, &
- MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ierr)
+ MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,ier)
end subroutine model_epcrust_broadcast
@@ -100,7 +100,7 @@
call get_value_string(EPCRUST_FNM,'model.EPCRUST_FNM',PATHNAME_EPCRUST)
- open(unit=1001,file=EPCRUST_FNM,status='old',action='read',iostat=ier)
+ open(unit=1001,file=trim(EPCRUST_FNM),status='old',action='read',iostat=ier)
if ( ier /= 0 ) then
write(IMAIN,*) 'error opening "', trim(EPCRUST_FNM), '": ', ier
call exit_MPI(0, 'error model epcrust')
@@ -130,6 +130,7 @@
!
subroutine model_epcrust(lat,lon,dep,vp,vs,rho,moho,found_crust,EPCRUST,elem_in_crust)
+
implicit none
include "constants.h"
@@ -167,11 +168,11 @@
if ( .not. flag_smooth_epcrust) then
call ilon_jlat(lon,lat,ilon,jlat)
- z0=EPCRUST%topo_ep(ilon,jlat)
- zsmooth(:)=EPCRUST%thickness_ep(ilon,jlat,:)
- vpsmooth(:)=EPCRUST%vp_ep(ilon,jlat,:)
- vssmooth(:)=EPCRUST%vs_ep(ilon,jlat,:)
- rhosmooth(:)=EPCRUST%rho_ep(ilon,jlat,:)
+ z0 = EPCRUST%topo_ep(ilon,jlat)
+ zsmooth(:) = EPCRUST%thickness_ep(ilon,jlat,:)
+ vpsmooth(:) = EPCRUST%vp_ep(ilon,jlat,:)
+ vssmooth(:) = EPCRUST%vs_ep(ilon,jlat,:)
+ rhosmooth(:) = EPCRUST%rho_ep(ilon,jlat,:)
else
call epcrust_smooth_base(lon,lat,x1,y1,weight)
z0 = ZERO
@@ -244,7 +245,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine epcrust_smooth_base(x,y,x1,y1,weight)
implicit none
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_eucrust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_eucrust.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_eucrust.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -109,16 +109,17 @@
! original file size entries
EUCM_V%num_eucrust = 36058
+ ! only on master we allocate these arrays here
allocate(EUCM_V%eucrust_vp_uppercrust(EUCM_V%num_eucrust),EUCM_V%eucrust_vp_lowercrust(EUCM_V%num_eucrust),&
EUCM_V%eucrust_mohodepth(EUCM_V%num_eucrust),EUCM_V%eucrust_basement(EUCM_V%num_eucrust),&
EUCM_V%eucrust_ucdepth(EUCM_V%num_eucrust), EUCM_V%eucrust_lon(EUCM_V%num_eucrust),&
EUCM_V%eucrust_lat(EUCM_V%num_eucrust))
- EUCM_V%eucrust_vp_uppercrust(:) = 0.0
- EUCM_V%eucrust_vp_lowercrust(:) = 0.0
- EUCM_V%eucrust_mohodepth(:) = 0.0
- EUCM_V%eucrust_basement(:) = 0.0
- EUCM_V%eucrust_ucdepth(:) = 0.0
+ EUCM_V%eucrust_vp_uppercrust(:) = ZERO
+ EUCM_V%eucrust_vp_lowercrust(:) = ZERO
+ EUCM_V%eucrust_mohodepth(:) = ZERO
+ EUCM_V%eucrust_basement(:) = ZERO
+ EUCM_V%eucrust_ucdepth(:) = ZERO
! opens data file
call get_value_string(filename, 'model.eu', 'DATA/eucrust-07/ds01.txt')
@@ -322,7 +323,7 @@
double precision,external :: crust_eu
! local variables
- integer i,j,k !,icolat,ilon,ierr
+ integer i,j,k !,icolat,ilon,ier
integer itheta,iphi,npoints
double precision theta,phi,sint,cost,sinp,cosp,dtheta,dphi,cap_area,wght,total,valuel
double precision r_rot,theta_rot,phi_rot
@@ -340,7 +341,7 @@
!call icolat_ilon(lat,lon,icolat,ilon)
!crustaltype=abbreviation(icolat,ilon)
- !call get_crust_structure(crustaltype,velp,vels,rho,thick,code,thlr,velocp,velocs,dens,ierr)
+ !call get_crust_structure(crustaltype,velp,vels,rho,thick,code,thlr,velocp,velocs,dens,ier)
! uncomment the following line to use as is, without smoothing
! value = func(lat,lon,x,value,found,EUCM_V)
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_jp3d.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_jp3d.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_jp3d.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -1335,7 +1335,7 @@
!-------------------------------------------------------------------------------------------------
!
- SUBROUTINE INPUTJP(JP3DM_V)
+ SUBROUTINE INPUTJP(JP3DM_V)
implicit none
include "constants.h"
@@ -1437,6 +1437,7 @@
!-------------------------------------------------------------------------------------------------
!
SUBROUTINE JPMODEL(IPS,H,V,JP3DM_V)
+
implicit none
include "constants.h"
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_ppm.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_ppm.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_ppm.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -415,7 +415,6 @@
if( weight_sum > 1.e-15) dvs = dvs / weight_sum
-
! store min/max
max_dvs = PPM_V%max_dvs
min_dvs = PPM_V%min_dvs
@@ -426,8 +425,6 @@
PPM_V%max_dvs = max_dvs
PPM_V%min_dvs = min_dvs
- !write(IMAIN,*) ' dvs = ',sngl(dvs),' weight: ',sngl(weight_sum),(sngl((2*PI*sigma_h**2)*sqrt(2*PI)*sigma_v))
-
if( SCALE_MODEL ) then
! scale density and shear velocity
drho = SCALE_RHO*dvs
@@ -540,7 +537,7 @@
xstore,ystore,zstore,rhostore,dvpstore, &
kappavstore,kappahstore,muvstore,muhstore,eta_anisostore,&
nspec,HETEROGEN_3D_MANTLE, &
- NEX_XI,NCHUNKS,ABSORBING_CONDITIONS,PPM_V )
+ NEX_XI,NCHUNKS,ABSORBING_CONDITIONS,PPM_V)
! smooth model parameters
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s20rts.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s20rts.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s20rts.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -238,7 +238,7 @@
!----------------------------------
!
- subroutine s20rts_splhsetup(S20RTS_V)!!!!!!!!!!!!!!(spknt,qq0,qq)
+ subroutine s20rts_splhsetup(S20RTS_V)
implicit none
include "constants.h"
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s362ani.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s362ani.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s362ani.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -133,7 +133,6 @@
!-------------------------------------------------------------------------------------------------
!
-
subroutine read_model_s362ani(THREE_D_MODEL, &
THREE_D_MODEL_S362ANI,THREE_D_MODEL_S362WMANI, &
THREE_D_MODEL_S362ANI_PREM,THREE_D_MODEL_S29EA, &
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s40rts.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s40rts.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/model_s40rts.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -107,9 +107,10 @@
type (model_s40rts_variables) S40RTS_V
! model_s40rts_variables
- integer k,l,m,ier
+ ! local parameters
+ integer :: k,l,m,ier
+ character(len=150) :: S40RTS, P12
- character(len=150) S40RTS, P12
call get_value_string(S40RTS, 'model.S40RTS', 'DATA/s40rts/S40RTS.dat')
call get_value_string(P12, 'model.P12', 'DATA/s20rts/P12.dat') !model P12 is in s20rts data directory
@@ -244,7 +245,7 @@
!----------------------------------
- subroutine s40rts_splhsetup(S40RTS_V)!!!!!!!!!!!!!!(spknt,qq0,qq)
+ subroutine s40rts_splhsetup(S40RTS_V)
implicit none
include "constants.h"
Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/moho_stretching.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/moho_stretching.f90 2013-07-24 18:09:53 UTC (rev 22666)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/src/meshfem3D/moho_stretching.f90 2013-07-24 21:32:22 UTC (rev 22667)
@@ -206,9 +206,10 @@
include "constants.h"
+ integer :: myrank
+
double precision R220,RMIDDLE_CRUST
double precision RMOHO_FICTITIOUS_IN_MESHER
- integer :: myrank
double precision,dimension(NGNOD) :: xelm,yelm,zelm
More information about the CIG-COMMITS
mailing list