adds optional parameter reading for Mesh_Par_file

danielpeter · danielpeter · commit ff65984bdf99 · 2025-06-12T10:57:55.000+02:00
diff --git a/src/generate_databases/model_tomography.f90 b/src/generate_databases/model_tomography.f90
@@ -762,7 +762,7 @@ subroutine tomo_read_next_line(unit_in,string_read)
      if (ier /= 0) stop 'error while reading tomography file'
 
      ! suppress leading white spaces, if any
-     string_read = adjustl(string_read)
+     string_read = trim(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)
diff --git a/src/generate_databases/model_vs30.f90 b/src/generate_databases/model_vs30.f90
@@ -215,7 +215,7 @@ subroutine read_next_line(unit_in,string_read)
       if (ier /= 0) stop 'Error while reading Vs30 interface file'
 
       ! suppress leading white spaces, if any
-      string_read = adjustl(string_read)
+      string_read = trim(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)
diff --git a/src/meshfem3D/meshfem3D_par.f90 b/src/meshfem3D/meshfem3D_par.f90
@@ -90,8 +90,8 @@ module meshfem_par
 
   ! CPML
   double precision :: THICKNESS_OF_X_PML,THICKNESS_OF_Y_PML,THICKNESS_OF_Z_PML
-  logical :: ADD_PML_AS_EXTRA_MESH_LAYERS
-  integer :: NUMBER_OF_PML_LAYERS_TO_ADD
+  logical :: ADD_PML_AS_EXTRA_MESH_LAYERS = .false.  ! for mesh extension with PML layers
+  integer :: NUMBER_OF_PML_LAYERS_TO_ADD = 0
   logical, dimension(:), allocatable :: is_CPML
   integer, dimension(:), allocatable :: CPML_to_spec,CPML_regions
   integer :: nspec_CPML
diff --git a/src/meshfem3D/read_mesh_parameter_file.f90 b/src/meshfem3D/read_mesh_parameter_file.f90
@@ -197,13 +197,13 @@ subroutine read_mesh_parameter_file()
   if (THICKNESS_OF_Y_PML < 0.0) stop 'Error invalid negative value THICKNESS_OF_Y_PML'
   if (THICKNESS_OF_Z_PML < 0.0) stop 'Error invalid negative value THICKNESS_OF_Z_PML'
 
-  ! add PML as extra mesh layers
-  call read_value_logical_mesh(IIN,IGNORE_JUNK,ADD_PML_AS_EXTRA_MESH_LAYERS, 'ADD_PML_AS_EXTRA_MESH_LAYERS', ier)
-  if (ier /= 0) stop 'Error reading Mesh parameter ADD_PML_AS_EXTRA_MESH_LAYERS'
-
-  ! number of PML layers added as extra outer layers
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NUMBER_OF_PML_LAYERS_TO_ADD, 'NUMBER_OF_PML_LAYERS_TO_ADD', ier)
-  if (ier /= 0) stop 'Error reading Mesh parameter NUMBER_OF_PML_LAYERS_TO_ADD'
+  ! PML mesh extension
+  ! (optional) add PML as extra mesh layers
+  call read_value_logical_mesh_optional(IIN,ADD_PML_AS_EXTRA_MESH_LAYERS, 'ADD_PML_AS_EXTRA_MESH_LAYERS', ier)
+  if (ier /= 0) stop 'Error reading (optional) Mesh parameter ADD_PML_AS_EXTRA_MESH_LAYERS'
+  ! (optional) number of PML layers added as extra outer layers
+  call read_value_integer_mesh_optional(IIN,NUMBER_OF_PML_LAYERS_TO_ADD, 'NUMBER_OF_PML_LAYERS_TO_ADD', ier)
+  if (ier /= 0) stop 'Error reading (optional) Mesh parameter NUMBER_OF_PML_LAYERS_TO_ADD'
 
   ! user output
   if (myrank == 0) then
diff --git a/src/meshfem3D/read_value_mesh_parameters.f90 b/src/meshfem3D/read_value_mesh_parameters.f90
@@ -38,6 +38,7 @@ subroutine read_value_integer_mesh(iunit,ignore_junk,value_to_read, name, ier)
   integer, intent(inout) :: value_to_read
   integer, intent(inout) :: ier
   character(len=*), intent(in) :: name
+  ! local parameters
   character(len=MAX_STRING_LEN) :: string_read
 
   call unused_string(name)
@@ -50,6 +51,53 @@ subroutine read_value_integer_mesh(iunit,ignore_junk,value_to_read, name, ier)
 
   end subroutine read_value_integer_mesh
 
