[cig-commits] [commit] devel: Remove Par_file variable prefixes. (756db1c)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Thu May 1 00:50:52 PDT 2014


Repository : ssh://geoshell/specfem3d

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/cb32c88d6155d7974561a6f72fc17aea596e2c4d...50aa953c1db3f565d76415f5305410a529996b75

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

commit 756db1c65b6a150fdc80d1070fc9e894f6848687
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date:   Tue Apr 29 20:41:32 2014 -0400

    Remove Par_file variable prefixes.
    
    These are not used by the Par_file parsing code. Some places even didn't
    have them.


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

756db1c65b6a150fdc80d1070fc9e894f6848687
 src/meshfem3D/read_mesh_parameter_file.f90 | 42 +++++++-------
 src/shared/param_reader.c                  | 11 +---
 src/shared/read_parameter_file.f90         | 92 +++++++++++++++---------------
 3 files changed, 68 insertions(+), 77 deletions(-)

diff --git a/src/meshfem3D/read_mesh_parameter_file.f90 b/src/meshfem3D/read_mesh_parameter_file.f90
index 4008382..c092280 100644
--- a/src/meshfem3D/read_mesh_parameter_file.f90
+++ b/src/meshfem3D/read_mesh_parameter_file.f90
@@ -84,31 +84,31 @@ contains
 ! open parameter file Mesh_Par_file
   call open_parameter_file_mesh()
 
