[cig-commits] [commit] devel: Remove irrelevant comments. (033ef46)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu May 1 00:50:37 PDT 2014
Repository : ssh://geoshell/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/cb32c88d6155d7974561a6f72fc17aea596e2c4d...50aa953c1db3f565d76415f5305410a529996b75
>---------------------------------------------------------------
commit 033ef46c7533714847a737506e58261e50bf86a7
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat Jan 11 03:30:57 2014 -0500
Remove irrelevant comments.
These are just code review; not actually explaining anything.
>---------------------------------------------------------------
033ef46c7533714847a737506e58261e50bf86a7
src/shared/read_parameter_file.f90 | 4 ++--
src/specfem3D/compute_stacey_viscoelastic.f90 | 24 ++++--------------------
src/specfem3D/initialize_simulation.f90 | 2 +-
src/specfem3D/read_mesh_databases.F90 | 4 +---
src/specfem3D/read_mesh_databases_adios.F90 | 5 +----
src/specfem3D/specfem3D_par.f90 | 4 ++--
6 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/src/shared/read_parameter_file.f90 b/src/shared/read_parameter_file.f90
index 0ad161f..f4586be 100644
--- a/src/shared/read_parameter_file.f90
+++ b/src/shared/read_parameter_file.f90
@@ -54,7 +54,7 @@
logical USE_FORCE_POINT_SOURCE,STACEY_INSTEAD_OF_FREE_SURFACE,USE_RICKER_TIME_FUNCTION
logical PML_CONDITIONS,PML_INSTEAD_OF_FREE_SURFACE,FULL_ATTENUATION_SOLID
- character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,CMTSOLUTION,FORCESOLUTION,TRAC_PATH ! VM VM adds TRAC_PATH
+ character(len=256) LOCAL_PATH,TOMOGRAPHY_PATH,CMTSOLUTION,FORCESOLUTION,TRAC_PATH
! local variables
integer ::ios,icounter,isource,idummy,nproc_eta_old,nproc_xi_old
@@ -174,7 +174,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
+ !! read the traction path directory
if (OLD_TEST_TO_FIX_ONE_DAY) then
call read_value_string(TRAC_PATH, 'TRAC_PATH')
if(err_occurred() /= 0) return
diff --git a/src/specfem3D/compute_stacey_viscoelastic.f90 b/src/specfem3D/compute_stacey_viscoelastic.f90
index c5554f3..20e1d62 100644
--- a/src/specfem3D/compute_stacey_viscoelastic.f90
+++ b/src/specfem3D/compute_stacey_viscoelastic.f90
@@ -79,16 +79,10 @@
real(kind=CUSTOM_REAL) vx,vy,vz,nx,ny,nz,tx,ty,tz,vn,jacobianw
integer :: ispec,iglob,i,j,k,iface,igll
-! VM VM for new method
-!! 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
-!! VM VM I did it
+! for new method
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 VM VM: I had to add this missing declaration; but then of course now it is declared but undefined / unassigned
integer :: it_dsm
if (OLD_TEST_TO_FIX_ONE_DAY) then
@@ -285,18 +279,14 @@
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 why use 5 and not NGLLX here? (I assume 5 means 5 GLL points here?)
- !! VM VM fixed to NGLLX
real(kind=CUSTOM_REAL) :: dsm_boundary_tmp(3,Ntime_step_dsm,NGLLX,NGLLY)
it_dsm = 1
- !write(*,*) 'read dsm files',it_dsm
do iface=1,num_abs_boundary_faces
igll = 0
- do j=1,NGLLY !! DK DK why use 5 and not NGLLY here? (I assume 5 means 5 GLL points here?)
- do i=1,NGLLX !! DK DK why use 5 and not NGLLX here? (I assume 5 means 5 GLL points here?)
- !! VM VM Correction 5->NGLLX or NGLLY
+ do j=1,NGLLY
+ do i=1,NGLLX
igll = igll + 1
read(IIN_veloc_dsm) dsm_boundary_tmp(:,:,i,j)
Veloc_dsm_boundary(:,:,igll,iface) = dsm_boundary_tmp(:,:,i,j)
@@ -340,16 +330,10 @@
! GPU_MODE variables
integer(kind=8) :: Mesh_pointer
-! VM VM for new method
-!! 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
-!! VM VM I did it
+ ! for new method
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 VM VM: I had to add this missing declaration; but then of course now it is declared but undefined / unassigned
integer :: it_dsm
if (OLD_TEST_TO_FIX_ONE_DAY) then
diff --git a/src/specfem3D/initialize_simulation.f90 b/src/specfem3D/initialize_simulation.f90
index 17b6e43..1dcba2b 100644
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@ -148,7 +148,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 (OLD_TEST_TO_FIX_ONE_DAY) 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)
if (ADIOS_FOR_MESH) then
diff --git a/src/specfem3D/read_mesh_databases.F90 b/src/specfem3D/read_mesh_databases.F90
index 3f5b482..8580f90 100644
--- a/src/specfem3D/read_mesh_databases.F90
+++ b/src/specfem3D/read_mesh_databases.F90
@@ -421,9 +421,7 @@
if( ier /= 0 ) stop 'error allocating array abs_boundary_ispec etc.'
if (OLD_TEST_TO_FIX_ONE_DAY) then
- ! VM for new method
-!! 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
+ ! for new method
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', &
diff --git a/src/specfem3D/read_mesh_databases_adios.F90 b/src/specfem3D/read_mesh_databases_adios.F90
index a0a7970..bc39017 100644
--- a/src/specfem3D/read_mesh_databases_adios.F90
+++ b/src/specfem3D/read_mesh_databases_adios.F90
@@ -856,10 +856,7 @@ subroutine read_mesh_databases_adios()
if( ier /= 0 ) stop 'error allocating array abs_boundary_ispec etc.'
if (OLD_TEST_TO_FIX_ONE_DAY) then
- ! VM for new method
- !! DK DK for VM VM: these two arrays are undeclared, thus I comment them out i
- ! for now otherwise the code does not compile
- !! VM VM : I already declared these two array in the specfem_par module
+ ! for new method
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', &
diff --git a/src/specfem3D/specfem3D_par.f90 b/src/specfem3D/specfem3D_par.f90
index 57ac3ee..fd3c7b3 100644
--- a/src/specfem3D/specfem3D_par.f90
+++ b/src/specfem3D/specfem3D_par.f90
@@ -87,7 +87,7 @@ module specfem_par
integer, dimension(:), allocatable :: free_surface_ispec
integer :: num_free_surface_faces
-! VM for new method
+! for new method
real(kind=CUSTOM_REAL), dimension(:,:,:,:), allocatable :: Veloc_dsm_boundary,Tract_dsm_boundary
! attenuation
@@ -103,7 +103,7 @@ module specfem_par
! time loop step
integer :: it
-! VM for new method
+! for new method
integer :: it_dsm
! parameters for the source
More information about the CIG-COMMITS
mailing list