[cig-commits] [commit] devel: Remove some commented and unused code. (911ac0e)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Jun 4 13:02:05 PDT 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branch : devel
Link : https://github.com/geodynamics/specfem3d_globe/compare/754300e5a26e2a5d17069e661645fe819a7857a1...cd83b686a7c6014e132933f685157d43151a665e
>---------------------------------------------------------------
commit 911ac0efe69b210f9d102a641a4a9895f3e67aab
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sat May 31 00:21:34 2014 -0400
Remove some commented and unused code.
>---------------------------------------------------------------
911ac0efe69b210f9d102a641a4a9895f3e67aab
src/meshfem3D/model_ppm.f90 | 2 --
src/shared/asdf_helpers_definitions.f90 | 13 -------------
src/shared/save_header_file.F90 | 8 --------
src/shared/write_VTK_file.f90 | 2 --
src/specfem3D/write_movie_volume.f90 | 8 --------
src/specfem3D/write_output_SAC.f90 | 7 ++++---
6 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/src/meshfem3D/model_ppm.f90 b/src/meshfem3D/model_ppm.f90
index 0c8be9e..690868d 100644
--- a/src/meshfem3D/model_ppm.f90
+++ b/src/meshfem3D/model_ppm.f90
@@ -358,8 +358,6 @@
return
endif
- !write(IMAIN,*) ' model ppm at ',sngl(lat),sngl(lon),sngl(r_depth)
-
! loop over neighboring points
dvs = 0.0
weight_sum = 0.0
diff --git a/src/shared/asdf_helpers_definitions.f90 b/src/shared/asdf_helpers_definitions.f90
index c5e6fdd..cbf5fc6 100644
--- a/src/shared/asdf_helpers_definitions.f90
+++ b/src/shared/asdf_helpers_definitions.f90
@@ -166,9 +166,6 @@ subroutine define_adios_float_scalar(adios_group, group_size_inc, &
integer(kind=8) :: varid ! dummy variable, adios use var name
! adios: 6 == real(kind=8)
- !print *, len_trim(name)
- !print *, trim(path)
- !print *, len_trim(path)
call adios_define_var (adios_group, trim(name), trim(path), 5, "", "", "", varid)
group_size_inc = group_size_inc + 4
end subroutine define_adios_float_scalar
@@ -198,10 +195,6 @@ subroutine define_adios_integer_scalar(adios_group, group_size_inc, &
integer(kind=4), intent(in) :: var
! Local Variables
integer(kind=8) :: varid ! dummy variable, adios use var name
- ! Local vars
- !character(len=256) :: full_name
-
- !full_name = trim(path) // trim(name)
! adios: 2 ~ integer(kind=4)
!write (*,'("--- adios_define_var scalar path=",a20," name=",a20)') path, name
@@ -258,9 +251,6 @@ subroutine define_adios_global_dims_1d(adios_group, group_size_inc, &
integer, intent(in) :: local_dim
integer(kind=8), intent(inout) :: group_size_inc
- !print *,"in define dims"
- !print *,"array_name:", trim(array_name)
-
call define_adios_integer_scalar (adios_group, &
group_size_inc, trim(array_name), "local_dim", local_dim)
call define_adios_integer_scalar (adios_group, &
@@ -1315,9 +1305,6 @@ subroutine define_adios_local_1d_string_1d(adios_group, group_size_inc, &
full_name = trim(path)//trim(array_name)
- !print *,"in define local:"
- !print *,"full_name:", trim(full_name)
-
call adios_define_var(adios_group, array_name, path, 9, "", "", "", var_id )
group_size_inc = group_size_inc + 1*local_dim
diff --git a/src/shared/save_header_file.F90 b/src/shared/save_header_file.F90
index 0a6edb7..26b7652 100644
--- a/src/shared/save_header_file.F90
+++ b/src/shared/save_header_file.F90
@@ -551,14 +551,6 @@
endif
write(IOUT,*)
- ! unused... (dynamic allocation used)
- !if (SAVE_SOURCE_MASK) then
- ! write(IOUT,*) 'integer, parameter :: NSPEC_CRUST_MANTLE_MASK_SOURCE = NSPEC_CRUST_MANTLE'
- !else
- ! write(IOUT,*) 'integer, parameter :: NSPEC_CRUST_MANTLE_MASK_SOURCE = 1'
- !endif
- !write(IOUT,*)
-
! in the case of Stacey boundary conditions, add C*delta/2 contribution to the mass matrix
! on the Stacey edges for the crust_mantle and outer_core regions but not for the inner_core region
! thus the mass matrix must be replaced by three mass matrices including the "C" damping matrix
diff --git a/src/shared/write_VTK_file.f90 b/src/shared/write_VTK_file.f90
index b56b30f..116acd7 100644
--- a/src/shared/write_VTK_file.f90
+++ b/src/shared/write_VTK_file.f90
@@ -331,7 +331,6 @@
phival = zstore_dummy(i)
call rthetaphi_2_xyz(xval,yval,zval,rval,thetaval,phival)
- !write(IOUT_VTK,'(3e18.6)') xstore_dummy(i),ystore_dummy(i),zstore_dummy(i)
write(IOUT_VTK,'(3e18.6)') xval,yval,zval
enddo
write(IOUT_VTK,*) ""
@@ -514,7 +513,6 @@
phival = store_val_z_all(i,iproc)
call rthetaphi_2_xyz(xval,yval,zval,rval,thetaval,phival)
- !write(IOUT_VTK,'(3e18.6)') xstore_dummy(i),ystore_dummy(i),zstore_dummy(i)
write(IOUT_VTK,'(3e18.6)') xval,yval,zval
enddo
enddo
diff --git a/src/specfem3D/write_movie_volume.f90 b/src/specfem3D/write_movie_volume.f90
index fe644f6..442d219 100644
--- a/src/specfem3D/write_movie_volume.f90
+++ b/src/specfem3D/write_movie_volume.f90
@@ -735,10 +735,6 @@
close(27)
deallocate(tmp_data)
- ! alternative: e.g. first component only
- !write(27) epsilondev_crust_mantle(1,:,:,:,:)
- !close(27)
-
! inner core
write(outputname,"('proc',i6.6,'_reg3_epsdev_displ_it',i6.6,'.bin')") myrank,it
open(unit=27,file=trim(LOCAL_TMP_PATH)//'/'//trim(outputname),status='unknown',form='unformatted',iostat=ier)
@@ -761,10 +757,6 @@
write(27) tmp_data
close(27)
deallocate(tmp_data)
-
- ! alternative: e.g. first component only
- !write(27) epsilondev_inner_core(1,:,:,:,:)
- !close(27)
endif
end subroutine write_movie_volume_divcurl
diff --git a/src/specfem3D/write_output_SAC.f90 b/src/specfem3D/write_output_SAC.f90
index 05d1a14..fe2f34f 100644
--- a/src/specfem3D/write_output_SAC.f90
+++ b/src/specfem3D/write_output_SAC.f90
@@ -78,7 +78,7 @@
real EVLA,EVLO,EVEL,EVDP
real MAG,DIST,AZ,BAZ,GCARC
real DEPMEN
- real USER0 ,USER1 ,USER2 !,USER3,USER4
+ real USER0,USER1,USER2,USER3,USER4
real CMPAZ,CMPINC
integer NZYEAR,NZJDAY,NZHOUR,NZMIN,NZSEC
@@ -194,6 +194,8 @@
shortest_period = (256/NEX_XI)*(ANGULAR_WIDTH_XI_IN_DEGREES/90)*17
USER1 = shortest_period
USER2 = 500.0d0
+ USER3 = undef
+ USER4 = undef
! we remove any PDE information, since the simulation could also start
! with a "pure" CMT solution, without having any PDE info
!
@@ -395,8 +397,7 @@
write(IOUT_SAC,510) undef, undef, undef, undef, undef
write(IOUT_SAC,510) undef, STLA, STLO, STEL, STDP
write(IOUT_SAC,510) EVLA, EVLO, EVEL, EVDP, MAG
- write(IOUT_SAC,510) USER0, USER1, USER2, undef, undef
- !write(IOUT_SAC,510) USER0, USER1, USER2, USER3, USER4
+ write(IOUT_SAC,510) USER0, USER1, USER2, USER3, USER4
write(IOUT_SAC,510) undef, undef, undef, undef, undef
write(IOUT_SAC,510) DIST, AZ, BAZ, GCARC, INTERNAL
write(IOUT_SAC,510) INTERNAL, DEPMEN, CMPAZ, CMPINC, undef
More information about the CIG-COMMITS
mailing list