[cig-commits] r22136 - in seismo/3D/SPECFEM3D/trunk/src: shared specfem3D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Sat May 25 14:04:15 PDT 2013
Author: dkomati1
Date: 2013-05-25 14:04:15 -0700 (Sat, 25 May 2013)
New Revision: 22136
Modified:
seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in
seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90
seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90
Log:
renamed a flag and updated some comments
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in 2013-05-24 17:42:50 UTC (rev 22135)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/constants.h.in 2013-05-25 21:04:15 UTC (rev 22136)
@@ -443,7 +443,7 @@
integer, parameter :: IMODEL_IPATI = 10
integer, parameter :: IMODEL_IPATI_WATER = 11
-! Vadim tests
- logical, parameter :: USE_VADIM = .false.
+! some old tests (currently unstable; do not remove them though, we might fix this one day)
+ logical, parameter :: OLD_TEST_TO_FIX_ONE_DAY = .false.
integer, parameter :: IIN_veloc_dsm = 51, IIN_tract_dsm = 52, Ntime_step_dsm = 100
Modified: seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90 2013-05-24 17:42:50 UTC (rev 22135)
+++ seismo/3D/SPECFEM3D/trunk/src/shared/read_parameter_file.f90 2013-05-25 21:04:15 UTC (rev 22136)
@@ -173,7 +173,7 @@
call read_value_logical(PRINT_SOURCE_TIME_FUNCTION, 'solver.PRINT_SOURCE_TIME_FUNCTION')
if(err_occurred() /= 0) return
!! VM VM read the traction path directory
- if (USE_VADIM) then
+ if (OLD_TEST_TO_FIX_ONE_DAY) then
call read_value_string(TRAC_PATH, 'TRAC_PATH')
if(err_occurred() /= 0) return
endif
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-05-24 17:42:50 UTC (rev 22135)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 2013-05-25 21:04:15 UTC (rev 22136)
@@ -243,7 +243,7 @@
endif
! adds source term (single-force/moment-tensor solution)
- if (.not. USE_VADIM) call compute_add_sources_viscoelastic( NSPEC_AB,NGLOB_AB,accel, &
+ if (.not. OLD_TEST_TO_FIX_ONE_DAY) call compute_add_sources_viscoelastic( NSPEC_AB,NGLOB_AB,accel, &
ibool,ispec_is_inner,phase_is_inner, &
NSOURCES,myrank,it,islice_selected_source,ispec_selected_source,&
hdur,hdur_gaussian,tshift_src,dt,t0,sourcearrays, &
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90 2013-05-24 17:42:50 UTC (rev 22135)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/compute_stacey_viscoelastic.f90 2013-05-25 21:04:15 UTC (rev 22136)
@@ -84,7 +84,7 @@
integer :: ispec,iglob,i,j,k,iface,igll
! VM VM for new method
-!! DK DK for Vadim: this MUST be declared in the main program (i.e. in the calling program) and sent
+!! DK DK for VM VM: this MUST be declared in the main program (i.e. in the calling program) and sent
!! DK DK to this subroutine as an argument, otherwise it is allocated and deallocated every time the code
!! DK DK enters this subroutine, thus this will be extremely slow, and also what the array contains
!! DK DK will be lost between two calls
@@ -92,10 +92,10 @@
real(kind=CUSTOM_REAL) :: Veloc_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces)
real(kind=CUSTOM_REAL) :: Tract_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces)
-!! DK DK for Vadim: I had to add this missing declaration; but then of course now it is declared but undefined / unassigned
+!! DK DK for VM VM: I had to add this missing declaration; but then of course now it is declared but undefined / unassigned
integer :: it_dsm
- if (USE_VADIM) then
+ if (OLD_TEST_TO_FIX_ONE_DAY) then
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)
@@ -145,7 +145,7 @@
vx=veloc(1,iglob)
vy=veloc(2,iglob)
vz=veloc(3,iglob)
- if (USE_VADIM) then
+ if (OLD_TEST_TO_FIX_ONE_DAY) then
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)
@@ -163,7 +163,7 @@
ty = rho_vp(i,j,k,ispec)*vn*ny + rho_vs(i,j,k,ispec)*(vy-vn*ny)
tz = rho_vp(i,j,k,ispec)*vn*nz + rho_vs(i,j,k,ispec)*(vz-vn*nz)
- if (USE_VADIM) then
+ if (OLD_TEST_TO_FIX_ONE_DAY) then
tx = tx -Tract_dsm_boundary(1,it_dsm,igll,iface)
ty = ty -Tract_dsm_boundary(2,it_dsm,igll,iface)
tz = tz -Tract_dsm_boundary(3,it_dsm,igll,iface)
@@ -209,7 +209,7 @@
endif
endif
- if (USE_VADIM) then
+ if (OLD_TEST_TO_FIX_ONE_DAY) then
if (phase_is_inner .eqv. .true.) then
it_dsm = it_dsm + 1
endif
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90 2013-05-24 17:42:50 UTC (rev 22135)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/initialize_simulation.f90 2013-05-25 21:04:15 UTC (rev 22136)
@@ -136,7 +136,7 @@
! reads in numbers of spectral elements and points for the part of the mesh handled by this process
call create_name_database(prname,myrank,LOCAL_PATH)
- if (USE_VADIM) call create_name_database(dsmname,myrank,TRAC_PATH) !! VM VM
+ if (OLD_TEST_TO_FIX_ONE_DAY) call create_name_database(dsmname,myrank,TRAC_PATH) !! VM VM
open(unit=27,file=prname(1:len_trim(prname))//'external_mesh.bin',status='old',&
action='read',form='unformatted',iostat=ier)
if( ier /= 0 ) then
Modified: seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90
===================================================================
--- seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90 2013-05-24 17:42:50 UTC (rev 22135)
+++ seismo/3D/SPECFEM3D/trunk/src/specfem3D/read_mesh_databases.f90 2013-05-25 21:04:15 UTC (rev 22136)
@@ -400,10 +400,10 @@
abs_boundary_normal(NDIM,NGLLSQUARE,num_abs_boundary_faces),stat=ier)
if( ier /= 0 ) stop 'error allocating array abs_boundary_ispec etc.'
- if (USE_VADIM) then
+ if (OLD_TEST_TO_FIX_ONE_DAY) then
! VM for new method
-!! DK DK for Vadim: these two arrays are undeclared, thus I comment them out for now otherwise the code does not compile
-!! VM VM : I already decalred these 2 array in specfem_par module
+!! DK DK for VM VM: these two arrays are undeclared, thus I comment them out for now otherwise the code does not compile
+!! VM VM : I already declared these two array in the specfem_par module
allocate(Veloc_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces))
allocate(Tract_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces))
open(unit=IIN_veloc_dsm,file=dsmname(1:len_trim(dsmname))//'vel.bin',status='old', &
More information about the CIG-COMMITS
mailing list