-  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LATITUDE_MIN, 'mesher.LATITUDE_MIN', ierr)
+  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LATITUDE_MIN, 'LATITUDE_MIN', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 1'
-  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LATITUDE_MAX, 'mesher.LATITUDE_MAX', ierr)
+  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LATITUDE_MAX, 'LATITUDE_MAX', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 2'
-  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LONGITUDE_MIN, 'mesher.LONGITUDE_MIN', ierr)
+  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LONGITUDE_MIN, 'LONGITUDE_MIN', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 3'
-  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LONGITUDE_MAX, 'mesher.LONGITUDE_MAX', ierr)
+  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,LONGITUDE_MAX, 'LONGITUDE_MAX', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 4'
-  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,DEPTH_BLOCK_KM, 'mesher.DEPTH_BLOCK_KM', ierr)
+  call read_value_dble_precision_mesh(IIN,IGNORE_JUNK,DEPTH_BLOCK_KM, 'DEPTH_BLOCK_KM', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 5'
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,UTM_PROJECTION_ZONE, 'mesher.UTM_PROJECTION_ZONE', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,UTM_PROJECTION_ZONE, 'UTM_PROJECTION_ZONE', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 6'
-  call read_value_logical_mesh(IIN,IGNORE_JUNK,SUPPRESS_UTM_PROJECTION, 'mesher.SUPPRESS_UTM_PROJECTION', ierr)
+  call read_value_logical_mesh(IIN,IGNORE_JUNK,SUPPRESS_UTM_PROJECTION, 'SUPPRESS_UTM_PROJECTION', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 7'
 
-  call read_value_string_mesh(IIN,IGNORE_JUNK,INTERFACES_FILE, 'mesher.INTERFACES_FILE', ierr)
+  call read_value_string_mesh(IIN,IGNORE_JUNK,INTERFACES_FILE, 'INTERFACES_FILE', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 8'
 
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NEX_XI, 'mesher.NEX_XI', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,NEX_XI, 'NEX_XI', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 9'
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NEX_ETA, 'mesher.NEX_ETA', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,NEX_ETA, 'NEX_ETA', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 10'
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NPROC_XI, 'mesher.NPROC_XI', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,NPROC_XI, 'NPROC_XI', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 11'
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NPROC_ETA, 'mesher.NPROC_ETA', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,NPROC_ETA, 'NPROC_ETA', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 12'
 
 ! convert model size to UTM coordinates and depth of mesh to meters
@@ -126,13 +126,13 @@ contains
   NEX_MAX = max(NEX_XI,NEX_ETA)
   UTM_MAX = max(UTM_Y_MAX-UTM_Y_MIN, UTM_X_MAX-UTM_X_MIN)/1000.0 ! in KM
 
-  call read_value_logical_mesh(IIN,IGNORE_JUNK,USE_REGULAR_MESH, 'mesher.USE_REGULAR_MESH', ierr)
+  call read_value_logical_mesh(IIN,IGNORE_JUNK,USE_REGULAR_MESH, 'USE_REGULAR_MESH', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 13'
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NDOUBLINGS, 'mesher.NDOUBLINGS', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,NDOUBLINGS, 'NDOUBLINGS', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 14'
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,ner_doublings(1), 'mesher.NZ_DOUGLING_1', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,ner_doublings(1), 'NZ_DOUGLING_1', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 15'
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,ner_doublings(2), 'mesher.NZ_DOUGLING_2', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,ner_doublings(2), 'NZ_DOUGLING_2', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 16'
 
   if(ner_doublings(1) < ner_doublings(2) .and. NDOUBLINGS == 2) then
@@ -141,11 +141,11 @@ contains
     ner_doublings(2) = idoubl
   endif
 
-  call read_value_logical_mesh(IIN,IGNORE_JUNK,CREATE_ABAQUS_FILES, 'mesher.CREATE_ABAQUS_FILES', ierr)
+  call read_value_logical_mesh(IIN,IGNORE_JUNK,CREATE_ABAQUS_FILES, 'CREATE_ABAQUS_FILES', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 17'
-  call read_value_logical_mesh(IIN,IGNORE_JUNK,CREATE_DX_FILES, 'mesher.CREATE_DX_FILES', ierr)
+  call read_value_logical_mesh(IIN,IGNORE_JUNK,CREATE_DX_FILES, 'CREATE_DX_FILES', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 18'
-  call read_value_logical_mesh(IIN,IGNORE_JUNK,CREATE_VTK_FILES, 'mesher.CREATE_VTK_FILES', ierr)
+  call read_value_logical_mesh(IIN,IGNORE_JUNK,CREATE_VTK_FILES, 'CREATE_VTK_FILES', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 19'
 
 ! file in which we store the databases
@@ -153,7 +153,7 @@ contains
   if (ierr /= 0) stop 'Error reading Mesh parameter 20'
 
 ! read number of materials
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NMATERIALS, 'mesher.NMATERIALS', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,NMATERIALS, 'NMATERIALS', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 21'
 
 ! read materials properties
@@ -173,7 +173,7 @@ contains
   enddo
 
 ! read number of subregions
-  call read_value_integer_mesh(IIN,IGNORE_JUNK,NSUBREGIONS, 'mesher.NSUBREGIONS', ierr)
+  call read_value_integer_mesh(IIN,IGNORE_JUNK,NSUBREGIONS, 'NSUBREGIONS', ierr)
   if (ierr /= 0) stop 'Error reading Mesh parameter 22'
 
 ! read subregions properties
diff --git a/src/shared/param_reader.c b/src/shared/param_reader.c
index 0a423f4..c8f0c1f 100644
--- a/src/shared/param_reader.c
+++ b/src/shared/param_reader.c
@@ -118,7 +118,6 @@ FC_FUNC_(param_read,PARAM_READ)(char * string_read, int * string_read_len, char
 {
   char * namecopy;
   char * blank;
-  char * namecopy2;
   int status;
   regex_t compiled_pattern;
   char line[LINE_MAX];
@@ -133,13 +132,6 @@ FC_FUNC_(param_read,PARAM_READ)(char * string_read, int * string_read_len, char
   if (blank != NULL) {
     namecopy[blank - namecopy] = '\0';
   }
-  // Then get rid of any dot-terminated prefix.
-  namecopy2 = strchr(namecopy, '.');
-  if (namecopy2 != NULL) {
-    namecopy2 += 1;
-  } else {
-    namecopy2 = namecopy;
-  }
   /* Regular expression for parsing lines from param file.
    ** Good luck reading this regular expression.  Basically, the lines of
    ** the parameter file should be of the form 'parameter = value',
@@ -189,7 +181,7 @@ FC_FUNC_(param_read,PARAM_READ)(char * string_read, int * string_read_len, char
     // If we have a match, extract the keyword from the line.
     keyword = strndup(line+parameter[1].rm_so, parameter[1].rm_eo-parameter[1].rm_so);
     // If the keyword is not the one we're looking for, check the next line.
-    if (strcmp(keyword, namecopy2) != 0) {
+    if (strcmp(keyword, namecopy) != 0) {
       free(keyword);
       continue;
     }
@@ -200,7 +192,6 @@ FC_FUNC_(param_read,PARAM_READ)(char * string_read, int * string_read_len, char
     // Clear out the return string with blanks, copy the value into it, and return.
     memset(string_read, ' ', *string_read_len);
     strncpy(string_read, value, strlen(value));
-    // printf("'%s'='%s'\n", namecopy2, value);
     free(value);
     free(namecopy);
     *ierr = 0;
diff --git a/src/shared/read_parameter_file.f90 b/src/shared/read_parameter_file.f90
index 699cfe0..a84cb38 100644
--- a/src/shared/read_parameter_file.f90
+++ b/src/shared/read_parameter_file.f90
@@ -68,28 +68,28 @@
   call open_parameter_file(ierr)
 
   ! reads in parameters
-  call read_value_integer(SIMULATION_TYPE, 'solver.SIMULATION_TYPE', ierr)
+  call read_value_integer(SIMULATION_TYPE, 'SIMULATION_TYPE', ierr)
   if (ierr /= 0) return
-  call read_value_integer(NOISE_TOMOGRAPHY, 'solver.NOISE_TOMOGRAPHY', ierr)
+  call read_value_integer(NOISE_TOMOGRAPHY, 'NOISE_TOMOGRAPHY', ierr)
   if (ierr /= 0) return
-  call read_value_logical(SAVE_FORWARD, 'solver.SAVE_FORWARD', ierr)
+  call read_value_logical(SAVE_FORWARD, 'SAVE_FORWARD', ierr)
   if (ierr /= 0) return
-  call read_value_integer(UTM_PROJECTION_ZONE, 'mesher.UTM_PROJECTION_ZONE', ierr)
+  call read_value_integer(UTM_PROJECTION_ZONE, 'UTM_PROJECTION_ZONE', ierr)
   if (ierr /= 0) return
-  call read_value_logical(SUPPRESS_UTM_PROJECTION, 'mesher.SUPPRESS_UTM_PROJECTION', ierr)
+  call read_value_logical(SUPPRESS_UTM_PROJECTION, 'SUPPRESS_UTM_PROJECTION', ierr)
   if (ierr /= 0) return
   ! total number of processors
-  call read_value_integer(NPROC, 'mesher.NPROC', ierr)
+  call read_value_integer(NPROC, 'NPROC', ierr)
   if (ierr /= 0) then
     ! checks if it's using an old Par_file format
-    call read_value_integer(nproc_eta_old, 'mesher.NPROC_ETA', ierr)
+    call read_value_integer(nproc_eta_old, 'NPROC_ETA', ierr)
     if (ierr /= 0) then
       print*,'please specify the number of processes in Par_file as:'
       print*,'NPROC           =    <my_number_of_desired_processes> '
       return
     endif
     ! checks if it's using an old Par_file format
-    call read_value_integer(nproc_xi_old, 'mesher.NPROC_XI', ierr)
+    call read_value_integer(nproc_xi_old, 'NPROC_XI', ierr)
     if (ierr /= 0) then
       print*,'please specify the number of processes in Par_file as:'
       print*,'NPROC           =    <my_number_of_desired_processes> '
@@ -97,76 +97,76 @@
     endif
     NPROC = nproc_eta_old * nproc_xi_old
   endif
-  call read_value_integer(NSTEP, 'solver.NSTEP', ierr)
+  call read_value_integer(NSTEP, 'NSTEP', ierr)
   if (ierr /= 0) return
-  call read_value_double_precision(DT, 'solver.DT', ierr)
+  call read_value_double_precision(DT, 'DT', ierr)
   if (ierr /= 0) return
 
   ! number of nodes for 2D and 3D shape functions for quadrilaterals and hexahedra
-  call read_value_integer(NGNOD, 'solver.NGNOD', ierr)
+  call read_value_integer(NGNOD, 'NGNOD', ierr)
   if (ierr /= 0) return
 
   ! define the velocity model
-  call read_value_string(MODEL, 'model.MODEL', ierr)
+  call read_value_string(MODEL, 'MODEL', ierr)
   if (ierr /= 0) stop 'an error occurred while reading the parameter file: MODEL'
 
-  call read_value_logical(APPROXIMATE_OCEAN_LOAD, 'model.APPROXIMATE_OCEAN_LOAD', ierr)
+  call read_value_logical(APPROXIMATE_OCEAN_LOAD, 'APPROXIMATE_OCEAN_LOAD', ierr)
   if (ierr /= 0) return
-  call read_value_logical(TOPOGRAPHY, 'model.TOPOGRAPHY', ierr)
+  call read_value_logical(TOPOGRAPHY, 'TOPOGRAPHY', ierr)
   if (ierr /= 0) return
-  call read_value_logical(ATTENUATION, 'model.ATTENUATION', ierr)
+  call read_value_logical(ATTENUATION, 'ATTENUATION', ierr)
   if (ierr /= 0) return
-  call read_value_logical(FULL_ATTENUATION_SOLID, 'model.FULL_ATTENUATION_SOLID', ierr)
+  call read_value_logical(FULL_ATTENUATION_SOLID, 'FULL_ATTENUATION_SOLID', ierr)
   if (ierr /= 0) return
-  call read_value_logical(ANISOTROPY, 'model.ANISOTROPY', ierr)
+  call read_value_logical(ANISOTROPY, 'ANISOTROPY', ierr)
   if (ierr /= 0) return
   call read_value_string(TOMOGRAPHY_PATH, 'TOMOGRAPHY_PATH', ierr)
   if (ierr /= 0) return
-  call read_value_logical(USE_OLSEN_ATTENUATION, 'model.USE_OLSEN_ATTENUATION', ierr)
+  call read_value_logical(USE_OLSEN_ATTENUATION, 'USE_OLSEN_ATTENUATION', ierr)
   if (ierr /= 0) return
-  call read_value_double_precision(OLSEN_ATTENUATION_RATIO, 'model.OLSEN_ATTENUATION_RATIO', ierr)
+  call read_value_double_precision(OLSEN_ATTENUATION_RATIO, 'OLSEN_ATTENUATION_RATIO', ierr)
   if (ierr /= 0) return
-  call read_value_logical(PML_CONDITIONS, 'solver.PML_CONDITIONS', ierr)
+  call read_value_logical(PML_CONDITIONS, 'PML_CONDITIONS', ierr)
   if (ierr /= 0) return
-  call read_value_logical(PML_INSTEAD_OF_FREE_SURFACE, 'model.PML_INSTEAD_OF_FREE_SURFACE', ierr)
+  call read_value_logical(PML_INSTEAD_OF_FREE_SURFACE, 'PML_INSTEAD_OF_FREE_SURFACE', ierr)
   if (ierr /= 0) return
-  call read_value_double_precision(f0_FOR_PML, 'model.f0_FOR_PML', ierr)
+  call read_value_double_precision(f0_FOR_PML, 'f0_FOR_PML', ierr)
   if (ierr /= 0) return
-  call read_value_logical(STACEY_ABSORBING_CONDITIONS, 'solver.STACEY_ABSORBING_CONDITIONS', ierr)
+  call read_value_logical(STACEY_ABSORBING_CONDITIONS, 'STACEY_ABSORBING_CONDITIONS', ierr)
   if (ierr /= 0) return
-  call read_value_logical(STACEY_INSTEAD_OF_FREE_SURFACE, 'model.STACEY_INSTEAD_OF_FREE_SURFACE', ierr)
+  call read_value_logical(STACEY_INSTEAD_OF_FREE_SURFACE, 'STACEY_INSTEAD_OF_FREE_SURFACE', ierr)
   if (ierr /= 0) return
-  call read_value_logical(CREATE_SHAKEMAP, 'solver.CREATE_SHAKEMAP', ierr)
+  call read_value_logical(CREATE_SHAKEMAP, 'CREATE_SHAKEMAP', ierr)
   if (ierr /= 0) return
-  call read_value_logical(MOVIE_SURFACE, 'solver.MOVIE_SURFACE', ierr)
+  call read_value_logical(MOVIE_SURFACE, 'MOVIE_SURFACE', ierr)
   if (ierr /= 0) return
-  call read_value_integer(MOVIE_TYPE, 'solver.MOVIE_TYPE', ierr)
+  call read_value_integer(MOVIE_TYPE, 'MOVIE_TYPE', ierr)
   if (ierr /= 0) return
-  call read_value_logical(MOVIE_VOLUME, 'solver.MOVIE_VOLUME', ierr)
+  call read_value_logical(MOVIE_VOLUME, 'MOVIE_VOLUME', ierr)
   if (ierr /= 0) return
-  call read_value_logical(SAVE_DISPLACEMENT, 'solver.SAVE_DISPLACEMENT', ierr)
+  call read_value_logical(SAVE_DISPLACEMENT, 'SAVE_DISPLACEMENT', ierr)
   if (ierr /= 0) return
-  call read_value_logical(USE_HIGHRES_FOR_MOVIES, 'solver.USE_HIGHRES_FOR_MOVIES', ierr)
+  call read_value_logical(USE_HIGHRES_FOR_MOVIES, 'USE_HIGHRES_FOR_MOVIES', ierr)
   if (ierr /= 0) return
-  call read_value_integer(NTSTEP_BETWEEN_FRAMES, 'solver.NTSTEP_BETWEEN_FRAMES', ierr)
+  call read_value_integer(NTSTEP_BETWEEN_FRAMES, 'NTSTEP_BETWEEN_FRAMES', ierr)
   if (ierr /= 0) return
-  call read_value_double_precision(HDUR_MOVIE, 'solver.HDUR_MOVIE', ierr)
+  call read_value_double_precision(HDUR_MOVIE, 'HDUR_MOVIE', ierr)
   if (ierr /= 0) return
-  call read_value_logical(SAVE_MESH_FILES, 'mesher.SAVE_MESH_FILES', ierr)
+  call read_value_logical(SAVE_MESH_FILES, 'SAVE_MESH_FILES', ierr)
   if (ierr /= 0) return
   call read_value_string(LOCAL_PATH, 'LOCAL_PATH', ierr)
   if (ierr /= 0) return
-  call read_value_integer(NTSTEP_BETWEEN_OUTPUT_INFO, 'solver.NTSTEP_BETWEEN_OUTPUT_INFO', ierr)
+  call read_value_integer(NTSTEP_BETWEEN_OUTPUT_INFO, 'NTSTEP_BETWEEN_OUTPUT_INFO', ierr)
   if (ierr /= 0) return
-  call read_value_integer(NTSTEP_BETWEEN_OUTPUT_SEISMOS, 'solver.NTSTEP_BETWEEN_OUTPUT_SEISMOS', ierr)
+  call read_value_integer(NTSTEP_BETWEEN_OUTPUT_SEISMOS, 'NTSTEP_BETWEEN_OUTPUT_SEISMOS', ierr)
   if (ierr /= 0) return
-  call read_value_integer(NTSTEP_BETWEEN_READ_ADJSRC, 'solver.NTSTEP_BETWEEN_READ_ADJSRC', ierr)
+  call read_value_integer(NTSTEP_BETWEEN_READ_ADJSRC, 'NTSTEP_BETWEEN_READ_ADJSRC', ierr)
   if (ierr /= 0) return
-  call read_value_logical(USE_FORCE_POINT_SOURCE, 'solver.USE_FORCE_POINT_SOURCE', ierr)
+  call read_value_logical(USE_FORCE_POINT_SOURCE, 'USE_FORCE_POINT_SOURCE', ierr)
   if (ierr /= 0) return
-  call read_value_logical(USE_RICKER_TIME_FUNCTION, 'solver.USE_RICKER_TIME_FUNCTION', ierr)
+  call read_value_logical(USE_RICKER_TIME_FUNCTION, 'USE_RICKER_TIME_FUNCTION', ierr)
   if (ierr /= 0) return
-  call read_value_logical(PRINT_SOURCE_TIME_FUNCTION, 'solver.PRINT_SOURCE_TIME_FUNCTION', ierr)
+  call read_value_logical(PRINT_SOURCE_TIME_FUNCTION, 'PRINT_SOURCE_TIME_FUNCTION', ierr)
   if (ierr /= 0) return
 
   !! read the traction path directory
@@ -369,8 +369,8 @@
   ! opens file Par_file
   call open_parameter_file(ierr)
 
-  call read_value_logical(GPU_MODE, 'solver.GPU_MODE', ierr)
-  call read_value_logical(GRAVITY, 'solver.GRAVITY', ierr)
+  call read_value_logical(GPU_MODE, 'GPU_MODE', ierr)
+  call read_value_logical(GRAVITY, 'GRAVITY', ierr)
 
   ! close parameter file
   call close_parameter_file()
@@ -410,13 +410,13 @@ subroutine read_adios_parameters(ADIOS_ENABLED, ADIOS_FOR_DATABASES,       &
   ADIOS_FOR_KERNELS        = .false.
   ! opens file Par_file
   call open_parameter_file(ierr)
-  call read_value_logical(ADIOS_ENABLED, 'solver.ADIOS_ENABLED', ierr)
+  call read_value_logical(ADIOS_ENABLED, 'ADIOS_ENABLED', ierr)
   if (ierr == 0 .and. ADIOS_ENABLED) then
-    call read_value_logical(ADIOS_FOR_DATABASES, 'solver.ADIOS_FOR_DATABASES', ierr)
-    call read_value_logical(ADIOS_FOR_MESH, 'solver.ADIOS_FOR_MESH', ierr)
+    call read_value_logical(ADIOS_FOR_DATABASES, 'ADIOS_FOR_DATABASES', ierr)
+    call read_value_logical(ADIOS_FOR_MESH, 'ADIOS_FOR_MESH', ierr)
     call read_value_logical(ADIOS_FOR_FORWARD_ARRAYS, &
-                           'solver.ADIOS_FOR_FORWARD_ARRAYS', ierr)
-    call read_value_logical(ADIOS_FOR_KERNELS, 'solver.ADIOS_FOR_KERNELS', ierr)
+                           'ADIOS_FOR_FORWARD_ARRAYS', ierr)
+    call read_value_logical(ADIOS_FOR_KERNELS, 'ADIOS_FOR_KERNELS', ierr)
   endif
   call close_parameter_file()
 



More information about the CIG-COMMITS mailing list