+!--------------------
+
+  subroutine read_value_integer_mesh_optional(iunit, value_to_read, name, ier)
+
+! reads an optional integer parameter value if found by name
+
+  use constants, only: MAX_STRING_LEN
+
+  implicit none
+
+  integer, intent(in) :: iunit
+  integer, intent(inout) :: value_to_read
+  character(len=*), intent(in) :: name
+  integer, intent(inout) :: ier
+  ! local parameters
+  character(len=MAX_STRING_LEN) :: string_read
+  integer :: index_equal_sign
+
+  ! reads full line (with parameter name)
+  call read_next_line(iunit,.false.,string_read,ier)
+  if (ier /= 0) return
+
+  ! debug
+  !print *,'optional line: ***',trim(string_read),'*** integer name index: ',index(string_read,trim(name))
+
+  ! reads parameter value if current line contains name string
+  if (index(string_read,trim(name)) > 0) then
+    ! suppress leading parameter name (up to the first equal sign, included)
+    index_equal_sign = index(string_read,'=')
+    if (index_equal_sign <= 1 .or. index_equal_sign == len_trim(string_read)) then
+      print *,'Error reading Mesh_Par_file of optional parameter ',trim(name),' in line: ',trim(string_read)
+      stop 'Error incorrect syntax detected in Mesh_Par_file'
+    else
+      string_read = string_read((index_equal_sign + 1):len_trim(string_read))
+    endif
+
+    ! reads parameter value
+    read(string_read,*,iostat=ier) value_to_read
+
+  else
+    ! line contains another new parameter
+    ! reverts back file pointer to previous line for the next read statements
+    backspace(iunit)
+  endif
+
+  end subroutine read_value_integer_mesh_optional
+
 !--------------------
 
   subroutine read_value_dble_precision_mesh(iunit,ignore_junk,value_to_read, name, ier)
@@ -63,6 +111,7 @@ subroutine read_value_dble_precision_mesh(iunit,ignore_junk,value_to_read, name,
   double precision, intent(inout) :: value_to_read
   integer, intent(inout) :: ier
   character(len=*), intent(in) :: name
+  ! local parameters
   character(len=MAX_STRING_LEN) :: string_read
 
   call unused_string(name)
@@ -88,6 +137,7 @@ subroutine read_value_logical_mesh(iunit,ignore_junk,value_to_read, name, ier)
   integer, intent(in) :: iunit
   integer, intent(inout) :: ier
   character(len=*), intent(in) :: name
+  ! local parameters
   character(len=MAX_STRING_LEN) :: string_read
 
   call unused_string(name)
@@ -100,6 +150,53 @@ subroutine read_value_logical_mesh(iunit,ignore_junk,value_to_read, name, ier)
 
   end subroutine read_value_logical_mesh
 
+!--------------------
+
+  subroutine read_value_logical_mesh_optional(iunit, value_to_read, name, ier)
+
+! reads an optional parameter value if found by name
+
+  use constants, only: MAX_STRING_LEN
+
+  implicit none
+
+  logical, intent(inout) :: value_to_read
+  integer, intent(in) :: iunit
+  integer, intent(inout) :: ier
+  character(len=*), intent(in) :: name
+  ! local parameters
+  character(len=MAX_STRING_LEN) :: string_read
+  integer :: index_equal_sign
+
+  ! reads full line (with parameter name)
+  call read_next_line(iunit,.false.,string_read,ier)
+  if (ier /= 0) return
+
+  ! debug
+  !print *,'optional line: ***',trim(string_read),'*** logical name index: ',index(string_read,trim(name))
+
+  ! reads parameter value if current line contains name string
+  if (index(string_read,trim(name)) > 0) then
+    ! suppress leading parameter name (up to the first equal sign, included)
+    index_equal_sign = index(string_read,'=')
+    if (index_equal_sign <= 1 .or. index_equal_sign == len_trim(string_read)) then
+      print *,'Error reading Mesh_Par_file of optional parameter ',trim(name),' in line: ',trim(string_read)
+      stop 'Error incorrect syntax detected in Mesh_Par_file'
+    else
+      string_read = string_read((index_equal_sign + 1):len_trim(string_read))
+    endif
+
+    ! reads parameter value
+    read(string_read,*,iostat=ier) value_to_read
+
+  else
+    ! line contains another new parameter
+    ! reverts back file pointer to previous line for the next read statements
+    backspace(iunit)
+  endif
+
+  end subroutine read_value_logical_mesh_optional
+
 !--------------------
 
   subroutine read_value_string_mesh(iunit,ignore_junk,value_to_read, name, ier)
@@ -113,6 +210,7 @@ subroutine read_value_string_mesh(iunit,ignore_junk,value_to_read, name, ier)
   character(len=*), intent(inout) :: value_to_read
   integer, intent(inout) :: ier
   character(len=*), intent(in) :: name
+  ! local parameters
   character(len=MAX_STRING_LEN) :: string_read
 
   call unused_string(name)
@@ -233,6 +331,7 @@ subroutine read_interface_parameters(iunit,SUPPRESS_UTM_PROJECTION,interface_fil
   double precision :: orig_x_interface,orig_y_interface
   double precision :: spacing_x_interface,spacing_y_interface
   character(len=MAX_STRING_LEN) :: interface_file
+  ! local parameters
   character(len=MAX_STRING_LEN) :: string_read
 
   ier = 0
@@ -564,7 +663,7 @@ subroutine read_next_line(iunit,suppress_junk,string_read, ier)
     endif
 
     ! suppress leading white spaces, if any
-    string_read = adjustl(string_read)
+    string_read = trim(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)
diff --git a/src/specfem3D/read_stations.f90 b/src/specfem3D/read_stations.f90
@@ -53,6 +53,9 @@ subroutine read_stations(rec_filename)
       read(IIN,"(a)",iostat=ier) line
       if (ier /= 0) call exit_mpi(myrank, 'Error reading station file '//trim(rec_filename))
 
+      ! suppress white space
+      line = trim(adjustl(line))
+
       ! skip comment lines
       if (len_trim(line) > 0 .and. line(1:1) /= '#') then
         line = trim(line)
