[cig-commits] [commit] devel: Fix some more short strings. (463e742)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Jun 6 08:00:37 PDT 2014
Repository : https://github.com/geodynamics/specfem3d
On branch : devel
Link : https://github.com/geodynamics/specfem3d/compare/11139bf0b60bcf9f9f1138677ae3c5d826feef98...463e742796aa4563cf47d1f0d9c0d471a21bce93
>---------------------------------------------------------------
commit 463e742796aa4563cf47d1f0d9c0d471a21bce93
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Fri Jun 6 03:47:23 2014 -0400
Fix some more short strings.
These were hardcoded to use a length other than 256, so were not caught
the first time.
>---------------------------------------------------------------
463e742796aa4563cf47d1f0d9c0d471a21bce93
src/auxiliaries/model_update.f90 | 2 +-
src/decompose_mesh/decompose_mesh.F90 | 2 +-
src/decompose_mesh/part_decompose_mesh.f90 | 4 ++--
src/generate_databases/generate_databases_par.f90 | 2 +-
src/generate_databases/get_model.f90 | 2 +-
src/generate_databases/model_default.f90 | 2 +-
src/meshfem3D/constants_meshfem3D.h | 2 +-
src/specfem3D/fault_solver_common.f90 | 10 +++++-----
src/specfem3D/fault_solver_dynamic.f90 | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/auxiliaries/model_update.f90 b/src/auxiliaries/model_update.f90
index 050d72a..0079091 100644
--- a/src/auxiliaries/model_update.f90
+++ b/src/auxiliaries/model_update.f90
@@ -78,7 +78,7 @@ program model_update
real(kind=CUSTOM_REAL), dimension(:), allocatable :: dummy_g_1,dummy_g_2,dummy_g_3 !xstore,ystore,zstore
integer, dimension(:), allocatable :: dummy_l_1,dummy_l_2,dummy_l_3,dummy_l_4,dummy_l_5,dummy_l_6,dummy_l_7,dummy_l_8 !ibool-1
integer, dimension(:), allocatable :: dummy_num
- character (len=80) :: string1,string2,string3,string4,string5,string6,string7,string8,string9,string10,string11
+ character(len=MAX_STRING_LEN) :: string1,string2,string3,string4,string5,string6,string7,string8,string9,string10,string11
integer :: idummy1,idummy2,idummy3,idummy4,idummy5
integer :: iglob
diff --git a/src/decompose_mesh/decompose_mesh.F90 b/src/decompose_mesh/decompose_mesh.F90
index c869409..68a9d19 100644
--- a/src/decompose_mesh/decompose_mesh.F90
+++ b/src/decompose_mesh/decompose_mesh.F90
@@ -126,7 +126,7 @@ module decompose_mesh
!pll
double precision , dimension(:,:), allocatable :: mat_prop
integer :: count_def_mat,count_undef_mat,imat
- character (len=30), dimension(:,:), allocatable :: undef_mat_prop
+ character(len=MAX_STRING_LEN), dimension(:,:), allocatable :: undef_mat_prop
! default mesh file directory
character(len=MAX_STRING_LEN) :: localpath_name
diff --git a/src/decompose_mesh/part_decompose_mesh.f90 b/src/decompose_mesh/part_decompose_mesh.f90
index 951e41b..f6cbd8f 100644
--- a/src/decompose_mesh/part_decompose_mesh.f90
+++ b/src/decompose_mesh/part_decompose_mesh.f90
@@ -446,7 +446,7 @@ contains
integer, intent(in) :: IIN_database
integer, intent(in) :: count_def_mat,count_undef_mat
double precision, dimension(16,count_def_mat) :: mat_prop
- character (len=30), dimension(6,count_undef_mat) :: undef_mat_prop
+ character(len=MAX_STRING_LEN), dimension(6,count_undef_mat) :: undef_mat_prop
integer :: i
write(IIN_database) count_def_mat,count_undef_mat
@@ -1038,7 +1038,7 @@ contains
! materials
integer, dimension(1:nspec), intent(in) :: num_material
double precision, dimension(16,count_def_mat),intent(in) :: mat_prop
- character (len=30), dimension(6,count_undef_mat),intent(in) :: undef_mat_prop
+ character(len=MAX_STRING_LEN), dimension(6,count_undef_mat), intent(in) :: undef_mat_prop
! local parameters
logical, dimension(-count_undef_mat:count_def_mat) :: is_acoustic, is_elastic, is_poroelastic
diff --git a/src/generate_databases/generate_databases_par.f90 b/src/generate_databases/generate_databases_par.f90
index 3235b59..1448bfa 100644
--- a/src/generate_databases/generate_databases_par.f90
+++ b/src/generate_databases/generate_databases_par.f90
@@ -124,7 +124,7 @@
integer, dimension(:,:), allocatable :: nodes_ibelm_xmin,nodes_ibelm_xmax, &
nodes_ibelm_ymin, nodes_ibelm_ymax, nodes_ibelm_bottom, nodes_ibelm_top
- character (len=30), dimension(:,:), allocatable :: undef_mat_prop
+ character(len=MAX_STRING_LEN), dimension(:,:), allocatable :: undef_mat_prop
! C-PML absorbing boundary conditions
diff --git a/src/generate_databases/get_model.f90 b/src/generate_databases/get_model.f90
index cc3dbee..8ec8c71 100644
--- a/src/generate_databases/get_model.f90
+++ b/src/generate_databases/get_model.f90
@@ -364,7 +364,7 @@
double precision, dimension(16,nmat_ext_mesh),intent(in) :: materials_ext_mesh
integer, intent(in) :: nundefMat_ext_mesh
- character (len=30), dimension(6,nundefMat_ext_mesh):: undef_mat_prop
+ character(len=MAX_STRING_LEN), dimension(6,nundefMat_ext_mesh) :: undef_mat_prop
integer, intent(in) :: imaterial_id,imaterial_def
diff --git a/src/generate_databases/model_default.f90 b/src/generate_databases/model_default.f90
index eb503a3..ae5b05b 100644
--- a/src/generate_databases/model_default.f90
+++ b/src/generate_databases/model_default.f90
@@ -50,7 +50,7 @@
double precision, dimension(16,nmat_ext_mesh),intent(in) :: materials_ext_mesh
integer, intent(in) :: nundefMat_ext_mesh
- character (len=30), dimension(6,nundefMat_ext_mesh):: undef_mat_prop
+ character(len=MAX_STRING_LEN), dimension(6,nundefMat_ext_mesh) :: undef_mat_prop
integer, intent(in) :: imaterial_id,imaterial_def
diff --git a/src/meshfem3D/constants_meshfem3D.h b/src/meshfem3D/constants_meshfem3D.h
index 9f80a17..29b06eb 100644
--- a/src/meshfem3D/constants_meshfem3D.h
+++ b/src/meshfem3D/constants_meshfem3D.h
@@ -54,7 +54,7 @@
double precision, parameter :: ORIG_LAT_TOPO_SOCAL = 32.d0
double precision, parameter :: ORIG_LONG_TOPO_SOCAL = -121.d0
double precision, parameter :: DEGREES_PER_CELL_TOPO_SOCAL = 5.d0 / 1000.d0
- character(len=100), parameter :: TOPO_FILE_SOCAL = 'DATA/la_topography/topo_bathy_final.dat'
+ character(len=*), parameter :: TOPO_FILE_SOCAL = 'DATA/la_topography/topo_bathy_final.dat'
! size of Lupei Zhu's Moho map file for Southern California
integer, parameter :: NX_MOHO = 71,NY_MOHO = 51
diff --git a/src/specfem3D/fault_solver_common.f90 b/src/specfem3D/fault_solver_common.f90
index b05da68..f0d5c83 100644
--- a/src/specfem3D/fault_solver_common.f90
+++ b/src/specfem3D/fault_solver_common.f90
@@ -78,8 +78,8 @@ module fault_solver_common
real(kind=CUSTOM_REAL) :: dt
integer, dimension(:), pointer :: iglob=>null() ! on-fault global index of output nodes
real(kind=CUSTOM_REAL), dimension(:,:,:), pointer :: dat=>null()
- character(len=70), dimension(:), pointer :: name=>null(),longFieldNames=>null()
- character(len=100) :: shortFieldNames
+ character(len=MAX_STRING_LEN), dimension(:), pointer :: name=>null(),longFieldNames=>null()
+ character(len=MAX_STRING_LEN) :: shortFieldNames
end type dataT_type
type, extends (fault_type) :: bc_dynandkinflt_type
@@ -361,8 +361,8 @@ subroutine init_dataT(dataT,coord,nglob,NT,DT,ndat,iflt)
integer, dimension(:), allocatable :: iproc,iglob_tmp,glob_indx
real(kind=CUSTOM_REAL) :: xtarget,ytarget,ztarget,dist,distkeep
integer :: i, iglob , IIN, ier, jflt, np, k
- character(len=70) :: tmpname
- character(len=70), dimension(:), allocatable :: name_tmp
+ character(len=MAX_STRING_LEN) :: tmpname
+ character(len=MAX_STRING_LEN), dimension(:), allocatable :: name_tmp
integer :: ipoin, ipoin_local, npoin_local
! 1. read fault output coordinates from user file,
@@ -543,7 +543,7 @@ subroutine SCEC_write_dataT(dataT)
write(IOUT,*) "# location=",trim(dataT%name(i))
write(IOUT,*) "# Column #1 = Time (s)"
do k=1,dataT%ndat
- write(IOUT,1100) k+1,dataT%longFieldNames(k)
+ write(IOUT,1100) k+1,trim(dataT%longFieldNames(k))
enddo
write(IOUT,*) "#"
write(IOUT,*) "# The line below lists the names of the data fields:"
diff --git a/src/specfem3D/fault_solver_dynamic.f90 b/src/specfem3D/fault_solver_dynamic.f90
index b823010..fda5dd2 100644
--- a/src/specfem3D/fault_solver_dynamic.f90
+++ b/src/specfem3D/fault_solver_dynamic.f90
@@ -308,7 +308,7 @@ subroutine init_2d_distribution(a,coord,iin,n)
integer, intent(in) :: iin,n
real(kind=CUSTOM_REAL) :: b(size(a))
- character(len=20) :: shapeval
+ character(len=MAX_STRING_LEN) :: shapeval
real(kind=CUSTOM_REAL) :: val,valh, xc, yc, zc, r, l, lx,ly,lz
real(kind=CUSTOM_REAL) :: r1(size(a))
integer :: i
More information about the CIG-COMMITS
mailing list