[cig-commits] r21855 - in seismo/3D/SPECFEM3D/trunk: src/decompose_mesh src/generate_databases src/meshfem3D src/shared src/specfem3D utils/unused_routines
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Fri Apr 12 19:16:08 PDT 2013
Author: dkomati1
Date: 2013-04-12 19:16:07 -0700 (Fri, 12 Apr 2013)
New Revision: 21855
Modified:
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90
seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/fault_scotch.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/fault_generate_databases.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_cascadia.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_prem.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_default.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_tomography.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/read_partition_files.f90
seismo/3D/SPECFEM3D/trunk/src/generate_databases/setup_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_mesh_parameter_file.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_value_mesh_parameters.f90
seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90
seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90
seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90
seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90
seismo/3D/SPECFEM3D/trunk/src/shared/prepare_assemble_MPI.f90
seismo/3D/SPECFEM3D/trunk/src/shared/read_topo_bathy_file.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_add_sources_viscoelastic.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_dynamic.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_kinematic.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_receivers.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_source.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/write_output_ASCII.f90
seismo/3D/SPECFEM3D/trunk/utils/unused_routines/model_interface_bedrock.f90
Log:
switched to uniform syntax of enddo, endif and else if;
also suppressed useless white spaces
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/decompose_mesh.F90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -439,7 +439,7 @@
read(line,*) undef_mat_prop(6,imat),undef_mat_prop(1,imat),undef_mat_prop(2,imat),&
undef_mat_prop(3,imat),undef_mat_prop(4,imat)
undef_mat_prop(5,imat) = "0" ! dummy value
- elseif( trim(undef_mat_prop(2,imat)) == 'tomography' ) then
+ else if( trim(undef_mat_prop(2,imat)) == 'tomography' ) then
! line will have 6 arguments, e.g.: 2 -1 tomography elastic tomography_model.xyz 1
read(line,*) undef_mat_prop(6,imat),undef_mat_prop(1,imat),undef_mat_prop(2,imat),&
undef_mat_prop(3,imat),undef_mat_prop(4,imat)
@@ -496,7 +496,7 @@
if( trim(undef_mat_prop(2,imat)) == 'interface' ) then
mat(2,ispec) = 1
! tomography
- elseif( trim(undef_mat_prop(2,imat)) == 'tomography' ) then
+ else if( trim(undef_mat_prop(2,imat)) == 'tomography' ) then
mat(2,ispec) = 2
else
! shouldn't encounter this case
@@ -721,7 +721,7 @@
if (ANY_FAULT) then
call save_nodes_coords(nodes_coords,nnodes)
call close_faults(nodes_coords,nnodes)
- end if
+ endif
end subroutine read_mesh_files
Modified: seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/fault_scotch.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/fault_scotch.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/decompose_mesh/fault_scotch.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -396,8 +396,8 @@
if ( part(i) == 0 ) then
nproc_null = nproc_null + 1
elem_proc_null(nproc_null) = i
- end if
- end do
+ endif
+ enddo
! Redistributing proc-0 elements on the rest of processors
ipart=1
if (nproc > 1) then
@@ -405,8 +405,8 @@
part(elem_proc_null(i)) = ipart
if ( ipart == nproc-1 ) ipart = 0
ipart = ipart +1
- end do
- end if
+ enddo
+ endif
deallocate(elem_proc_null)
endif
@@ -425,7 +425,7 @@
do i = 0, esize*nelmnts-1
nodes_elmnts(elmnts(i)*nsize+nnodes_elmnts(elmnts(i))) = i/esize
nnodes_elmnts(elmnts(i)) = nnodes_elmnts(elmnts(i)) + 1
- end do
+ enddo
do iflt=1,size(faults)
do e=1,faults(iflt)%nspec
@@ -440,9 +440,9 @@
k2 = k1 + nnodes_elmnts(inode) -1
part( nodes_elmnts(k1:k2) ) = 0
- end do
- end do
- end do
+ enddo
+ enddo
+ enddo
nproc_null_final = count( part == 0 )
print *, nproc_null_final
@@ -475,8 +475,8 @@
proc2 = part(e2)
part(e1) = min(proc1,proc2)
part(e2) = part(e1)
- end do
- end do
+ enddo
+ enddo
enddo
end subroutine fault_repartition_parallel
@@ -518,7 +518,7 @@
print *, ' ispec2 : ', nspec_fault_2
print *, 'Fatal error: Number of fault elements do not coincide. Abort.'
stop
- end if
+ endif
!write(IIN_database,*) nspec_fault_1
write(IIN_database) nspec_fault_1
@@ -534,12 +534,12 @@
do j = glob2loc_nodes_nparts(inodes(k)-1), glob2loc_nodes_nparts(inodes(k))-1
if (glob2loc_nodes_parts(j) == iproc ) then
loc_nodes(k) = glob2loc_nodes(j) + 1
- end if
- end do
- end do
+ endif
+ enddo
+ enddo
!write(IIN_database,*) glob2loc_elmnts(e-1)+1, loc_nodes
write(IIN_database) glob2loc_elmnts(e-1)+1, loc_nodes
- end if
+ endif
enddo
! export fault element data, side 2
@@ -551,12 +551,12 @@
do j = glob2loc_nodes_nparts(inodes(k)-1), glob2loc_nodes_nparts(inodes(k))-1
if (glob2loc_nodes_parts(j) == iproc ) then
loc_nodes(k) = glob2loc_nodes(j)+1
- end if
- end do
- end do
+ endif
+ enddo
+ enddo
!write(IIN_database,*) glob2loc_elmnts(e-1)+1, loc_nodes
write(IIN_database) glob2loc_elmnts(e-1)+1, loc_nodes
- end if
+ endif
enddo
enddo
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_mass_matrices.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -529,7 +529,7 @@
enddo
! Y_surface C-PML
- elseif( CPML_regions(ispec_CPML) == 2 ) then
+ else if( CPML_regions(ispec_CPML) == 2 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -555,7 +555,7 @@
enddo
! Z_surface C-PML
- elseif( CPML_regions(ispec_CPML) == 3 ) then
+ else if( CPML_regions(ispec_CPML) == 3 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -581,7 +581,7 @@
enddo
! XY_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 4 ) then
+ else if( CPML_regions(ispec_CPML) == 4 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -611,7 +611,7 @@
enddo
! XZ_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 5 ) then
+ else if( CPML_regions(ispec_CPML) == 5 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -641,7 +641,7 @@
enddo
! YZ_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 6 ) then
+ else if( CPML_regions(ispec_CPML) == 6 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -671,7 +671,7 @@
enddo
! XYZ_corner C-PML
- elseif( CPML_regions(ispec_CPML) == 7 ) then
+ else if( CPML_regions(ispec_CPML) == 7 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -741,7 +741,7 @@
enddo
! Y_surface C-PML
- elseif( CPML_regions(ispec_CPML) == 2 ) then
+ else if( CPML_regions(ispec_CPML) == 2 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -767,7 +767,7 @@
enddo
! Z_surface C-PML
- elseif( CPML_regions(ispec_CPML) == 3 ) then
+ else if( CPML_regions(ispec_CPML) == 3 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -793,7 +793,7 @@
enddo
! XY_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 4 ) then
+ else if( CPML_regions(ispec_CPML) == 4 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -823,7 +823,7 @@
enddo
! XZ_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 5 ) then
+ else if( CPML_regions(ispec_CPML) == 5 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -853,7 +853,7 @@
enddo
! YZ_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 6 ) then
+ else if( CPML_regions(ispec_CPML) == 6 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
@@ -883,7 +883,7 @@
enddo
! XYZ_corner C-PML
- elseif( CPML_regions(ispec_CPML) == 7 ) then
+ else if( CPML_regions(ispec_CPML) == 7 ) then
do k=1,NGLLZ
do j=1,NGLLY
do i=1,NGLLX
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/create_regions_mesh.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -110,7 +110,7 @@
call crm_ext_setup_indexing(ibool, &
xstore,ystore,zstore,nspec,nglob,npointot, &
nnodes_ext_mesh,nodes_coords_ext_mesh,myrank)
- end if
+ endif
if (ANY_FAULT) then
! recalculate *store with faults closed
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/fault_generate_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/fault_generate_databases.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/fault_generate_databases.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -80,7 +80,7 @@
else
if (myrank==0) write(IMAIN,*) 'File DATA/Par_file_faults not found: assume no faults'
close(IIN_PAR)
- end if
+ endif
ANY_FAULT = (nb>0)
if (.not. ANY_FAULT) return
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_cascadia.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_cascadia.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_cascadia.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -82,19 +82,19 @@
vs = 2890.0
! density in kg/m**3
rho = 2800.0
- elseif( depth < 6.0 ) then
+ else if( depth < 6.0 ) then
vp = 6000.0
vs = 3460.0
rho = 2800.0
- elseif( depth < 30.0 ) then
+ else if( depth < 30.0 ) then
vp = 6700.0
vs = 3870.0
rho = 3200.0
- elseif( depth < 45.0 ) then
+ else if( depth < 45.0 ) then
vp = 7100.0
vs = 4100.0
rho = 3200.0
- elseif( depth < 65.0 ) then
+ else if( depth < 65.0 ) then
vp = 7750.0
vs = 4470.0
rho = 3200.0
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_prem.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_prem.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_1d_prem.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -316,43 +316,43 @@
vp_prem=5.8
vs_prem=3.2
! print*,'ro,vp,vs form domain 1',ro_prem,vp_prem,vs_prem
- ELSEIF(idom==2)THEN
+ else if(idom==2)THEN
ro_prem=2.9 ! lower crustal layer
vp_prem=6.8
vs_prem=3.9
- ELSEIF(idom==3)THEN
+ else if(idom==3)THEN
ro_prem=2.691+.6924*x_prem ! upper mantle
vp_prem=4.1875+3.9382*x_prem
vs_prem=2.1519+2.3481*x_prem
- ELSEIF(idom==4)THEN
+ else if(idom==4)THEN
ro_prem=7.1089-3.8045*x_prem
vp_prem=20.3926-12.2569*x_prem
vs_prem=8.9496-4.4597*x_prem
- ELSEIF(idom==5)THEN
+ else if(idom==5)THEN
ro_prem=11.2494-8.0298*x_prem
vp_prem=39.7027-32.6166*x_prem
vs_prem=22.3512-18.5856*x_prem
- ELSEIF(idom==6)THEN
+ else if(idom==6)THEN
ro_prem=5.3197-1.4836*x_prem
vp_prem=19.0957-9.8672*x_prem
vs_prem=9.9839-4.9324*x_prem
- ELSEIF(idom==7)THEN !lower mantle
+ else if(idom==7)THEN !lower mantle
ro_prem=7.9565-6.4761*x_prem+5.5283*x_prem**2-3.0807*x_prem**3
vp_prem=29.2766-23.6027*x_prem+5.5242*x_prem**2-2.5514*x_prem**3
vs_prem=22.3459-17.2473*x_prem-2.0834*x_prem**2+0.9783*x_prem**3
- ELSEIF(idom==8)THEN
+ else if(idom==8)THEN
ro_prem=7.9565-6.4761*x_prem+5.5283*x_prem**2-3.0807*x_prem**3
vp_prem=24.9520-40.4673*x_prem+51.4832*x_prem**2-26.6419*x_prem**3
vs_prem=11.1671-13.7818*x_prem+17.4575*x_prem**2-9.2777*x_prem**3
- ELSEIF(idom==9)THEN
+ else if(idom==9)THEN
ro_prem=7.9565-6.4761*x_prem+5.5283*x_prem**2-3.0807*x_prem**3
vp_prem=15.3891-5.3181*x_prem+5.5242*x_prem**2-2.5514*x_prem**3
vs_prem=6.9254+1.4672*x_prem-2.0834*x_prem**2+.9783*x_prem**3
- ELSEIF(idom==10)THEN ! outer core
+ else if(idom==10)THEN ! outer core
ro_prem=12.5815-1.2638*x_prem-3.6426*x_prem**2-5.5281*x_prem**3
vp_prem=11.0487-4.0362*x_prem+4.8023*x_prem**2-13.5732*x_prem**3
vs_prem=0.00
- ELSEIF(idom==11)THEN ! inner core
+ else if(idom==11)THEN ! inner core
ro_prem=13.0885-8.8381*x_prem**2
vp_prem=11.2622-6.3640*x_prem**2
vs_prem=3.6678-4.4475*x_prem**2
@@ -368,9 +368,9 @@
! if (param=='rho') then
! prem_sub=ro_prem*1000.
- ! elseif (param=='v_p') then
+ ! else if (param=='v_p') then
! prem_sub=vp_prem*1000.
- ! elseif (param=='v_s') then
+ ! else if (param=='v_s') then
! prem_sub=vs_prem*1000.
! else
! write(6,*)'ERROR IN PREM_SUB FUNCTION:',param,'NOT AN OPTION'
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_default.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_default.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_default.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -174,6 +174,6 @@
stop 'material: not implemented yet'
- end if
+ endif
end subroutine model_default
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_tomography.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_tomography.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/model_tomography.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -131,7 +131,7 @@
do while(ier == 0)
read(27,*,iostat=ier)
if (ier == 0) nlines = nlines + 1
- end do
+ enddo
if( nlines /= nrec .and. myrank == 0 ) then
write(6,*) '',trim(tomo_filename)
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/pml_set_local_dampingcoeff.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -100,9 +100,9 @@
if(ELASTIC_SIMULATION .and. .not. ACOUSTIC_SIMULATION)then
ALPHA_MAX_PML = PI*f0_FOR_PML*1.0 ! from Festa and Vilotte (2005)
- elseif(ACOUSTIC_SIMULATION .and. .not. ELASTIC_SIMULATION)then
+ else if(ACOUSTIC_SIMULATION .and. .not. ELASTIC_SIMULATION)then
ALPHA_MAX_PML = PI*f0_FOR_PML*2.0
- elseif(ELASTIC_SIMULATION .and. ACOUSTIC_SIMULATION)then
+ else if(ELASTIC_SIMULATION .and. ACOUSTIC_SIMULATION)then
ALPHA_MAX_PML = PI*f0_FOR_PML*2.0
else
stop 'Currently PML is not implemented for POROELASTIC_SIMULATION'
@@ -239,7 +239,7 @@
write(IMAIN,*) 'Origin of bottom Z-surface C-PML',zoriginbottom
if( PML_INSTEAD_OF_FREE_SURFACE ) then
write(IMAIN,*) 'Origin of top Z-surface C-PML',zorigintop
- end if
+ endif
write(IMAIN,*)
write(IMAIN,*) 'CPML_width_x: ',CPML_width_x
write(IMAIN,*) 'CPML_width_y: ',CPML_width_y
@@ -296,7 +296,7 @@
K_x = 1.d0
endif
- elseif( xstore(iglob) - x_origin < 0.d0 ) then
+ else if( xstore(iglob) - x_origin < 0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -335,7 +335,7 @@
alpha_store(i,j,k,ispec_CPML) = alpha_x
- elseif( CPML_regions(ispec_CPML) == CPML_Y_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_Y_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Y-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -362,7 +362,7 @@
K_y = 1.d0
endif
- elseif( ystore(iglob) - y_origin < 0.d0 ) then
+ else if( ystore(iglob) - y_origin < 0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_y = yoriginback - ystore(iglob)
@@ -402,7 +402,7 @@
alpha_store(i,j,k,ispec_CPML) = alpha_y
- elseif( CPML_regions(ispec_CPML) == CPML_Z_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_Z_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Z-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -430,7 +430,7 @@
K_z = 1.d0
endif
endif
- elseif( zstore(iglob) - z_origin < 0.d0 ) then
+ else if( zstore(iglob) - z_origin < 0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_z = zoriginbottom - zstore(iglob)
@@ -469,7 +469,7 @@
alpha_store(i,j,k,ispec_CPML) = alpha_z
- elseif( CPML_regions(ispec_CPML) == CPML_XY_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XY_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XY-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -517,7 +517,7 @@
K_y = 1.d0
endif
- elseif( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin<0.d0 ) then
+ else if( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin<0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xstore(iglob) - xoriginright
@@ -560,7 +560,7 @@
K_y = 1.d0
endif
- elseif( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin>0.d0 ) then
+ else if( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin>0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -603,7 +603,7 @@
K_y = 1.d0
endif
- elseif( xstore(iglob) - x_origin <0.d0 .and. ystore(iglob) - y_origin <0.d0 ) then
+ else if( xstore(iglob) - x_origin <0.d0 .and. ystore(iglob) - y_origin <0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -664,7 +664,7 @@
alpha_store(i,j,k,ispec_CPML) = ALPHA_MAX_PML / 2.d0
- elseif( CPML_regions(ispec_CPML) == CPML_XZ_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -715,7 +715,7 @@
endif
- elseif( xstore(iglob) - x_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
+ else if( xstore(iglob) - x_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xstore(iglob) - xoriginright
@@ -758,7 +758,7 @@
K_z = 1.d0
endif
- elseif( xstore(iglob) - x_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
+ else if( xstore(iglob) - x_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
if( PML_INSTEAD_OF_FREE_SURFACE ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -804,7 +804,7 @@
endif
- elseif( xstore(iglob) - x_origin<0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
+ else if( xstore(iglob) - x_origin<0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -864,7 +864,7 @@
alpha_store(i,j,k,ispec_CPML) = ALPHA_MAX_PML / 2.d0
- elseif( CPML_regions(ispec_CPML) == CPML_YZ_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_YZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- YZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -902,7 +902,7 @@
d_y = 0.d0
K_y = 1.d0
endif
-
+
if( d_z < 0.d0 ) then
d_z = 0.d0
K_z = 1.d0
@@ -914,7 +914,7 @@
endif
endif
- elseif( ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
+ else if( ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_y = ystore(iglob) - yoriginfront
@@ -957,7 +957,7 @@
K_z = 1.d0
endif
- elseif( ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
+ else if( ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
if( PML_INSTEAD_OF_FREE_SURFACE ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_y = yoriginback - ystore(iglob)
@@ -1003,7 +1003,7 @@
endif
- elseif( ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
+ else if( ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_y = yoriginback - ystore(iglob)
@@ -1062,7 +1062,7 @@
alpha_store(i,j,k,ispec_CPML) = ALPHA_MAX_PML / 2.d0
- elseif( CPML_regions(ispec_CPML) == CPML_XYZ ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XYZ ) then
!------------------------------------------------------------------------------
!---------------------------- XYZ-corner C-PML --------------------------------
!------------------------------------------------------------------------------
@@ -1133,7 +1133,7 @@
endif
endif
- elseif( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
+ else if( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xstore(iglob) - xoriginright
@@ -1198,7 +1198,7 @@
endif
- elseif( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
+ else if( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
if( PML_INSTEAD_OF_FREE_SURFACE ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xstore(iglob) - xoriginright
@@ -1266,7 +1266,7 @@
endif
- elseif( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin < 0.d0 ) then
+ else if( xstore(iglob) - x_origin>0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin < 0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xstore(iglob) - xoriginright
@@ -1332,7 +1332,7 @@
K_z = 1.d0
endif
- elseif( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
+ else if( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
if( PML_INSTEAD_OF_FREE_SURFACE ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -1399,7 +1399,7 @@
endif
- elseif( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
+ else if( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin>0.d0 .and. zstore(iglob) - z_origin<0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -1463,7 +1463,7 @@
K_z = 1.d0
endif
- elseif( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
+ else if( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin>0.d0 ) then
if( PML_INSTEAD_OF_FREE_SURFACE ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
@@ -1530,7 +1530,7 @@
endif
- elseif( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin < 0.d0 ) then
+ else if( xstore(iglob) - x_origin<0.d0 .and. ystore(iglob) - y_origin<0.d0 .and. zstore(iglob) - z_origin < 0.d0 ) then
! gets abscissa of current grid point along the damping profile
abscissa_in_PML_x = xoriginleft - xstore(iglob)
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/read_partition_files.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/read_partition_files.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/read_partition_files.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -85,7 +85,7 @@
materials_ext_mesh(10,imat), materials_ext_mesh(11,imat), materials_ext_mesh(12,imat), &
materials_ext_mesh(13,imat), materials_ext_mesh(14,imat), materials_ext_mesh(15,imat), &
materials_ext_mesh(16,imat)
- end do
+ enddo
if(myrank == 0) then
write(IMAIN,*) ' defined materials: ',nmat_ext_mesh
@@ -101,7 +101,7 @@
! e.g.: -1 interface 14 15 0 2
read(IIN) undef_mat_prop(1,imat),undef_mat_prop(2,imat),undef_mat_prop(3,imat),undef_mat_prop(4,imat), &
undef_mat_prop(5,imat), undef_mat_prop(6,imat)
- end do
+ enddo
if(myrank == 0) then
write(IMAIN,*) ' undefined materials: ',nundefMat_ext_mesh
@@ -161,37 +161,37 @@
if( ier /= 0 ) stop 'error allocating array ibelm_xmin etc.'
do ispec2D = 1,nspec2D_xmin
read(IIN) ibelm_xmin(ispec2D),(nodes_ibelm_xmin(j,ispec2D),j=1,NGNOD2D)
- end do
+ enddo
allocate(ibelm_xmax(nspec2D_xmax),nodes_ibelm_xmax(NGNOD2D,nspec2D_xmax),stat=ier)
if( ier /= 0 ) stop 'error allocating array ibelm_xmax etc.'
do ispec2D = 1,nspec2D_xmax
read(IIN) ibelm_xmax(ispec2D),(nodes_ibelm_xmax(j,ispec2D),j=1,NGNOD2D)
- end do
+ enddo
allocate(ibelm_ymin(nspec2D_ymin),nodes_ibelm_ymin(NGNOD2D,nspec2D_ymin),stat=ier)
if( ier /= 0 ) stop 'error allocating array ibelm_ymin'
do ispec2D = 1,nspec2D_ymin
read(IIN) ibelm_ymin(ispec2D),(nodes_ibelm_ymin(j,ispec2D),j=1,NGNOD2D)
- end do
+ enddo
allocate(ibelm_ymax(nspec2D_ymax),nodes_ibelm_ymax(NGNOD2D,nspec2D_ymax),stat=ier)
if( ier /= 0 ) stop 'error allocating array ibelm_ymax etc.'
do ispec2D = 1,nspec2D_ymax
read(IIN) ibelm_ymax(ispec2D),(nodes_ibelm_ymax(j,ispec2D),j=1,NGNOD2D)
- end do
+ enddo
allocate(ibelm_bottom(nspec2D_bottom_ext),nodes_ibelm_bottom(NGNOD2D,nspec2D_bottom_ext),stat=ier)
if( ier /= 0 ) stop 'error allocating array ibelm_bottom etc.'
do ispec2D = 1,nspec2D_bottom_ext
read(IIN) ibelm_bottom(ispec2D),(nodes_ibelm_bottom(j,ispec2D),j=1,NGNOD2D)
- end do
+ enddo
allocate(ibelm_top(nspec2D_top_ext),nodes_ibelm_top(NGNOD2D,nspec2D_top_ext),stat=ier)
if( ier /= 0 ) stop 'error allocating array ibelm_top etc.'
do ispec2D = 1,nspec2D_top_ext
read(IIN) ibelm_top(ispec2D),(nodes_ibelm_top(j,ispec2D),j=1,NGNOD2D)
- end do
+ enddo
call sum_all_i(nspec2D_xmin,num_xmin)
call sum_all_i(nspec2D_xmax,num_xmax)
@@ -327,7 +327,7 @@
do ispec2D = 1,nspec2D_moho_ext
! format: #element_id #node_id1 #node_id2 #node_id3 #node_id4
read(IIN) ibelm_moho(ispec2D),(nodes_ibelm_moho(j,ispec2D),j=1,NGNOD2D)
- end do
+ enddo
! user output
if(myrank == 0) then
Modified: seismo/3D/SPECFEM3D/trunk/src/generate_databases/setup_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/generate_databases/setup_mesh.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/generate_databases/setup_mesh.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -72,12 +72,12 @@
inode = nodes_ibelm_top(icorner,iface)
if (nodes_coords_ext_mesh(3,inode) < min_elevation) then
min_elevation = nodes_coords_ext_mesh(3,inode)
- end if
+ endif
if (nodes_coords_ext_mesh(3,inode) > max_elevation) then
max_elevation = nodes_coords_ext_mesh(3,inode)
- end if
- end do
- end do
+ endif
+ enddo
+ enddo
! compute the maximum of the maxima for all the slices using an MPI reduction
call min_all_dp(min_elevation,min_elevation_all)
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/check_mesh_quality.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -118,7 +118,7 @@
write(IMAIN,*) '**************************'
write(IMAIN,*)
write(IMAIN,*) 'start computing the minimum and maximum edge size'
- end if
+ endif
! read the parameter file
call read_parameter_file(NPROC,NTSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP,DT,NGNOD,NGNOD2D, &
@@ -221,7 +221,7 @@
if((myrank == skewness_max_rank) .and. (myrank /= 0)) then
tmp_ispec_max_skewness(1) = ispec_max_skewness
call send_i_t(tmp_ispec_max_skewness,1,0)
- end if
+ endif
if(myrank == 0) then
@@ -230,7 +230,7 @@
ispec_max_skewness_MPI = tmp_ispec_max_skewness_MPI(1)
else
ispec_max_skewness_MPI = ispec_max_skewness
- end if
+ endif
write(IMAIN,*) 'done processing '
@@ -290,7 +290,7 @@
! create statistics about mesh quality
write(IMAIN,*) 'creating histogram and statistics of mesh quality'
- end if
+ endif
! erase histogram of skewness
classes_skewness(:) = 0
@@ -313,7 +313,7 @@
! sum skewness results in all processes
do iclass = 0,NCLASS-1
call sum_all_i(classes_skewness(iclass),classes_skewnessMPI(iclass))
- end do
+ enddo
call sum_all_i(NSPEC,NSPEC_ALL_SLICES)
@@ -365,7 +365,7 @@
stop 'total percentage should be 100%'
endif
- end if
+ endif
! debug: for vtk output
if( CREATE_VTK_FILES ) then
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_regions_mesh.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -251,7 +251,7 @@
nmeshregions = 5
else
stop 'Wrong number of mesh regions'
- end if
+ endif
endif
do isubregion = 1,nmeshregions
@@ -286,7 +286,7 @@
ispec = ispec + 1
if(ispec > nspec) then
call exit_MPI(myrank,'ispec greater than nspec in mesh creation')
- end if
+ endif
! check if element is on topography
if((ir == ir2) .and. (isubregion == nmeshregions)) then
@@ -329,7 +329,7 @@
ispec = ispec + 1
if(ispec > nspec) then
call exit_MPI(myrank,'ispec greater than nspec in mesh creation')
- end if
+ endif
doubling_index = IFLAG_BASEMENT_TOPO
true_material_num(ispec) = material_num(ir,ix,iy)
@@ -344,7 +344,7 @@
UTM_X_MIN,UTM_X_MAX,UTM_Y_MIN,UTM_Y_MAX,Z_DEPTH_BLOCK)
enddo
- end if
+ endif
! end of loop on all the mesh points in current subregion
enddo
@@ -438,7 +438,7 @@
! stop mesher
call exit_MPI(myrank,'incorrect global number, please check mesh input parameters')
- end if
+ endif
! put in classical format
allocate(nodes_coords(nglob,3),stat=ier)
@@ -466,7 +466,7 @@
if(minval(ibool(:,:,:,:)) /= 1 .or. maxval(ibool(:,:,:,:)) /= nglob) then
print*,'error ibool: maximum value ',maxval(ibool(:,:,:,:)) ,'should be ',nglob
call exit_MPI(myrank,'incorrect global ibool numbering')
- end if
+ endif
! outputs mesh file for visualization
call create_visual_files(CREATE_ABAQUS_FILES,CREATE_DX_FILES,CREATE_VTK_FILES, &
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/create_visual_files.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -63,16 +63,16 @@
do i=1,nglob
! write(64,*) i,',',nodes_coords(i,1),',',nodes_coords(i,2),',',nodes_coords(i,3)
write(64,'(i10,3(a,e15.6))') i,',',nodes_coords(i,1),',',nodes_coords(i,2),',',nodes_coords(i,3)
- end do
+ enddo
write(64,'(a31)') '*ELEMENT, TYPE=C3D8R, ELSET=EB1'
do ispec=1,nspec
write(64,'(i10,8(a,i10))') ispec,',',ibool(1,1,2,ispec),',',ibool(1,1,1,ispec),',',ibool(1,2,1,ispec), &
',',ibool(1,2,2,ispec),',',ibool(2,1,2,ispec),',',ibool(2,1,1,ispec),',',ibool(2,2,1,ispec),',', &
ibool(2,2,2,ispec)
- end do
+ enddo
close(64)
- end if
+ endif
if(CREATE_DX_FILES) then
@@ -84,7 +84,7 @@
do ipoin = 1,nglob
write(66,*) sngl(nodes_coords(ipoin,1)),sngl(nodes_coords(ipoin,2)),sngl(nodes_coords(ipoin,3))
- end do
+ enddo
! ************* generate elements ******************
@@ -124,7 +124,7 @@
close(66)
- end if
+ endif
if( CREATE_VTK_FILES ) then
! vtk file output
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/define_subregions.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -314,9 +314,9 @@
else
stop 'Wrong number of doublings'
- end if
+ endif
- end if
+ endif
end subroutine define_mesh_regions
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/meshfem3D.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -405,7 +405,7 @@
write(IMAIN,*) 'Reading interface data from file ',&
MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH))//INTERFACES_FILE(1:len_trim(INTERFACES_FILE)), &
' to count the spectral elements'
- end if
+ endif
open(unit=IIN,file=MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH))//INTERFACES_FILE, &
status='old')
@@ -531,7 +531,7 @@
write(IMAIN,*) 'There are ',NER,' elements along Z'
do ilayer = 1,number_of_layers
write(IMAIN,*) 'There are ',ner_layer(ilayer),' spectral elements along Z in layer ',ilayer
- end do
+ enddo
write(IMAIN,*)
write(IMAIN,*) 'There are ',NPROC_XI,' slices along xi'
write(IMAIN,*) 'There are ',NPROC_ETA,' slices along eta'
@@ -622,7 +622,7 @@
MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH)) &
//INTERFACES_FILE(1:len_trim(INTERFACES_FILE))
write(IMAIN,*)
- end if
+ endif
open(unit=IIN,file=MF_IN_DATA_FILES_PATH(1:len_trim(MF_IN_DATA_FILES_PATH)) &
//INTERFACES_FILE,status='old')
@@ -763,8 +763,8 @@
zgrid(ir + ioffset,ix,iy) = gamma*z_interface_top + (1.d0 - gamma)*z_interface_bottom
enddo
- end do
- end do
+ enddo
+ enddo
! the top interface becomes the bottom interface before switching to the next layer
SUPPRESS_UTM_PROJECTION_BOTTOM = SUPPRESS_UTM_PROJECTION_TOP
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_mesh_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_mesh_parameter_file.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_mesh_parameter_file.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -141,7 +141,7 @@
idoubl = ner_doublings(1)
ner_doublings(1) = ner_doublings(2)
ner_doublings(2) = idoubl
- end if
+ endif
@@ -174,7 +174,7 @@
material_properties(imat,4) = Q_flag
material_properties(imat,5) = anisotropy_flag
material_properties(imat,6) = domain_id
- end do
+ enddo
! read number of subregions
call read_value_integer_mesh(IIN,IGNORE_JUNK,NSUBREGIONS, 'mesher.NSUBREGIONS')
@@ -199,7 +199,7 @@
subregions(ireg,5) = iz_beg_region
subregions(ireg,6) = iz_end_region
subregions(ireg,7) = imaterial_number
- end do
+ enddo
! close parameter file
call close_parameter_file_mesh()
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_value_mesh_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_value_mesh_parameters.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/read_value_mesh_parameters.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -202,7 +202,7 @@
index_equal_sign = index(string_read,'=')
if(index_equal_sign <= 1 .or. index_equal_sign == len_trim(string_read)) stop 'incorrect syntax detected in Mesh_Par_file'
string_read = string_read(index_equal_sign + 1:len_trim(string_read))
- end if
+ endif
! suppress leading and trailing white spaces again, if any, after having suppressed the leading junk
string_read = adjustl(string_read)
Modified: seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/meshfem3D/save_databases.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -94,7 +94,7 @@
write(IIN_database) nglob
do iglob=1,nglob
write(IIN_database) iglob,nodes_coords(iglob,1),nodes_coords(iglob,2),nodes_coords(iglob,3)
- end do
+ enddo
! Materials properties
write(IIN_database) NMATERIALS, 0
@@ -104,7 +104,7 @@
matpropl(1:6) = material_properties(idoubl,1:6)
! pad dummy zeros to fill up 16 entries (poroelastic medium not allowed)
write(IIN_database) matpropl
- end do
+ enddo
write(IIN_database) nspec
@@ -115,7 +115,7 @@
write(IIN_database) ispec,true_material_num(ispec),1,ibool(1,1,1,ispec),ibool(2,1,1,ispec),&
ibool(2,2,1,ispec),ibool(1,2,1,ispec),ibool(1,1,2,ispec),&
ibool(2,1,2,ispec),ibool(2,2,2,ispec),ibool(1,2,2,ispec)
- end do
+ enddo
! Boundaries
write(IIN_database) 1,nspec2D_xmin
@@ -128,27 +128,27 @@
do i=1,nspec2D_xmin
write(IIN_database) ibelm_xmin(i),ibool(1,1,1,ibelm_xmin(i)),ibool(1,NGLLY_M,1,ibelm_xmin(i)),&
ibool(1,1,NGLLZ_M,ibelm_xmin(i)),ibool(1,NGLLY_M,NGLLZ_M,ibelm_xmin(i))
- end do
+ enddo
do i=1,nspec2D_xmax
write(IIN_database) ibelm_xmax(i),ibool(NGLLX_M,1,1,ibelm_xmax(i)),ibool(NGLLX_M,NGLLY_M,1,ibelm_xmax(i)), &
ibool(NGLLX_M,1,NGLLZ_M,ibelm_xmax(i)),ibool(NGLLX_M,NGLLY_M,NGLLZ_M,ibelm_xmax(i))
- end do
+ enddo
do i=1,nspec2D_ymin
write(IIN_database) ibelm_ymin(i),ibool(1,1,1,ibelm_ymin(i)),ibool(NGLLX_M,1,1,ibelm_ymin(i)),&
ibool(1,1,NGLLZ_M,ibelm_ymin(i)),ibool(NGLLX_M,1,NGLLZ_M,ibelm_ymin(i))
- end do
+ enddo
do i=1,nspec2D_ymax
write(IIN_database) ibelm_ymax(i),ibool(NGLLX_M,NGLLY_M,1,ibelm_ymax(i)),ibool(1,NGLLY_M,1,ibelm_ymax(i)), &
ibool(NGLLX_M,NGLLY_M,NGLLZ_M,ibelm_ymax(i)),ibool(1,NGLLY_M,NGLLZ_M,ibelm_ymax(i))
- end do
+ enddo
do i=1,NSPEC2D_BOTTOM
write(IIN_database) ibelm_bottom(i),ibool(1,1,1,ibelm_bottom(i)),ibool(NGLLX_M,1,1,ibelm_bottom(i)), &
ibool(NGLLX_M,NGLLY_M,1,ibelm_bottom(i)),ibool(1,NGLLY_M,1,ibelm_bottom(i))
- end do
+ enddo
do i=1,NSPEC2D_TOP
write(IIN_database) ibelm_top(i),ibool(1,1,NGLLZ_M,ibelm_top(i)),ibool(NGLLX_M,1,NGLLZ_M,ibelm_top(i)), &
ibool(NGLLX_M,NGLLY_M,NGLLZ_M,ibelm_top(i)),ibool(1,NGLLY_M,NGLLZ_M,ibelm_top(i))
- end do
+ enddo
! JC JC todo: implement C-PML code in internal mesher
! dummy_nspec_cpml is used here to match the read instructions in generate_databases/read_partition_files.f90
@@ -165,36 +165,36 @@
if(iproc_xi == 0) then
nb_interfaces = nb_interfaces -1
interfaces(W) = .false.
- end if
+ endif
if(iproc_xi == NPROC_XI-1) then
nb_interfaces = nb_interfaces -1
interfaces(E) = .false.
- end if
+ endif
if(iproc_eta == 0) then
nb_interfaces = nb_interfaces -1
interfaces(S) = .false.
- end if
+ endif
if(iproc_eta == NPROC_ETA-1) then
nb_interfaces = nb_interfaces -1
interfaces(N) = .false.
- end if
+ endif
if((interfaces(W) .eqv. .true.) .and. (interfaces(N) .eqv. .true.)) then
interfaces(NW) = .true.
nb_interfaces = nb_interfaces +1
- end if
+ endif
if((interfaces(N) .eqv. .true.) .and. (interfaces(E) .eqv. .true.)) then
interfaces(NE) = .true.
nb_interfaces = nb_interfaces +1
- end if
+ endif
if((interfaces(E) .eqv. .true.) .and. (interfaces(S) .eqv. .true.)) then
interfaces(SE) = .true.
nb_interfaces = nb_interfaces +1
- end if
+ endif
if((interfaces(W) .eqv. .true.) .and. (interfaces(S) .eqv. .true.)) then
interfaces(SW) = .true.
nb_interfaces = nb_interfaces +1
- end if
+ endif
nspec_interface(:) = 0
if(interfaces(W)) nspec_interface(W) = count(iMPIcut_xi(1,:) .eqv. .true.)
@@ -215,74 +215,74 @@
do ispec = 1,nspec
if(iMPIcut_xi(1,ispec)) write(IIN_database) ispec,4,ibool(1,1,1,ispec),ibool(1,2,1,ispec), &
ibool(1,1,2,ispec),ibool(1,2,2,ispec)
- end do
- end if
+ enddo
+ endif
if(interfaces(E)) then
write(IIN_database) addressing(iproc_xi+1,iproc_eta),nspec_interface(E)
do ispec = 1,nspec
if(iMPIcut_xi(2,ispec)) write(IIN_database) ispec,4,ibool(2,1,1,ispec),ibool(2,2,1,ispec), &
ibool(2,1,2,ispec),ibool(2,2,2,ispec)
- end do
- end if
+ enddo
+ endif
if(interfaces(S)) then
write(IIN_database) addressing(iproc_xi,iproc_eta-1),nspec_interface(S)
do ispec = 1,nspec
if(iMPIcut_eta(1,ispec)) write(IIN_database) ispec,4,ibool(1,1,1,ispec),ibool(2,1,1,ispec), &
ibool(1,1,2,ispec),ibool(2,1,2,ispec)
- end do
- end if
+ enddo
+ endif
if(interfaces(N)) then
write(IIN_database) addressing(iproc_xi,iproc_eta+1),nspec_interface(N)
do ispec = 1,nspec
if(iMPIcut_eta(2,ispec)) write(IIN_database) ispec,4,ibool(2,2,1,ispec),ibool(1,2,1,ispec), &
ibool(2,2,2,ispec),ibool(1,2,2,ispec)
- end do
- end if
+ enddo
+ endif
if(interfaces(NW)) then
write(IIN_database) addressing(iproc_xi-1,iproc_eta+1),nspec_interface(NW)
do ispec = 1,nspec
if((iMPIcut_xi(1,ispec) .eqv. .true.) .and. (iMPIcut_eta(2,ispec) .eqv. .true.)) then
write(IIN_database) ispec,2,ibool(1,2,1,ispec),ibool(1,2,2,ispec),-1,-1
- end if
- end do
- end if
+ endif
+ enddo
+ endif
if(interfaces(NE)) then
write(IIN_database) addressing(iproc_xi+1,iproc_eta+1),nspec_interface(NE)
do ispec = 1,nspec
if((iMPIcut_xi(2,ispec) .eqv. .true.) .and. (iMPIcut_eta(2,ispec) .eqv. .true.)) then
write(IIN_database) ispec,2,ibool(2,2,1,ispec),ibool(2,2,2,ispec),-1,-1
- end if
- end do
- end if
+ endif
+ enddo
+ endif
if(interfaces(SE)) then
write(IIN_database) addressing(iproc_xi+1,iproc_eta-1),nspec_interface(SE)
do ispec = 1,nspec
if((iMPIcut_xi(2,ispec) .eqv. .true.) .and. (iMPIcut_eta(1,ispec) .eqv. .true.)) then
write(IIN_database) ispec,2,ibool(2,1,1,ispec),ibool(2,1,2,ispec),-1,-1
- end if
- end do
- end if
+ endif
+ enddo
+ endif
if(interfaces(SW)) then
write(IIN_database) addressing(iproc_xi-1,iproc_eta-1),nspec_interface(SW)
do ispec = 1,nspec
if((iMPIcut_xi(1,ispec) .eqv. .true.) .and. (iMPIcut_eta(1,ispec) .eqv. .true.)) then
write(IIN_database) ispec,2,ibool(1,1,1,ispec),ibool(1,1,2,ispec),-1,-1
- end if
- end do
- end if
+ endif
+ enddo
+ endif
else
write(IIN_database) 0,0
- end if
+ endif
close(IIN_database)
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/combine_vol_data.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -762,7 +762,7 @@
else
call write_integer(nee)
endif
- end if
+ endif
! writes out element indices
allocate(mask_ibool(NGLOB_AB), &
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/create_movie_shakemap_AVS_DX_GMT.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -419,7 +419,7 @@
yp(ieoff+ilocnum) = dble(y(i,j))
zp(ieoff+ilocnum) = dble(z(i,j))
field_display(ieoff+ilocnum) = dble(display(i,j))
- elseif(ilocnum == 2) then
+ else if(ilocnum == 2) then
! accounts for different ordering of square points
xp(ieoff+ilocnum) = dble(x(i+1,j+1))
@@ -427,7 +427,7 @@
zp(ieoff+ilocnum) = dble(z(i+1,j+1))
field_display(ieoff+ilocnum) = dble(display(i+1,j+1))
- elseif(ilocnum == 3) then
+ else if(ilocnum == 3) then
! accounts for different ordering of square points
xp(ieoff+ilocnum) = dble(x(i+1,j))
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/get_attenuation_model.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -1159,7 +1159,7 @@
demon = 1.0d0 + w**2 * tau_s(j)**2
A(i) = A(i) + ((1.0d0 + (w**2 * tau_eps(j) * tau_s(j)))/ demon)
B(i) = B(i) + ((w * (tau_eps(j) - tau_s(j))) / demon)
- end do
+ enddo
! write(*,*)A(i),B(i),10**f(i)
enddo
@@ -1414,7 +1414,7 @@
itercount = itercount + 1
if (prnt == 3) then
write(*,*)itercount, func_evals, fv(1), how
- elseif (prnt == 4) then
+ else if (prnt == 4) then
write(*,*)
write(*,*)'How: ',how
write(*,*)'v: ',v
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/prepare_assemble_MPI.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/prepare_assemble_MPI.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/prepare_assemble_MPI.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -94,7 +94,7 @@
! gets spectral element corner indices (defines all nodes of face/edge)
do k = 1, NGNOD_EIGHT_CORNERS
n(k) = knods(k,ispec)
- end do
+ enddo
! interface node ids
e1 = my_interfaces(3,ispec_interface,num_interface)
@@ -120,17 +120,17 @@
! adds point to interface
npoin_interface_ext_mesh = npoin_interface_ext_mesh + 1
ibool_interfaces_ext_mesh(npoin_interface_ext_mesh,num_interface) = iglob
- end if
- end do
- end do
- end do
+ endif
+ enddo
+ enddo
+ enddo
- end do
+ enddo
! stores total number of (global) points on this MPI interface
nibool_interfaces_ext_mesh(num_interface) = npoin_interface_ext_mesh
- end do
+ enddo
deallocate( mask_ibool_ext_mesh )
@@ -175,7 +175,7 @@
iymax = 1
izmin = 1
izmax = 1
- end if
+ endif
if ( e1 == n(2) ) then
ixmin = NGLLX
ixmax = NGLLX
@@ -183,7 +183,7 @@
iymax = 1
izmin = 1
izmax = 1
- end if
+ endif
if ( e1 == n(3) ) then
ixmin = NGLLX
ixmax = NGLLX
@@ -191,7 +191,7 @@
iymax = NGLLY
izmin = 1
izmax = 1
- end if
+ endif
if ( e1 == n(4) ) then
ixmin = 1
ixmax = 1
@@ -199,7 +199,7 @@
iymax = NGLLY
izmin = 1
izmax = 1
- end if
+ endif
if ( e1 == n(5) ) then
ixmin = 1
ixmax = 1
@@ -207,7 +207,7 @@
iymax = 1
izmin = NGLLZ
izmax = NGLLZ
- end if
+ endif
if ( e1 == n(6) ) then
ixmin = NGLLX
ixmax = NGLLX
@@ -215,7 +215,7 @@
iymax = 1
izmin = NGLLZ
izmax = NGLLZ
- end if
+ endif
if ( e1 == n(7) ) then
ixmin = NGLLX
ixmax = NGLLX
@@ -223,7 +223,7 @@
iymax = NGLLY
izmin = NGLLZ
izmax = NGLLZ
- end if
+ endif
if ( e1 == n(8) ) then
ixmin = 1
ixmax = 1
@@ -231,7 +231,7 @@
iymax = NGLLY
izmin = NGLLZ
izmax = NGLLZ
- end if
+ endif
else if ( itype == 2 ) then
@@ -245,18 +245,18 @@
ixmax = NGLLX
iymax = 1
izmax = 1
- end if
+ endif
if ( e2 == n(4) ) then
ixmax = 1
iymax = NGLLY
izmax = 1
- end if
+ endif
if ( e2 == n(5) ) then
ixmax = 1
iymax = 1
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
if ( e1 == n(2) ) then
ixmin = NGLLX
iymin = 1
@@ -265,18 +265,18 @@
ixmax = NGLLX
iymax = NGLLY
izmax = 1
- end if
+ endif
if ( e2 == n(1) ) then
ixmax = 1
iymax = 1
izmax = 1
- end if
+ endif
if ( e2 == n(6) ) then
ixmax = NGLLX
iymax = 1
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
if ( e1 == n(3) ) then
ixmin = NGLLX
iymin = NGLLY
@@ -285,18 +285,18 @@
ixmax = 1
iymax = NGLLY
izmax = 1
- end if
+ endif
if ( e2 == n(2) ) then
ixmax = NGLLX
iymax = 1
izmax = 1
- end if
+ endif
if ( e2 == n(7) ) then
ixmax = NGLLX
iymax = NGLLY
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
if ( e1 == n(4) ) then
ixmin = 1
iymin = NGLLY
@@ -305,18 +305,18 @@
ixmax = 1
iymax = 1
izmax = 1
- end if
+ endif
if ( e2 == n(3) ) then
ixmax = NGLLX
iymax = NGLLY
izmax = 1
- end if
+ endif
if ( e2 == n(8) ) then
ixmax = 1
iymax = NGLLY
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
if ( e1 == n(5) ) then
ixmin = 1
iymin = 1
@@ -325,18 +325,18 @@
ixmax = 1
iymax = 1
izmax = 1
- end if
+ endif
if ( e2 == n(6) ) then
ixmax = NGLLX
iymax = 1
izmax = NGLLZ
- end if
+ endif
if ( e2 == n(8) ) then
ixmax = 1
iymax = NGLLY
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
if ( e1 == n(6) ) then
ixmin = NGLLX
iymin = 1
@@ -345,18 +345,18 @@
ixmax = NGLLX
iymax = 1
izmax = 1
- end if
+ endif
if ( e2 == n(7) ) then
ixmax = NGLLX
iymax = NGLLY
izmax = NGLLZ
- end if
+ endif
if ( e2 == n(5) ) then
ixmax = 1
iymax = 1
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
if ( e1 == n(7) ) then
ixmin = NGLLX
iymin = NGLLY
@@ -365,18 +365,18 @@
ixmax = NGLLX
iymax = NGLLY
izmax = 1
- end if
+ endif
if ( e2 == n(8) ) then
ixmax = 1
iymax = NGLLY
izmax = NGLLZ
- end if
+ endif
if ( e2 == n(6) ) then
ixmax = NGLLX
iymax = 1
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
if ( e1 == n(8) ) then
ixmin = 1
iymin = NGLLY
@@ -385,18 +385,18 @@
ixmax = 1
iymax = NGLLY
izmax = 1
- end if
+ endif
if ( e2 == n(5) ) then
ixmax = 1
iymax = 1
izmax = NGLLZ
- end if
+ endif
if ( e2 == n(7) ) then
ixmax = NGLLX
iymax = NGLLY
izmax = NGLLZ
- end if
- end if
+ endif
+ endif
else if (itype == 4) then
@@ -561,8 +561,8 @@
stop 'ERROR get_edge'
endif
-! end if
-! end if
+! endif
+! endif
end subroutine get_edge
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/read_topo_bathy_file.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/read_topo_bathy_file.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/read_topo_bathy_file.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -239,7 +239,7 @@
endif
enddo
enddo
- end do
+ enddo
! if we have not located a target element, the point is not in this slice
! therefore use first element only for fictitious iterative search
@@ -269,8 +269,8 @@
inode = inode + 1
elevation_node(inode) = zstore(iglob)
dist_node(inode) = sqrt( (x_target - xstore(iglob))**2 + (y_target - ystore(iglob))**2 )
- end do
- end do
+ enddo
+ enddo
! weighted elevation
dist = sum( dist_node(:) )
@@ -291,10 +291,10 @@
endif
endif
- end do
- end do
+ enddo
+ enddo
- end if
+ endif
end subroutine get_topo_elevation_free
@@ -398,7 +398,7 @@
located_target = .true.
endif
enddo
- end do
+ enddo
! if we have not located a target element, the point is not in this slice
! therefore use first element only for fictitious iterative search
@@ -412,7 +412,7 @@
located_target = .true.
endif
- end if
+ endif
end subroutine get_topo_elevation_free_closest
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_add_sources_viscoelastic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_add_sources_viscoelastic.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_add_sources_viscoelastic.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -545,7 +545,7 @@
else ! GPU_MODE == .true.
call add_source_master_rec_noise_cu(Mesh_pointer, myrank, it, irec_master_noise, islice_selected_rec)
endif
- elseif ( NOISE_TOMOGRAPHY == 2 ) then
+ else if ( NOISE_TOMOGRAPHY == 2 ) then
! second step of noise tomography, i.e., read the surface movie saved at every timestep
! use the movie to drive the ensemble forward wavefield
call noise_read_add_surface_movie(NGLLSQUARE*num_free_surface_faces, &
@@ -562,7 +562,7 @@
! note the ensemble forward sources are generally distributed on the surface of the earth
! that's to say, the ensemble forward source is kind of a surface force density, not a body force density
! therefore, we must add it here, before applying the inverse of mass matrix
- elseif ( NOISE_TOMOGRAPHY == 3 ) then
+ else if ( NOISE_TOMOGRAPHY == 3 ) then
! third step of noise tomography, i.e., read the surface movie saved at every timestep
! use the movie to reconstruct the ensemble forward wavefield
! the ensemble adjoint wavefield is done as usual
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -73,9 +73,9 @@
nspec2D_xmin,nspec2D_xmax,nspec2D_ymin,nspec2D_ymax,NSPEC2D_BOTTOM,NSPEC2D_TOP, &
ibelm_xmin,ibelm_xmax,ibelm_ymin,ibelm_ymax,ibelm_bottom,ibelm_top, &
one_minus_sum_beta,factor_common, &
- one_minus_sum_beta_kappa,factor_common_kappa, &
+ one_minus_sum_beta_kappa,factor_common_kappa, &
alphaval,betaval,gammaval,&
- NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
+ NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
R_trace,R_xx,R_yy,R_xy,R_xz,R_yz, &
epsilondev_trace,epsilondev_xx,epsilondev_yy,epsilondev_xy, &
epsilondev_xz,epsilondev_yz,epsilon_trace_over_3, &
@@ -105,9 +105,9 @@
nspec2D_xmin,nspec2D_xmax,nspec2D_ymin,nspec2D_ymax,NSPEC2D_BOTTOM,NSPEC2D_TOP, &
ibelm_xmin,ibelm_xmax,ibelm_ymin,ibelm_ymax,ibelm_bottom,ibelm_top, &
one_minus_sum_beta,factor_common, &
- one_minus_sum_beta_kappa,factor_common_kappa, &
+ one_minus_sum_beta_kappa,factor_common_kappa, &
b_alphaval,b_betaval,b_gammaval, &
- NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
+ NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
b_R_trace,b_R_xx,b_R_yy,b_R_xy,b_R_xz,b_R_yz, &
b_epsilondev_trace,b_epsilondev_xx,b_epsilondev_yy,b_epsilondev_xy, &
b_epsilondev_xz,b_epsilondev_yz,b_epsilon_trace_over_3, &
@@ -440,13 +440,13 @@
! kappastore,mustore,jacobian,ibool, &
! ATTENUATION,deltat, &
! one_minus_sum_beta,factor_common, &
-! one_minus_sum_beta_kappa,factor_common_kappa, &
+! one_minus_sum_beta_kappa,factor_common_kappa, &
! alphaval,betaval,gammaval, &
-! NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
+! NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
! R_xx,R_yy,R_xy,R_xz,R_yz, &
-! R_trace,R_xx,R_yy,R_xy,R_xz,R_yz, &
+! R_trace,R_xx,R_yy,R_xy,R_xz,R_yz, &
! epsilondev_xx,epsilondev_yy,epsilondev_xy, &
-! epsilondev_trace,epsilondev_xx,epsilondev_yy,epsilondev_xy, &
+! epsilondev_trace,epsilondev_xx,epsilondev_yy,epsilondev_xy, &
! epsilondev_xz,epsilondev_yz,epsilon_trace_over_3, &
! ANISOTROPY,NSPEC_ANISO, &
! c11store,c12store,c13store,c14store,c15store,c16store,&
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_noDev.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -35,11 +35,11 @@
nspec2D_xmin,nspec2D_xmax,nspec2D_ymin,nspec2D_ymax,NSPEC2D_BOTTOM,NSPEC2D_TOP, &
ibelm_xmin,ibelm_xmax,ibelm_ymin,ibelm_ymax,ibelm_bottom,ibelm_top, &
one_minus_sum_beta,factor_common, &
- one_minus_sum_beta_kappa,factor_common_kappa, &
+ one_minus_sum_beta_kappa,factor_common_kappa, &
alphaval,betaval,gammaval, &
- NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
- R_trace,R_xx,R_yy,R_xy,R_xz,R_yz, &
- epsilondev_trace,epsilondev_xx,epsilondev_yy,epsilondev_xy,&
+ NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa, &
+ R_trace,R_xx,R_yy,R_xy,R_xz,R_yz, &
+ epsilondev_trace,epsilondev_xx,epsilondev_yy,epsilondev_xy,&
epsilondev_xz,epsilondev_yz,epsilon_trace_over_3, &
ANISOTROPY,NSPEC_ANISO, &
c11store,c12store,c13store,c14store,c15store,c16store, &
@@ -91,15 +91,15 @@
integer :: NSPEC_ATTENUATION_AB,NSPEC_ATTENUATION_AB_kappa
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB) :: one_minus_sum_beta
real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB) :: factor_common
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB_kappa) :: one_minus_sum_beta_kappa
- real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB_kappa) :: factor_common_kappa
+ real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB_kappa) :: one_minus_sum_beta_kappa
+ real(kind=CUSTOM_REAL), dimension(N_SLS,NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB_kappa) :: factor_common_kappa
real(kind=CUSTOM_REAL), dimension(N_SLS) :: alphaval,betaval,gammaval
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB,N_SLS) :: &
R_xx,R_yy,R_xy,R_xz,R_yz
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB_kappa,N_SLS) :: R_trace
+ real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB_kappa,N_SLS) :: R_trace
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_STRAIN_ONLY) :: &
- epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz
+ epsilondev_xx,epsilondev_yy,epsilondev_xy,epsilondev_xz,epsilondev_yz
real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ATTENUATION_AB_kappa) :: epsilondev_trace
real(kind=CUSTOM_REAL),dimension(NGLLX,NGLLY,NGLLZ,NSPEC_ADJOINT) :: epsilon_trace_over_3
@@ -162,7 +162,7 @@
c33,c34,c35,c36,c44,c45,c46,c55,c56,c66
! local attenuation parameters
- real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ) :: epsilondev_trace_loc, epsilondev_xx_loc, &
+ real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLY,NGLLZ) :: epsilondev_trace_loc, epsilondev_xx_loc, &
epsilondev_yy_loc, epsilondev_xy_loc, epsilondev_xz_loc, epsilondev_yz_loc
real(kind=CUSTOM_REAL) :: R_trace_val1,R_xx_val1,R_yy_val1
real(kind=CUSTOM_REAL) :: R_trace_val2,R_xx_val2,R_yy_val2
@@ -533,7 +533,7 @@
if(ATTENUATION) then
! use unrelaxed parameters if attenuation
mul = mul * one_minus_sum_beta(i,j,k,ispec)
- if(FULL_ATTENUATION_SOLID) kappal = kappal * one_minus_sum_beta_kappa(i,j,k,ispec)
+ if(FULL_ATTENUATION_SOLID) kappal = kappal * one_minus_sum_beta_kappa(i,j,k,ispec)
endif
! full anisotropic case, stress calculations
@@ -809,13 +809,13 @@
gammaval_loc = gammaval(i_sls)
if(FULL_ATTENUATION_SOLID) then
- ! term in trace
- factor_loc = kappastore(i,j,k,ispec) * factor_common_kappa(i_sls,i,j,k,ispec)
+ ! term in trace
+ factor_loc = kappastore(i,j,k,ispec) * factor_common_kappa(i_sls,i,j,k,ispec)
- Sn = factor_loc * epsilondev_trace(i,j,k,ispec)
- Snp1 = factor_loc * epsilondev_trace_loc(i,j,k)
- R_trace(i,j,k,ispec,i_sls) = alphaval_loc * R_trace(i,j,k,ispec,i_sls) + &
- betaval_loc * Sn + gammaval_loc * Snp1
+ Sn = factor_loc * epsilondev_trace(i,j,k,ispec)
+ Snp1 = factor_loc * epsilondev_trace_loc(i,j,k)
+ R_trace(i,j,k,ispec,i_sls) = alphaval_loc * R_trace(i,j,k,ispec,i_sls) + &
+ betaval_loc * Sn + gammaval_loc * Snp1
endif
! term in xx yy zz xy xz yz
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -98,9 +98,9 @@
if ( phase_is_inner .eqv. .false. ) then
if (mod(it_dsm,Ntime_step_dsm+1) == 0 .or. it == 1) then
call read_dsm_file(Veloc_dsm_boundary,Tract_dsm_boundary,num_abs_boundary_faces,it_dsm)
- end if
- end if
- end if
+ endif
+ endif
+ endif
! checks if anything to do
if( num_abs_boundary_faces == 0 ) return
@@ -148,7 +148,7 @@
vx = vx - Veloc_dsm_boundary(1,it_dsm,igll,iface)
vy = vy - Veloc_dsm_boundary(2,it_dsm,igll,iface)
vz = vz - Veloc_dsm_boundary(3,it_dsm,igll,iface)
- end if
+ endif
! gets associated normal
nx = abs_boundary_normal(1,igll,iface)
ny = abs_boundary_normal(2,igll,iface)
@@ -163,10 +163,10 @@
tz = rho_vp(i,j,k,ispec)*vn*nz + rho_vs(i,j,k,ispec)*(vz-vn*nz)
if (USE_VADIM) then
- tx = -Tract_dsm_boundary(1,it_dsm,igll,iface) + tx
+ tx = -Tract_dsm_boundary(1,it_dsm,igll,iface) + tx
ty = -Tract_dsm_boundary(2,it_dsm,igll,iface) + ty
- tz = -Tract_dsm_boundary(3,it_dsm,igll,iface) + tz
- end if
+ tz = -Tract_dsm_boundary(3,it_dsm,igll,iface) + tz
+ endif
! gets associated, weighted jacobian
jacobianw = abs_boundary_jacobian2Dw(igll,iface)
@@ -229,18 +229,18 @@
it_dsm = 1
write(*,*) 'read dsm files',it_dsm
do iface=1,num_abs_boundary_faces
-
+
igll = 0
do j=1,5 !! DK DK why use 5 and not NGLLY here? (I assume 5 means 5 GLL points here?)
do i=1,5 !! DK DK why use 5 and not NGLLX here? (I assume 5 means 5 GLL points here?)
igll = igll + 1
read(IIN_veloc_dsm) dsm_boundary_tmp(:,:,i,j)
- Veloc_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
+ Veloc_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
read(IIN_tract_dsm) dsm_boundary_tmp(:,:,i,j)
- Tract_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
+ Tract_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
enddo
enddo
enddo
-
+
end subroutine read_dsm_file
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_dynamic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_dynamic.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_dynamic.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -123,7 +123,7 @@
if (nbfaults==0) then
if (myrank==0) write(IMAIN,*) 'No faults found in file DATA/Par_file_faults'
return
- elseif (nbfaults==1) then
+ else if (nbfaults==1) then
if (myrank==0) write(IMAIN,*) 'There is 1 fault in file DATA/Par_file_faults'
else
if (myrank==0) write(IMAIN,*) 'There are ', nbfaults, ' faults in file DATA/Par_file_faults'
@@ -230,7 +230,7 @@
!WARNING : Quick and dirty free surface condition at z=0
! do k=1,bc%nglob
! if (abs(bc%zcoord(k)-0.e0_CUSTOM_REAL) <= SMALLVAL) bc%T0(2,k) = 0
- ! end do
+ ! enddo
! Set friction parameters and initialize friction variables
allocate(bc%MU(bc%nglob))
@@ -467,7 +467,7 @@
! where (bc%zcoord(:) > - SMALLVAL) T(2,:) = 0
! do k=1,bc%nglob
! if (abs(bc%zcoord(k)-0.e0_CUSTOM_REAL) < SMALLVAL) T(2,k) = 0.e0_CUSTOM_REAL
- ! end do
+ ! enddo
! add initial stress
T = T + bc%T0
@@ -822,7 +822,7 @@
b11 = w/(abs(x)-W1-w)
b12 = w/(abs(x)-W1)
B1 = HALF * (ONE + tanh(b11 + b12))
- elseif(abs(x)<=W1) then
+ else if(abs(x)<=W1) then
B1 = 1._CUSTOM_REAL
else
B1 = 0._CUSTOM_REAL
@@ -832,7 +832,7 @@
b21 = w/(abs(z-hypo_z)-W2-w)
b22 = w/(abs(z-hypo_z)-W2)
B2 = HALF * (ONE + tanh(b21 + b22))
- elseif(abs(z-hypo_z)<=W2) then
+ else if(abs(z-hypo_z)<=W2) then
B2 = 1._CUSTOM_REAL
else
B2 = 0._CUSTOM_REAL
@@ -841,7 +841,7 @@
f%a(i) = 0.008 + 0.008 * (ONE - B1*B2)
f%Vw(i) = 0.1 + 0.9 * (ONE - B1*B2)
- elseif( abs(x)<=W1 .and. abs(z-hypo_z)<=W2 ) then
+ else if( abs(x)<=W1 .and. abs(z-hypo_z)<=W2 ) then
f%a(i) = 0.008
f%Vw(i) = 0.1_CUSTOM_REAL
else
@@ -959,7 +959,7 @@
write(IOUT,*) "j k t"
do i = 1,size(dataXZ%tRUP)
write(IOUT,'(3(E15.7))') dataXZ%xcoord(i), -dataXZ%zcoord(i), dataXZ%tRUP(i)
- end do
+ enddo
close(IOUT)
@@ -1319,10 +1319,10 @@
if(fl==0.) then
rtsafe=x2
return
- elseif(fh==0.) then
+ else if(fh==0.) then
rtsafe=x2
return
- elseif(fl<0) then
+ else if(fl<0) then
xl=x1
xh=x2
else
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_kinematic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_kinematic.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/fault_solver_kinematic.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -85,7 +85,7 @@
if (nbfaults==0) then
if (myrank==0) write(IMAIN,*) 'No faults found in file DATA/Par_file_faults'
return
- elseif (nbfaults==1) then
+ else if (nbfaults==1) then
if (myrank==0) write(IMAIN,*) 'There is 1 fault in file DATA/Par_file_faults'
else
if (myrank==0) write(IMAIN,*) 'There are ', nbfaults, ' faults in file DATA/Par_file_faults'
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -288,7 +288,7 @@
if( PML_CONDITIONS ) then
print*, 'please modify Par_file and recompile solver'
stop 'STACEY_ABSORBING_CONDITIONS and PML_CONDITIONS are both set to .true.'
- elseif( PML_INSTEAD_OF_FREE_SURFACE ) then
+ else if( PML_INSTEAD_OF_FREE_SURFACE ) then
print*, 'please modify Par_file and recompile solver'
stop 'PML_INSTEAD_OF_FREE_SURFACE = .true. is incompatible with STACEY_ABSORBING_CONDITIONS = .true.'
endif
@@ -303,7 +303,7 @@
if( STACEY_INSTEAD_OF_FREE_SURFACE ) then
print*, 'please modify Par_file and recompile solver'
stop 'STACEY_INSTEAD_OF_FREE_SURFACE = .true. is incompatible with PML_CONDITIONS = .true.'
- elseif( .not. SUPPRESS_UTM_PROJECTION ) then
+ else if( .not. SUPPRESS_UTM_PROJECTION ) then
print*, 'please modify Par_file and recompile solver'
stop 'SUPPRESS_UTM_PROJECTION must be activated when PML_CONDITIONS is set to .true.'
endif
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_receivers.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_receivers.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_receivers.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -323,7 +323,7 @@
if(myrank == 0) then
iproc = minloc(distmin_ele_all)
altitude_rec(1) = elevation_all(iproc(1))
- end if
+ endif
call bcast_all_dp(altitude_rec,1)
elevation(irec) = altitude_rec(1)
@@ -1078,7 +1078,7 @@
sngl(stlat),sngl(stlon),sngl(stele),sngl(stbur)
endif
- end if
+ endif
enddo
close(IIN)
close(IOUT)
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_source.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_source.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/locate_source.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -233,7 +233,7 @@
if(myrank == 0) then
iproc = minloc(distmin_ele_all)
altitude_source(1) = elevation_all(iproc(1))
- end if
+ endif
call bcast_all_dp(altitude_source,1)
elevation(isource) = altitude_source(1)
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/pml_compute_accel_contribution.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -90,7 +90,7 @@
else
coef1_1 = deltat/2.0d0
coef2_1 = deltat/2.0d0
- end if
+ endif
if( ispec_is_elastic(ispec) ) then
@@ -109,7 +109,7 @@
rmemory_displ_elastic(3,i,j,k,ispec_CPML,2) = 0.0
rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) = 0.0
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
rmemory_potential_acoustic(i,j,k,ispec_CPML,1)=coef0_1 * rmemory_potential_acoustic(i,j,k,ispec_CPML,1) &
+ (potential_acoustic(iglob) + deltat*potential_dot_acoustic(iglob)) * coef1_1 &
@@ -154,7 +154,7 @@
A5 * rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) &
)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
potential_dot_dot_acoustic_CPML(i,j,k,ispec_CPML) = fac4 * 1.0/kappal *jacobianl * &
( A1 * potential_dot_acoustic(iglob) + A2 * potential_acoustic(iglob) + &
@@ -164,7 +164,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == CPML_Y_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_Y_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Y-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -179,7 +179,7 @@
else
coef1_1 = deltat/2.0d0
coef2_1 = deltat/2.0d0
- end if
+ endif
if( ispec_is_elastic(ispec) ) then
@@ -198,7 +198,7 @@
rmemory_displ_elastic(3,i,j,k,ispec_CPML,2) = 0.0
rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) = 0.0
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
rmemory_potential_acoustic(i,j,k,ispec_CPML,1)=coef0_1 * rmemory_potential_acoustic(i,j,k,ispec_CPML,1) &
+ (potential_acoustic(iglob) + deltat*potential_dot_acoustic(iglob)) * coef1_1 &
@@ -243,7 +243,7 @@
A5 * rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) &
)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
potential_dot_dot_acoustic_CPML(i,j,k,ispec_CPML) = fac4 * 1.0/kappal *jacobianl * &
( A1 * potential_dot_acoustic(iglob) + A2 * potential_acoustic(iglob) + &
@@ -253,7 +253,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == CPML_Z_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_Z_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- Z-surface C-PML ---------------------------------
!------------------------------------------------------------------------------
@@ -268,7 +268,7 @@
else
coef1_1 = deltat/2.0d0
coef2_1 = deltat/2.0d0
- end if
+ endif
if( ispec_is_elastic(ispec) ) then
@@ -287,7 +287,7 @@
rmemory_displ_elastic(3,i,j,k,ispec_CPML,2) = 0.0
rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) = 0.0
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
rmemory_potential_acoustic(i,j,k,ispec_CPML,1)=coef0_1 * rmemory_potential_acoustic(i,j,k,ispec_CPML,1) &
+ (potential_acoustic(iglob) + deltat*potential_dot_acoustic(iglob)) * coef1_1 &
@@ -332,7 +332,7 @@
A5 * rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) &
)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
potential_dot_dot_acoustic_CPML(i,j,k,ispec_CPML) = fac4 * 1.0/kappal *jacobianl * &
( A1 * potential_dot_acoustic(iglob) + A2 * potential_acoustic(iglob) + &
@@ -342,7 +342,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == CPML_XY_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XY_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XY-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -357,7 +357,7 @@
else
coef1_1 = deltat/2.0d0
coef2_1 = deltat/2.0d0
- end if
+ endif
coef0_2 = coef0_1
coef1_2 = coef1_1
@@ -386,7 +386,7 @@
+ displ(3,iglob) * (it-0.0) * deltat * coef2_2
rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) = 0.0
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
rmemory_potential_acoustic(i,j,k,ispec_CPML,1)=coef0_1 * rmemory_potential_acoustic(i,j,k,ispec_CPML,1) &
+ (potential_acoustic(iglob) + deltat*potential_dot_acoustic(iglob)) * coef1_1 &
@@ -409,7 +409,7 @@
+ alpha_store(i,j,k,ispec_CPML)**2 * ( d_store_x(i,j,k,ispec_CPML) * k_store_y(i,j,k,ispec_CPML) &
+ d_store_y(i,j,k,ispec_CPML) * k_store_x(i,j,k,ispec_CPML) ) + alpha_store(i,j,k,ispec_CPML)**2 &
* (it+0.0) * deltat * d_store_x(i,j,k,ispec_CPML) * d_store_y(i,j,k,ispec_CPML)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
A3 = -2.0 * alpha_store(i,j,k,ispec_CPML) * d_store_x(i,j,k,ispec_CPML) * d_store_y(i,j,k,ispec_CPML) + &
alpha_store(i,j,k,ispec_CPML)**2 * ( d_store_x(i,j,k,ispec_CPML)*k_store_y(i,j,k,ispec_CPML) &
+ d_store_y(i,j,k,ispec_CPML) * k_store_x(i,j,k,ispec_CPML) ) + alpha_store(i,j,k,ispec_CPML)**2 &
@@ -446,7 +446,7 @@
A5 * rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) &
)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
potential_dot_dot_acoustic_CPML(i,j,k,ispec_CPML) = fac4 * 1.0/kappal *jacobianl * &
( A1 * potential_dot_acoustic(iglob) + A2 * potential_acoustic(iglob) + &
@@ -456,7 +456,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == CPML_XZ_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- XZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -471,7 +471,7 @@
else
coef1_1 = deltat/2.0d0
coef2_1 = deltat/2.0d0
- end if
+ endif
coef0_2 = coef0_1
coef1_2 = coef1_1
@@ -500,7 +500,7 @@
+ displ(3,iglob) * (it-0.0) * deltat * coef2_2
rmemory_displ_elastic(3,i,j,k,ispec_CPML,3)= 0.0
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
rmemory_potential_acoustic(i,j,k,ispec_CPML,1)=coef0_1 * rmemory_potential_acoustic(i,j,k,ispec_CPML,1) &
+ (potential_acoustic(iglob) + deltat*potential_dot_acoustic(iglob)) * coef1_1 &
@@ -523,7 +523,7 @@
+ alpha_store(i,j,k,ispec_CPML)**2 * ( d_store_x(i,j,k,ispec_CPML) * k_store_z(i,j,k,ispec_CPML) &
+ d_store_z(i,j,k,ispec_CPML) * k_store_x(i,j,k,ispec_CPML) ) + alpha_store(i,j,k,ispec_CPML)**2 &
* (it+0.0) * deltat * d_store_x(i,j,k,ispec_CPML) * d_store_z(i,j,k,ispec_CPML)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
A3 = -2.0 * alpha_store(i,j,k,ispec_CPML) * d_store_x(i,j,k,ispec_CPML) * d_store_z(i,j,k,ispec_CPML) &
+ alpha_store(i,j,k,ispec_CPML)**2 * ( d_store_x(i,j,k,ispec_CPML) * k_store_z(i,j,k,ispec_CPML) &
+ d_store_z(i,j,k,ispec_CPML) * k_store_x(i,j,k,ispec_CPML) ) + alpha_store(i,j,k,ispec_CPML)**2 &
@@ -560,7 +560,7 @@
A5 * rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) &
)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
potential_dot_dot_acoustic_CPML(i,j,k,ispec_CPML) = fac4 * 1.0/kappal *jacobianl * &
( A1 * potential_dot_acoustic(iglob) + A2 * potential_acoustic(iglob) + &
@@ -570,7 +570,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == CPML_YZ_ONLY ) then
+ else if( CPML_regions(ispec_CPML) == CPML_YZ_ONLY ) then
!------------------------------------------------------------------------------
!---------------------------- YZ-edge C-PML -----------------------------------
!------------------------------------------------------------------------------
@@ -585,7 +585,7 @@
else
coef1_1 = deltat/2.0d0
coef2_1 = deltat/2.0d0
- end if
+ endif
coef0_2 = coef0_1
coef1_2 = coef1_1
@@ -614,7 +614,7 @@
+ displ(3,iglob) * (it-0.0) * deltat * coef2_2
rmemory_displ_elastic(3,i,j,k,ispec_CPML,3)=0.d0
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
rmemory_potential_acoustic(i,j,k,ispec_CPML,1)=coef0_1 * rmemory_potential_acoustic(i,j,k,ispec_CPML,1) &
+ (potential_acoustic(iglob) + deltat*potential_dot_acoustic(iglob)) * coef1_1 &
@@ -637,7 +637,7 @@
+ alpha_store(i,j,k,ispec_CPML)**2 * ( d_store_y(i,j,k,ispec_CPML) * k_store_z(i,j,k,ispec_CPML) &
+ d_store_z(i,j,k,ispec_CPML) * k_store_y(i,j,k,ispec_CPML) ) + alpha_store(i,j,k,ispec_CPML)**2 &
* (it+0.0) * deltat * d_store_y(i,j,k,ispec_CPML) * d_store_z(i,j,k,ispec_CPML)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
A3 = -2.0 * alpha_store(i,j,k,ispec_CPML) * d_store_y(i,j,k,ispec_CPML) * d_store_z(i,j,k,ispec_CPML) &
+ alpha_store(i,j,k,ispec_CPML)**2 * ( d_store_y(i,j,k,ispec_CPML) * k_store_z(i,j,k,ispec_CPML) &
+ d_store_z(i,j,k,ispec_CPML) * k_store_y(i,j,k,ispec_CPML) ) + alpha_store(i,j,k,ispec_CPML)**2 &
@@ -674,7 +674,7 @@
A5 * rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) &
)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
potential_dot_dot_acoustic_CPML(i,j,k,ispec_CPML) = fac4 * 1.0/kappal *jacobianl * &
( A1 * potential_dot_acoustic(iglob) + A2 * potential_acoustic(iglob) + &
@@ -684,7 +684,7 @@
)
endif
- elseif( CPML_regions(ispec_CPML) == CPML_XYZ ) then
+ else if( CPML_regions(ispec_CPML) == CPML_XYZ ) then
!------------------------------------------------------------------------------
!---------------------------- XYZ-corner C-PML --------------------------------
!------------------------------------------------------------------------------
@@ -699,7 +699,7 @@
else
coef1_1 = deltat/2.0d0
coef2_1 = deltat/2.0d0
- end if
+ endif
coef0_2 = coef0_1
coef1_2 = coef1_1
@@ -738,7 +738,7 @@
+ (displ(3,iglob) + deltat * veloc(3,iglob)) * ((it+0.0) * deltat)**2 * coef1_3 &
+ displ(3,iglob) * ((it-0.0) * deltat)**2 * coef2_3
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
rmemory_potential_acoustic(i,j,k,ispec_CPML,1)=coef0_1 * rmemory_potential_acoustic(i,j,k,ispec_CPML,1) &
+ (potential_acoustic(iglob) + deltat*potential_dot_acoustic(iglob)) * coef1_1 &
@@ -788,7 +788,7 @@
if( ispec_is_elastic(ispec) ) then
A3 = temp_A3 + (it+0.0) * deltat*temp_A4 !+ ((it+0.0) * deltat)**2*temp_A5
A4 = -temp_A4 ! -2.0*(it+0.0) * deltat*temp_A5
- elseif( ispec_is_acoustic(ispec)) then
+ else if( ispec_is_acoustic(ispec)) then
A3 = temp_A3 + (it+0.5)*deltat*temp_A4 !+ ((it+0.5)*deltat)**2*temp_A5
A4 = -temp_A4 !-2.0*(it+0.5)*deltat*temp_A5
endif
@@ -822,7 +822,7 @@
A5 * rmemory_displ_elastic(3,i,j,k,ispec_CPML,3) &
)
- elseif( ispec_is_acoustic(ispec) ) then
+ else if( ispec_is_acoustic(ispec) ) then
potential_dot_dot_acoustic_CPML(i,j,k,ispec_CPML) = fac4 * 1.0/kappal *jacobianl * &
( A1 * potential_dot_acoustic(iglob) + A2 * potential_acoustic(iglob) + &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/prepare_timerun.F90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -747,27 +747,27 @@
CPML_type(ispec_CPML) = 1
! Y_surface C-PML
- elseif( CPML_regions(ispec_CPML) == 2 ) then
+ else if( CPML_regions(ispec_CPML) == 2 ) then
CPML_type(ispec_CPML) = 1
! Z_surface C-PML
- elseif( CPML_regions(ispec_CPML) == 3 ) then
+ else if( CPML_regions(ispec_CPML) == 3 ) then
CPML_type(ispec_CPML) = 1
! XY_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 4 ) then
+ else if( CPML_regions(ispec_CPML) == 4 ) then
CPML_type(ispec_CPML) = 2
! XZ_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 5 ) then
+ else if( CPML_regions(ispec_CPML) == 5 ) then
CPML_type(ispec_CPML) = 2
! YZ_edge C-PML
- elseif( CPML_regions(ispec_CPML) == 6 ) then
+ else if( CPML_regions(ispec_CPML) == 6 ) then
CPML_type(ispec_CPML) = 2
! XYZ_corner C-PML
- elseif( CPML_regions(ispec_CPML) == 7 ) then
+ else if( CPML_regions(ispec_CPML) == 7 ) then
CPML_type(ispec_CPML) = 3
endif
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/write_output_ASCII.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/write_output_ASCII.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/write_output_ASCII.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -69,7 +69,7 @@
! ASCII format case
open(unit=IOUT,file=final_LOCAL_PATH(1:len_trim(final_LOCAL_PATH))//&
sisname(1:len_trim(sisname)),status='unknown')
- end if
+ endif
! make sure we never write more than the maximum number of time steps
! subtract half duration of the source to make sure travel time is correct
@@ -105,7 +105,7 @@
! ASCII format case
!write(IOUT,*) time_t,' ',seismograms(iorientation,irec_local,isample)
write(IOUT,*) time_t,' ',one_seismogram(iorientation,isample)
- end if
+ endif
else
call exit_MPI(myrank,'incorrect record label')
Modified: seismo/3D/SPECFEM3D/trunk/utils/unused_routines/model_interface_bedrock.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/utils/unused_routines/model_interface_bedrock.f90 2013-04-13 02:08:32 UTC (rev 21854)
+++ seismo/3D/SPECFEM3D/trunk/utils/unused_routines/model_interface_bedrock.f90 2013-04-13 02:16:07 UTC (rev 21855)
@@ -250,7 +250,7 @@
! rhostore(i,j,k,ispec) = rho
! vpstore(i,j,k,ispec) = vp
! vsstore(i,j,k,ispec) = vs
-! end if
+! endif
! kappastore(i,j,k,ispec) = rhostore(i,j,k,ispec)*(vpstore(i,j,k,ispec)*vpstore(i,j,k,ispec) - &
! 4.d0*vsstore(i,j,k,ispec)*vsstore(i,j,k,ispec)/3.d0)
More information about the CIG-COMMITS
mailing list