[cig-commits] [commit] : Merged r1028:1137 from trunk to v1.4.1 tag. (338f77e)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d

On branch  : 
Link       : https://github.com/geodynamics/specfem2d/compare/1e201257d91c794056b990a43329e05d04f77454...0000000000000000000000000000000000000000

>---------------------------------------------------------------

commit 338f77eb9a7938bdaf624b6d01f339878d848e0e
Author: Leif Strand <leif at geodynamics.org>
Date:   Thu Dec 7 01:27:36 2006 +0000

    Merged r1028:1137 from trunk to v1.4.1 tag.


>---------------------------------------------------------------

338f77eb9a7938bdaf624b6d01f339878d848e0e
 DATA/{Par_file => Par_file_EGEE_small_4} | 32 +++++++++++++++-----------------
 compute_arrays_source.f90                |  1 -
 read_value_parameters.f90                |  3 +++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/DATA/Par_file b/DATA/Par_file_EGEE_small_4
similarity index 68%
copy from DATA/Par_file
copy to DATA/Par_file_EGEE_small_4
index 415319d..b810c96 100644
--- a/DATA/Par_file
+++ b/DATA/Par_file_EGEE_small_4
@@ -6,51 +6,50 @@ SAVE_FORWARD                    = .false.
 # coordinates of mesh block in latitude/longitude and depth in km
 LATITUDE_MIN                    = 32.2d0
 LATITUDE_MAX                    = 36.8d0
-LONGITUDE_MIN                   = -120.3d0
+LONGITUDE_MIN                   = -120.9d0
 LONGITUDE_MAX                   = -114.7d0
 DEPTH_BLOCK_KM                  = 60.d0
 UTM_PROJECTION_ZONE             = 11
 SUPPRESS_UTM_PROJECTION         = .false.
 
 # number of elements at the surface along edges of the mesh at the surface
-# (must be 8 * multiple of NPROC below if mesh is not regular and contains mesh doublings)
-# (must be multiple of NPROC below if mesh is regular)
-NEX_XI                          = 288
-NEX_ETA                         = 288
+# (must be 8 * multiple of NPROC below)
+NEX_XI                          = 256
+NEX_ETA                         = 256
 
 # number of MPI processors along xi and eta (can be different)
-NPROC_XI                        = 12
-NPROC_ETA                       = 12
+NPROC_XI                        = 2
+NPROC_ETA                       = 2
 
 # model (SoCal, Harvard_LA, Min_Chen_anisotropy)
-MODEL                           = Harvard_LA
+MODEL                           = SoCal
 
 # parameters describing the model
-OCEANS                          = .true.
-TOPOGRAPHY                      = .true.
-ATTENUATION                     = .true.
+OCEANS                          = .false.
+TOPOGRAPHY                      = .false.
+ATTENUATION                     = .false.
 USE_OLSEN_ATTENUATION           = .false.
 
 # absorbing boundary conditions for a regional simulation
-ABSORBING_CONDITIONS            = .true.
+ABSORBING_CONDITIONS            = .false.
 
 # record length in seconds
-RECORD_LENGTH_IN_SECONDS        = 180.0
+RECORD_LENGTH_IN_SECONDS        = 30.d0
 
 # save AVS or OpenDX movies
 MOVIE_SURFACE                   = .false.
 MOVIE_VOLUME                    = .false.
-NTSTEP_BETWEEN_FRAMES           = 200
+NTSTEP_BETWEEN_FRAMES           = 100
 CREATE_SHAKEMAP                 = .false.
 SAVE_DISPLACEMENT               = .false.
 USE_HIGHRES_FOR_MOVIES          = .false.
 HDUR_MOVIE                      = 0.0
 
 # save AVS or OpenDX mesh files to check the mesh
-SAVE_MESH_FILES                 = .true.
+SAVE_MESH_FILES                 = .false.
 
 # path to store the local database file on each node
-LOCAL_PATH                      = /scratch/komatits/DATABASES_MPI
+LOCAL_PATH                      = /tmp/DATABASES_MPI_DIMITRI4
 
 # machine file for MPI
 # this is not needed for new cluster and is in go_mesher/go_solver
@@ -65,4 +64,3 @@ NTSTEP_BETWEEN_OUTPUT_SEISMOS   = 200000
 # print source time function
 PRINT_SOURCE_TIME_FUNCTION      = .false.
 
-
diff --git a/compute_arrays_source.f90 b/compute_arrays_source.f90
index 155c649..d4603ff 100644
--- a/compute_arrays_source.f90
+++ b/compute_arrays_source.f90
@@ -51,7 +51,6 @@
   double precision, dimension(NGLLZ) :: hgammas,hpgammas
 
   integer k,l,m
-  integer ir,it,iv
 
 ! calculate G_ij for general source location
 ! the source does not necessarily correspond to a Gauss-Lobatto point
diff --git a/read_value_parameters.f90 b/read_value_parameters.f90
index 218f998..c9c0c1c 100644
--- a/read_value_parameters.f90
+++ b/read_value_parameters.f90
@@ -102,6 +102,9 @@
 ! suppress leading white spaces, if any
     string_read = adjustl(string_read)
 
+! suppress trailing carriage return (ASCII code 13) if any (e.g. if input text file coming from Windows/DOS)
+    if(index(string_read,achar(13)) > 0) string_read = string_read(1:index(string_read,achar(13))-1)
+
 ! exit loop when we find the first line that is not a comment or a white line
     if(len_trim(string_read) == 0) cycle
     if(string_read(1:1) /= '#') exit