[cig-commits] r20308 - in seismo/2D/SPECFEM2D/trunk: DATA src/meshfem2D
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Mon Jun 4 16:59:12 PDT 2012
Author: dkomati1
Date: 2012-06-04 16:59:12 -0700 (Mon, 04 Jun 2012)
New Revision: 20308
Modified:
seismo/2D/SPECFEM2D/trunk/DATA/Par_file
seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90
Log:
moved the JPEG section before the PostScript section
Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file 2012-06-04 23:45:24 UTC (rev 20307)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file 2012-06-04 23:59:12 UTC (rev 20308)
@@ -60,6 +60,14 @@
NSTEP_BETWEEN_OUTPUT_INFO = 100 # every how many time steps we display information about the simulation (costly, do not use a very small value)
####
NSTEP_BETWEEN_OUTPUT_IMAGES = 100 # every how many time steps we draw JPEG or PostScript pictures of the simulation (costly, do not use a very small value)
+#### for JPEG color images ####
+output_color_image = .true. # output JPEG color image of the results every NSTEP_BETWEEN_OUTPUT_IMAGES time steps
+imagetype_JPEG = 2 # display 1=displ_Ux 2=displ_Uz 3=displ_norm 4=veloc_Vx 5=veloc_Vz 6=veloc_norm 7=accel_Ax 8=accel_Az 9=accel_norm 10=pressure
+factor_subsample_image = 1 # factor to spatially subsample color JPEG images output by the code (useful for very large models)
+POWER_DISPLAY_COLOR = 0.30d0 # non linear display to enhance small amplitudes in JPEG color images
+DRAW_SOURCES_AND_RECEIVERS = .true. # display sources as orange crosses and receivers are green squares in JPEG images or not
+DRAW_WATER_IN_BLUE = .true. # display acoustic layers as constant blue in JPEG images, because they likely correspond to water in the case of ocean acoustics or in the case of offshore oil industry experiments (if off, display them as greyscale, as for elastic or poroelastic elements, for instance for acoustic-only oil industry models of solid media)
+USE_SNAPSHOT_NUMBER_IN_FILENAME = .false. # use snapshot number in the file name of JPEG color snapshots instead of the time step
#### for PostScript snapshots ####
output_postscript_snapshot = .true. # output Postscript snapshot of the results every NSTEP_BETWEEN_OUTPUT_IMAGES time steps
imagetype_postscript = 1 # display 1=displ vector 2=veloc vector 3=accel vector 4=pressure
@@ -72,14 +80,6 @@
subsamp_postscript = 1 # subsampling of background velocity model in PostScript snapshots
sizemax_arrows = 1.d0 # maximum size of arrows on PostScript plots in centimeters
US_LETTER = .false. # US letter or European A4 paper for PostScript plots
-#### for JPEG color images ####
-output_color_image = .true. # output JPEG color image of the results every NSTEP_BETWEEN_OUTPUT_IMAGES time steps
-imagetype_JPEG = 2 # display 1=displ_Ux 2=displ_Uz 3=displ_norm 4=veloc_Vx 5=veloc_Vz 6=veloc_norm 7=accel_Ax 8=accel_Az 9=accel_norm 10=pressure
-factor_subsample_image = 1 # factor to spatially subsample color JPEG images output by the code (useful for very large models)
-POWER_DISPLAY_COLOR = 0.30d0 # non linear display to enhance small amplitudes in JPEG color images
-DRAW_SOURCES_AND_RECEIVERS = .true. # display sources as orange crosses and receivers are green squares in JPEG images or not
-DRAW_WATER_IN_BLUE = .true. # display acoustic layers as constant blue in JPEG images, because they likely correspond to water in the case of ocean acoustics or in the case of offshore oil industry experiments (if off, display them as greyscale, as for elastic or poroelastic elements, for instance for acoustic-only oil industry models of solid media)
-USE_SNAPSHOT_NUMBER_IN_FILENAME = .false. # use snapshot number in the file name of JPEG color snapshots instead of the time step
####
NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS = 100 # every how many time steps we dump results of the simulation as ASCII text files (costly, do not use a very small value)
output_TEXT_wavefield_dumps = .false. # output wave field to text file every NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS time steps (creates very big files)
Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90 2012-06-04 23:45:24 UTC (rev 20307)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90 2012-06-04 23:59:12 UTC (rev 20308)
@@ -333,6 +333,27 @@
call read_value_integer_p(NSTEP_BETWEEN_OUTPUT_IMAGES, 'solver.NSTEP_BETWEEN_OUTPUT_IMAGES')
if(err_occurred() /= 0) stop 'error reading parameter 33c in Par_file'
+ call read_value_logical_p(output_color_image, 'solver.output_color_image')
+ if(err_occurred() /= 0) stop 'error reading parameter 35 in Par_file'
+
+ call read_value_integer_p(imagetype_JPEG, 'solver.imagetype_JPEG')
+ if(err_occurred() /= 0) stop 'error reading parameter 33f in Par_file'
+
+ call read_value_integer_p(factor_subsample_image, 'solver.factor_subsample_image')
+ if(err_occurred() /= 0) stop 'error reading parameter 43b in Par_file'
+
+ call read_value_double_precision_p(POWER_DISPLAY_COLOR, 'solver.POWER_DISPLAY_COLOR')
+ if(err_occurred() /= 0) stop 'error reading parameter 43c in Par_file'
+
+ call read_value_logical_p(DRAW_SOURCES_AND_RECEIVERS, 'solver.DRAW_SOURCES_AND_RECEIVERS')
+ if(err_occurred() /= 0) stop 'error reading parameter 12d in Par_file'
+
+ call read_value_logical_p(DRAW_WATER_IN_BLUE, 'solver.DRAW_WATER_IN_BLUE')
+ if(err_occurred() /= 0) stop 'error reading parameter 43d in Par_file'
+
+ call read_value_logical_p(USE_SNAPSHOT_NUMBER_IN_FILENAME, 'solver.USE_SNAPSHOT_NUMBER_IN_FILENAME')
+ if(err_occurred() /= 0) stop 'error reading parameter 44c in Par_file'
+
call read_value_logical_p(output_postscript_snapshot, 'solver.output_postscript_snapshot')
if(err_occurred() /= 0) stop 'error reading parameter 34 in Par_file'
@@ -366,27 +387,6 @@
call read_value_logical_p(US_LETTER, 'solver.US_LETTER')
if(err_occurred() /= 0) stop 'error reading parameter 44b in Par_file'
- call read_value_logical_p(output_color_image, 'solver.output_color_image')
- if(err_occurred() /= 0) stop 'error reading parameter 35 in Par_file'
-
- call read_value_integer_p(imagetype_JPEG, 'solver.imagetype_JPEG')
- if(err_occurred() /= 0) stop 'error reading parameter 33f in Par_file'
-
- call read_value_integer_p(factor_subsample_image, 'solver.factor_subsample_image')
- if(err_occurred() /= 0) stop 'error reading parameter 43b in Par_file'
-
- call read_value_double_precision_p(POWER_DISPLAY_COLOR, 'solver.POWER_DISPLAY_COLOR')
- if(err_occurred() /= 0) stop 'error reading parameter 43c in Par_file'
-
- call read_value_logical_p(DRAW_SOURCES_AND_RECEIVERS, 'solver.DRAW_SOURCES_AND_RECEIVERS')
- if(err_occurred() /= 0) stop 'error reading parameter 12d in Par_file'
-
- call read_value_logical_p(DRAW_WATER_IN_BLUE, 'solver.DRAW_WATER_IN_BLUE')
- if(err_occurred() /= 0) stop 'error reading parameter 43d in Par_file'
-
- call read_value_logical_p(USE_SNAPSHOT_NUMBER_IN_FILENAME, 'solver.USE_SNAPSHOT_NUMBER_IN_FILENAME')
- if(err_occurred() /= 0) stop 'error reading parameter 44c in Par_file'
-
call read_value_integer_p(NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS, 'solver.NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS')
if(err_occurred() /= 0) stop 'error reading parameter 33d in Par_file'
More information about the CIG-COMMITS
mailing list