[cig-commits] r8474 - in seismo/2D/SPECFEM2D/trunk: . DATA

walter at geodynamics.org walter at geodynamics.org
Fri Dec 7 15:49:05 PST 2007


Author: walter
Date: 2007-12-07 15:49:04 -0800 (Fri, 07 Dec 2007)
New Revision: 8474

Modified:
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file_CercleMod50_50_10Hz_Paul
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_acoustic
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_elastic
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Thomas_Lacq
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file_cours_M2_UPPA
   seismo/2D/SPECFEM2D/trunk/read_value_parameters.f90
Log:
suppressed constraint of aligning values in Par_file on the 34th column


Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file	2005-02-25 12:09:08 UTC (rev 8473)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file	2007-12-07 23:49:04 UTC (rev 8474)
@@ -1,21 +1,18 @@
-#
-# This is the parameter file
-#
 
 # title of job, and file that contains interface data
-title                           = Test sinusoide acoustique
-interfacesfile                  = interface_sinus.dat
+title                  = Test sinusoide acoustique
+interfacesfile         = interface_sinus.dat
 
 # geometry of the model (origin lower-left corner = 0,0) and mesh description
-xmin                            = 0.d0           # abscissa of left side of the model
-xmax                            = 4000.d0        # abscissa of right side of the model
-nx                              = 80             # number of elements along X
-ngnod                           = 9              # noeuds de controle pour blocs (4 ou 9)
-initialfield                    = .false.        # use a plane wave as source or not
-readmodel                       = .false.        # read external earth model or not
-ELASTIC                         = .false.        # elastic or acoustic simulation
-TURN_ANISOTROPY_ON              = .false.        # turn anisotropy on or off
-TURN_ATTENUATION_ON             = .false.        # turn attenuation on or off
+xmin                     = 0.d0           # abscissa of left side of the model
+xmax                     = 4000.d0        # abscissa of right side of the model
+nx                       = 80             # number of elements along X
+ngnod                    = 9              # noeuds de controle pour blocs (4 ou 9)
+initialfield             = .false.        # use a plane wave as source or not
+readmodel                = .false.        # read external earth model or not
+ELASTIC                  = .false.        # elastic or acoustic simulation
+TURN_ANISOTROPY_ON       = .false.        # turn anisotropy on or off
+TURN_ATTENUATION_ON      = .false.        # turn attenuation on or off
 
 # absorbing boundaries parameters
 absorbhaut                      = .false.        # absorbing boundary active or not

Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_CercleMod50_50_10Hz_Paul
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_CercleMod50_50_10Hz_Paul	2005-02-25 12:09:08 UTC (rev 8473)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_CercleMod50_50_10Hz_Paul	2007-12-07 23:49:04 UTC (rev 8474)
@@ -1,6 +1,3 @@
-#
-# This is the parameter file
-#
 
 # title of job, and file that contains interface data
 title                           = Test InterfaceCercleMod50_50

Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_acoustic
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_acoustic	2005-02-25 12:09:08 UTC (rev 8473)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_acoustic	2007-12-07 23:49:04 UTC (rev 8474)
@@ -1,6 +1,3 @@
-#
-# This is the parameter file
-#
 
 # title of job, and file that contains interface data
 title                           = Test sinusoide acoustique

Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_elastic
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_elastic	2005-02-25 12:09:08 UTC (rev 8473)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Paul_elastic	2007-12-07 23:49:04 UTC (rev 8474)
@@ -1,6 +1,3 @@
-#
-# This is the parameter file
-#
 
 # title of job, and file that contains interface data
 title                           = Test sinusoide elastique

Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Thomas_Lacq
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Thomas_Lacq	2005-02-25 12:09:08 UTC (rev 8473)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_Thomas_Lacq	2007-12-07 23:49:04 UTC (rev 8474)
@@ -1,6 +1,3 @@
-#
-# This is the parameter file
-#
 
 # title of job, and file that contains interface data
 title                           = Lacq Thomas

Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file_cours_M2_UPPA
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file_cours_M2_UPPA	2005-02-25 12:09:08 UTC (rev 8473)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file_cours_M2_UPPA	2007-12-07 23:49:04 UTC (rev 8474)
@@ -1,6 +1,3 @@
-#
-# This is the parameter file
-#
 
 # title of job, and file that contains interface data
 title                           = Test pour cours M2 UPPA

Modified: seismo/2D/SPECFEM2D/trunk/read_value_parameters.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/read_value_parameters.f90	2005-02-25 12:09:08 UTC (rev 8473)
+++ seismo/2D/SPECFEM2D/trunk/read_value_parameters.f90	2007-12-07 23:49:04 UTC (rev 8474)
@@ -84,7 +84,7 @@
   logical ignore_junk
   character(len=100) string_read
 
-  integer ios,iin,position_equal_sign
+  integer ios,iin,index_equal_sign
 
   do
     read(unit=iin,fmt=200,iostat=ios) string_read
@@ -105,15 +105,16 @@
 ! suppress trailing comments, if any
   if(index(string_read,'#') > 0) string_read = string_read(1:index(string_read,'#')-1)
 
-! suppress leading junk (until the first equal sign) if needed
+! suppress leading junk (up to the first equal sign, included) if needed
   if(ignore_junk) then
-    position_equal_sign = index(string_read,'=')
-    if(position_equal_sign <= 1) stop 'incorrect syntax detected in DATA/Par_file'
-    string_read = string_read(position_equal_sign+1:len_trim(string_read))
+    index_equal_sign = index(string_read,'=')
+    if(index_equal_sign <= 1 .or. index_equal_sign == len_trim(string_read)) stop 'incorrect syntax detected in DATA/Par_file'
+    string_read = string_read(index_equal_sign + 1:len_trim(string_read))
   endif
 
-! suppress leading white spaces again, if any, after having suppressed the leading junk
+! suppress leading and trailing white spaces again, if any, after having suppressed the leading junk
   string_read = adjustl(string_read)
+  string_read = string_read(1:len_trim(string_read))
 
 ! format
  200 format(a100)



More information about the cig-commits mailing list