[cig-commits] [commit] devel, master: Remove Par_file variable prefixes. (4c04d81)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:20:21 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit 4c04d8144e54fd078d0a795daee6ae63897f6ddd
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Sun Jun 1 03:02:31 2014 -0400
Remove Par_file variable prefixes.
These are not used by the Par_file parsing code. Some places even didn't
have them.
>---------------------------------------------------------------
4c04d8144e54fd078d0a795daee6ae63897f6ddd
src/shared/param_reader.c | 12 +--
src/shared/read_parameter_file.f90 | 183 ++++++++++++++++---------------------
2 files changed, 79 insertions(+), 116 deletions(-)
diff --git a/src/shared/param_reader.c b/src/shared/param_reader.c
index 2c1d2f0..5e41555 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',
@@ -185,11 +177,10 @@ FC_FUNC_(param_read,PARAM_READ)(char * string_read, int * string_read_len, char
regfree(&compiled_pattern);
return;
}
- // printf("Line read = %s\n", line);
// 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 +191,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 b8b34fd..16f1e13 100644
--- a/src/shared/read_parameter_file.f90
+++ b/src/shared/read_parameter_file.f90
@@ -51,13 +51,13 @@
if (ierr /= 0) stop 'an error occurred while opening the parameter file'
! reads in values
- call read_value_integer(SIMULATION_TYPE, 'solver.SIMULATION_TYPE', ierr)
+ call read_value_integer(SIMULATION_TYPE, 'SIMULATION_TYPE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: SIMULATION_TYPE'
- call read_value_integer(NOISE_TOMOGRAPHY, 'solver.NOISE_TOMOGRAPHY', ierr)
+ call read_value_integer(NOISE_TOMOGRAPHY, 'NOISE_TOMOGRAPHY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NOISE_TOMOGRAPHY'
- call read_value_logical(SAVE_FORWARD, 'solver.SAVE_FORWARD', ierr)
+ call read_value_logical(SAVE_FORWARD, 'SAVE_FORWARD', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: SAVE_FORWARD'
- call read_value_integer(NCHUNKS, 'mesher.NCHUNKS', ierr)
+ call read_value_integer(NCHUNKS, 'NCHUNKS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NCHUNKS'
if( NCHUNKS == 6 ) then
@@ -69,109 +69,109 @@
GAMMA_ROTATION_AZIMUTH = 0.d0
else
! 1/2-chunk simulations
- call read_value_double_precision(ANGULAR_WIDTH_XI_IN_DEGREES, 'mesher.ANGULAR_WIDTH_XI_IN_DEGREES', ierr)
+ call read_value_double_precision(ANGULAR_WIDTH_XI_IN_DEGREES, 'ANGULAR_WIDTH_XI_IN_DEGREES', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ANGULAR_WIDTH_XI...'
- call read_value_double_precision(ANGULAR_WIDTH_ETA_IN_DEGREES, 'mesher.ANGULAR_WIDTH_ETA_IN_DEGREES', ierr)
+ call read_value_double_precision(ANGULAR_WIDTH_ETA_IN_DEGREES, 'ANGULAR_WIDTH_ETA_IN_DEGREES', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ANGULAR_WIDTH_ETA...'
- call read_value_double_precision(CENTER_LATITUDE_IN_DEGREES, 'mesher.CENTER_LATITUDE_IN_DEGREES', ierr)
+ call read_value_double_precision(CENTER_LATITUDE_IN_DEGREES, 'CENTER_LATITUDE_IN_DEGREES', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: CENTER_LATITUDE...'
- call read_value_double_precision(CENTER_LONGITUDE_IN_DEGREES, 'mesher.CENTER_LONGITUDE_IN_DEGREES', ierr)
+ call read_value_double_precision(CENTER_LONGITUDE_IN_DEGREES, 'CENTER_LONGITUDE_IN_DEGREES', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: CENTER_LONGITUDE...'
- call read_value_double_precision(GAMMA_ROTATION_AZIMUTH, 'mesher.GAMMA_ROTATION_AZIMUTH', ierr)
+ call read_value_double_precision(GAMMA_ROTATION_AZIMUTH, 'GAMMA_ROTATION_AZIMUTH', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: GAMMA_ROTATION...'
endif
! number of elements at the surface along the two sides of the first chunk
- call read_value_integer(NEX_XI_read, 'mesher.NEX_XI', ierr)
+ call read_value_integer(NEX_XI_read, 'NEX_XI', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NEX_XI'
- call read_value_integer(NEX_ETA_read, 'mesher.NEX_ETA', ierr)
+ call read_value_integer(NEX_ETA_read, 'NEX_ETA', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NEX_ETA'
- call read_value_integer(NPROC_XI_read, 'mesher.NPROC_XI', ierr)
+ call read_value_integer(NPROC_XI_read, 'NPROC_XI', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NPROC_XI'
- call read_value_integer(NPROC_ETA_read, 'mesher.NPROC_ETA', ierr)
+ call read_value_integer(NPROC_ETA_read, 'NPROC_ETA', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NPROC_ETA'
! physical parameters
- call read_value_logical(OCEANS, 'model.OCEANS', ierr)
+ call read_value_logical(OCEANS, 'OCEANS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: OCEANS'
- call read_value_logical(ELLIPTICITY, 'model.ELLIPTICITY', ierr)
+ call read_value_logical(ELLIPTICITY, 'ELLIPTICITY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ELLIPTICITIY'
- call read_value_logical(TOPOGRAPHY, 'model.TOPOGRAPHY', ierr)
+ call read_value_logical(TOPOGRAPHY, 'TOPOGRAPHY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: TOPOGRAPHY'
- call read_value_logical(GRAVITY, 'model.GRAVITY', ierr)
+ call read_value_logical(GRAVITY, 'GRAVITY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: GRAVITY'
- call read_value_logical(ROTATION, 'model.ROTATION', ierr)
+ call read_value_logical(ROTATION, 'ROTATION', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ROTATION'
- call read_value_logical(ATTENUATION, 'model.ATTENUATION', ierr)
+ call read_value_logical(ATTENUATION, 'ATTENUATION', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ATTENUATION'
- call read_value_logical(ABSORBING_CONDITIONS, 'solver.ABSORBING_CONDITIONS', ierr)
+ call read_value_logical(ABSORBING_CONDITIONS, 'ABSORBING_CONDITIONS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ABSORBING_CONDITIONS'
! 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_double_precision(RECORD_LENGTH_IN_MINUTES, 'solver.RECORD_LENGTH_IN_MINUTES', ierr)
+ call read_value_double_precision(RECORD_LENGTH_IN_MINUTES, 'RECORD_LENGTH_IN_MINUTES', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: RECORD_LENGTH_IN_MINUTES'
! attenuation parameters
- call read_value_logical(ATTENUATION_1D_WITH_3D_STORAGE, 'solver.ATTENUATION_1D_WITH_3D_STORAGE', ierr)
+ call read_value_logical(ATTENUATION_1D_WITH_3D_STORAGE, 'ATTENUATION_1D_WITH_3D_STORAGE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ATTENUATION_1D_WITH_3D_STORAGE'
- call read_value_logical(PARTIAL_PHYS_DISPERSION_ONLY, 'solver.PARTIAL_PHYS_DISPERSION_ONLY', ierr)
+ call read_value_logical(PARTIAL_PHYS_DISPERSION_ONLY, 'PARTIAL_PHYS_DISPERSION_ONLY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: PARTIAL_PHYS_DISPERSION_ONLY'
- call read_value_logical(UNDO_ATTENUATION, 'solver.UNDO_ATTENUATION', ierr)
+ call read_value_logical(UNDO_ATTENUATION, 'UNDO_ATTENUATION', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: UNDO_ATTENUATION'
- call read_value_integer(NT_DUMP_ATTENUATION, 'solver.NT_DUMP_ATTENUATION', ierr)
+ call read_value_integer(NT_DUMP_ATTENUATION, 'NT_DUMP_ATTENUATION', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NT_DUMP_ATTENUATION'
! mass matrix corrections
- call read_value_logical(EXACT_MASS_MATRIX_FOR_ROTATION, 'solver.EXACT_MASS_MATRIX_FOR_ROTATION', ierr)
+ call read_value_logical(EXACT_MASS_MATRIX_FOR_ROTATION, 'EXACT_MASS_MATRIX_FOR_ROTATION', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: EXACT_MASS_MATRIX_FOR_ROTATION'
! low-memory Runge-Kutta time scheme
- call read_value_logical(USE_LDDRK, 'solver.USE_LDDRK', ierr)
+ call read_value_logical(USE_LDDRK, 'USE_LDDRK', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: USE_LDDRK'
- call read_value_logical(INCREASE_CFL_FOR_LDDRK, 'solver.INCREASE_CFL_FOR_LDDRK', ierr)
+ call read_value_logical(INCREASE_CFL_FOR_LDDRK, 'INCREASE_CFL_FOR_LDDRK', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: INCREASE_CFL_FOR_LDDRK'
- call read_value_double_precision(RATIO_BY_WHICH_TO_INCREASE_IT, 'solver.RATIO_BY_WHICH_TO_INCREASE_IT', ierr)
+ call read_value_double_precision(RATIO_BY_WHICH_TO_INCREASE_IT, 'RATIO_BY_WHICH_TO_INCREASE_IT', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: RATIO_BY_WHICH_TO_INCREASE_IT'
! movie options
- call read_value_logical(MOVIE_SURFACE, 'solver.MOVIE_SURFACE', ierr)
+ call read_value_logical(MOVIE_SURFACE, 'MOVIE_SURFACE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_SURFACE'
- call read_value_logical(MOVIE_VOLUME, 'solver.MOVIE_VOLUME', ierr)
+ call read_value_logical(MOVIE_VOLUME, 'MOVIE_VOLUME', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_VOLUME'
- call read_value_logical(MOVIE_COARSE,'solver.MOVIE_COARSE', ierr)
+ call read_value_logical(MOVIE_COARSE,'MOVIE_COARSE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_COARSE'
- 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) stop 'an error occurred while reading the parameter file: NTSTEP_BETWEEN_FRAMES'
- call read_value_double_precision(HDUR_MOVIE, 'solver.HDUR_MOVIE', ierr)
+ call read_value_double_precision(HDUR_MOVIE, 'HDUR_MOVIE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: HDUR_MOVIE'
- call read_value_integer(MOVIE_VOLUME_TYPE, 'solver.MOVIE_VOLUME_TYPE', ierr)
+ call read_value_integer(MOVIE_VOLUME_TYPE, 'MOVIE_VOLUME_TYPE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_VOLUME_TYPE'
- call read_value_double_precision(MOVIE_TOP_KM, 'solver.MOVIE_TOP_KM', ierr)
+ call read_value_double_precision(MOVIE_TOP_KM, 'MOVIE_TOP_KM', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_TOP_KM'
- call read_value_double_precision(MOVIE_BOTTOM_KM, 'solver.MOVIE_BOTTOM_KM', ierr)
+ call read_value_double_precision(MOVIE_BOTTOM_KM, 'MOVIE_BOTTOM_KM', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_BOTTOM_KM'
- call read_value_double_precision(MOVIE_WEST_DEG, 'solver.MOVIE_WEST_DEG', ierr)
+ call read_value_double_precision(MOVIE_WEST_DEG, 'MOVIE_WEST_DEG', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_WEST_DEG'
- call read_value_double_precision(MOVIE_EAST_DEG, 'solver.MOVIE_EAST_DEG', ierr)
+ call read_value_double_precision(MOVIE_EAST_DEG, 'MOVIE_EAST_DEG', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_EAST_DEG'
- call read_value_double_precision(MOVIE_NORTH_DEG, 'solver.MOVIE_NORTH_DEG', ierr)
+ call read_value_double_precision(MOVIE_NORTH_DEG, 'MOVIE_NORTH_DEG', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_NORTH_DEG'
- call read_value_double_precision(MOVIE_SOUTH_DEG, 'solver.MOVIE_SOUTH_DEG', ierr)
+ call read_value_double_precision(MOVIE_SOUTH_DEG, 'MOVIE_SOUTH_DEG', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_SOUTH_DEG'
- call read_value_integer(MOVIE_START, 'solver.MOVIE_START', ierr)
+ call read_value_integer(MOVIE_START, 'MOVIE_START', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_START'
- call read_value_integer(MOVIE_STOP, 'solver.MOVIE_STOP', ierr)
+ call read_value_integer(MOVIE_STOP, 'MOVIE_STOP', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: MOVIE_STOP'
! run checkpointing
- 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) stop 'an error occurred while reading the parameter file: SAVE_MESH_FILES'
- call read_value_integer(NUMBER_OF_RUNS, 'solver.NUMBER_OF_RUNS', ierr)
+ call read_value_integer(NUMBER_OF_RUNS, 'NUMBER_OF_RUNS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NUMBER_OF_RUNS'
- call read_value_integer(NUMBER_OF_THIS_RUN, 'solver.NUMBER_OF_THIS_RUN', ierr)
+ call read_value_integer(NUMBER_OF_THIS_RUN, 'NUMBER_OF_THIS_RUN', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: NUMBER_OF_THIS_RUN'
! data file output directories
@@ -181,77 +181,77 @@
if (ierr /= 0) stop 'an error occurred while reading the parameter file: LOCAL_TMP_PATH'
! user output
- 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) stop 'an error occurred while reading the parameter file: NTSTEP_BETWEEN_OUTPUT_INFO'
- 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) stop 'an error occurred while reading the parameter file: NTSTEP_BETWEEN_OUTPUT_SEISMOS'
- 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
! seismogram output
- call read_value_logical(OUTPUT_SEISMOS_ASCII_TEXT, 'solver.OUTPUT_SEISMOS_ASCII_TEXT', ierr)
+ call read_value_logical(OUTPUT_SEISMOS_ASCII_TEXT, 'OUTPUT_SEISMOS_ASCII_TEXT', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: OUTPUT_SIESMOS_ASCII_TEXT'
- call read_value_logical(OUTPUT_SEISMOS_SAC_ALPHANUM, 'solver.OUTPUT_SEISMOS_SAC_ALPHANUM', ierr)
+ call read_value_logical(OUTPUT_SEISMOS_SAC_ALPHANUM, 'OUTPUT_SEISMOS_SAC_ALPHANUM', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: OUTPUT_SEISMOS_SAC_ALPHANUM'
- call read_value_logical(OUTPUT_SEISMOS_SAC_BINARY, 'solver.OUTPUT_SEISMOS_SAC_BINARY', ierr)
+ call read_value_logical(OUTPUT_SEISMOS_SAC_BINARY, 'OUTPUT_SEISMOS_SAC_BINARY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: OUTPUT_SEISMOS_SAC_BINARY'
- call read_value_logical(OUTPUT_SEISMOS_ASDF, 'solver.OUTPUT_SEISMOS_ASDF', ierr)
+ call read_value_logical(OUTPUT_SEISMOS_ASDF, 'OUTPUT_SEISMOS_ASDF', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: OUTPUT_ASDF'
- call read_value_logical(ROTATE_SEISMOGRAMS_RT, 'solver.ROTATE_SEISMOGRAMS_RT', ierr)
+ call read_value_logical(ROTATE_SEISMOGRAMS_RT, 'ROTATE_SEISMOGRAMS_RT', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ROTATE_SEISMOGRAMS_RT'
- call read_value_logical(WRITE_SEISMOGRAMS_BY_MASTER, 'solver.WRITE_SEISMOGRAMS_BY_MASTER', ierr)
+ call read_value_logical(WRITE_SEISMOGRAMS_BY_MASTER, 'WRITE_SEISMOGRAMS_BY_MASTER', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: WRITE_SEISMOGRAMS_BY_MASTER'
- call read_value_logical(SAVE_ALL_SEISMOS_IN_ONE_FILE, 'solver.SAVE_ALL_SEISMOS_IN_ONE_FILE', ierr)
+ call read_value_logical(SAVE_ALL_SEISMOS_IN_ONE_FILE, 'SAVE_ALL_SEISMOS_IN_ONE_FILE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: SAVE_ALL_SEISMOS_IN_ONE_FILE'
- call read_value_logical(USE_BINARY_FOR_LARGE_FILE, 'solver.USE_BINARY_FOR_LARGE_FILE', ierr)
+ call read_value_logical(USE_BINARY_FOR_LARGE_FILE, 'USE_BINARY_FOR_LARGE_FILE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: USE_BINARY_FOR_LARGE_FILE'
- call read_value_logical(RECEIVERS_CAN_BE_BURIED, 'solver.RECEIVERS_CAN_BE_BURIED', ierr)
+ call read_value_logical(RECEIVERS_CAN_BE_BURIED, 'RECEIVERS_CAN_BE_BURIED', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: RECEIVERS_CAN_BE_BURIED'
- 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) stop 'an error occurred while reading the parameter file: PRINT_SOURCE_TIME_FUNCTION'
! adjoint kernels
- call read_value_logical(ANISOTROPIC_KL, 'solver.ANISOTROPIC_KL', ierr)
+ call read_value_logical(ANISOTROPIC_KL, 'ANISOTROPIC_KL', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ANISOTROPIC_KL'
- call read_value_logical(SAVE_TRANSVERSE_KL_ONLY, 'solver.SAVE_TRANSVERSE_KL_ONLY', ierr)
+ call read_value_logical(SAVE_TRANSVERSE_KL_ONLY, 'SAVE_TRANSVERSE_KL_ONLY', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: SAVE_TRANSVERSE_KL_ONLY'
- call read_value_logical(APPROXIMATE_HESS_KL, 'solver.APPROXIMATE_HESS_KL', ierr)
+ call read_value_logical(APPROXIMATE_HESS_KL, 'APPROXIMATE_HESS_KL', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: APPROXIMATE_HESS_KL'
- call read_value_logical(USE_FULL_TISO_MANTLE, 'solver.USE_FULL_TISO_MANTLE', ierr)
+ call read_value_logical(USE_FULL_TISO_MANTLE, 'USE_FULL_TISO_MANTLE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: USE_FULL_TISO_MANTLE'
- call read_value_logical(SAVE_SOURCE_MASK, 'solver.SAVE_SOURCE_MASK', ierr)
+ call read_value_logical(SAVE_SOURCE_MASK, 'SAVE_SOURCE_MASK', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: SAVE_SOURCE_MASK'
- call read_value_logical(SAVE_REGULAR_KL, 'solver.SAVE_REGULAR_KL', ierr)
+ call read_value_logical(SAVE_REGULAR_KL, 'SAVE_REGULAR_KL', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: SAVE_REGULAR_KL'
! GPU simulations
- call read_value_logical(GPU_MODE, 'solver.GPU_MODE', ierr)
+ call read_value_logical(GPU_MODE, 'GPU_MODE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: GPU_MODE'
if (GPU_MODE) then
- call read_value_integer(GPU_RUNTIME, 'solver.GPU_RUNTIME', ierr)
+ call read_value_integer(GPU_RUNTIME, 'GPU_RUNTIME', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: GPU_RUNTIME'
- call read_value_string(GPU_PLATFORM, 'solver.GPU_PLATFORM', ierr)
+ call read_value_string(GPU_PLATFORM, 'GPU_PLATFORM', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: GPU_PLATFORM'
- call read_value_string(GPU_DEVICE, 'solver.GPU_DEVICE', ierr)
+ call read_value_string(GPU_DEVICE, 'GPU_DEVICE', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: GPU_DEVICE'
endif
! ADIOS file format output
- call read_value_logical(ADIOS_ENABLED, 'solver.ADIOS_ENABLED', ierr)
+ call read_value_logical(ADIOS_ENABLED, 'ADIOS_ENABLED', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_ENABLED'
- call read_value_logical(ADIOS_FOR_FORWARD_ARRAYS, 'solver.ADIOS_FOR_FORWARD_ARRAYS', ierr)
+ call read_value_logical(ADIOS_FOR_FORWARD_ARRAYS, 'ADIOS_FOR_FORWARD_ARRAYS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_FORWARD_ARRAYS'
- call read_value_logical(ADIOS_FOR_MPI_ARRAYS, 'solver.ADIOS_FOR_MPI_ARRAYS', ierr)
+ call read_value_logical(ADIOS_FOR_MPI_ARRAYS, 'ADIOS_FOR_MPI_ARRAYS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_MPI_ARRAYS'
- call read_value_logical(ADIOS_FOR_ARRAYS_SOLVER, 'solver.ADIOS_FOR_ARRAYS_SOLVER', ierr)
+ call read_value_logical(ADIOS_FOR_ARRAYS_SOLVER, 'ADIOS_FOR_ARRAYS_SOLVER', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_ARRAYS_SOLVER'
- call read_value_logical(ADIOS_FOR_SOLVER_MESHFILES, 'solver.ADIOS_FOR_SOLVER_MESHFILES', ierr)
+ call read_value_logical(ADIOS_FOR_SOLVER_MESHFILES, 'ADIOS_FOR_SOLVER_MESHFILES', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_SOLVER_MESHFILES'
- call read_value_logical(ADIOS_FOR_AVS_DX, 'solver.ADIOS_FOR_AVS_DX', ierr)
+ call read_value_logical(ADIOS_FOR_AVS_DX, 'ADIOS_FOR_AVS_DX', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_AVS_DX'
- call read_value_logical(ADIOS_FOR_KERNELS, 'solver.ADIOS_FOR_KERNELS', ierr)
+ call read_value_logical(ADIOS_FOR_KERNELS, 'ADIOS_FOR_KERNELS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_KERNELS'
- call read_value_logical(ADIOS_FOR_MODELS, 'solver.ADIOS_FOR_MODELS', ierr)
+ call read_value_logical(ADIOS_FOR_MODELS, 'ADIOS_FOR_MODELS', ierr)
if (ierr /= 0) stop 'an error occurred while reading the parameter file: ADIOS_FOR_MODELS'
! closes parameter file
@@ -323,31 +323,4 @@
if( UNDO_ATTENUATION .and. SIMULATION_TYPE == 3 .and. (MOVIE_VOLUME .or. MOVIE_SURFACE) ) &
stop 'UNDO_ATTENUATION support not implemented yet for SIMULATION_TYPE == 3 and movie simulations'
-
end subroutine read_parameter_file
-
-!
-!-------------------------------------------------------------------------------------------------
-!
-! unused...
-!
-! subroutine read_gpu_mode(GPU_MODE)
-!
-! use constants
-! implicit none
-!
-! logical :: GPU_MODE
-!
-! ! initializes flags
-! GPU_MODE = .false.
-!
-! ! opens file Par_file
-! call open_parameter_file()
-!
-! call read_value_logical(GPU_MODE, 'solver.GPU_MODE')
-!
-! ! close parameter file
-! call close_parameter_file()
-!
-! end subroutine read_gpu_mode
-!
More information about the CIG-COMMITS
mailing list