[cig-commits] r20314 - in seismo/2D/SPECFEM2D/trunk: DATA src/meshfem2D src/specfem2D

dkomati1 at geodynamics.org dkomati1 at geodynamics.org
Tue Jun 5 03:55:53 PDT 2012


Author: dkomati1
Date: 2012-06-05 03:55:52 -0700 (Tue, 05 Jun 2012)
New Revision: 20314

Modified:
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file
   seismo/2D/SPECFEM2D/trunk/src/meshfem2D/meshfem2D.F90
   seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90
   seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
Log:
renamed a few flags, and added "use_binary_for_wavefield_dumps"


Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file	2012-06-05 00:45:17 UTC (rev 20313)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file	2012-06-05 10:55:52 UTC (rev 20314)
@@ -37,9 +37,9 @@
 f0_attenuation                  = 5.196152422706633      # (Hz) relevant only if source is a Dirac or a Heaviside, otherwise it is f0 the dominant frequency of the source in the CMTSOLUTION file
 
 # receiver set parameters for seismograms
-seismotype                      = 1              # record 1=displ 2=veloc 3=accel 4=pressure 5=curl of displ 6=the potential
+seismotype                      = 1              # record 1=displ 2=veloc 3=accel 4=pressure 5=curl of displ 6=the fluid potential
 NSTEP_BETWEEN_OUTPUT_SEISMOS    = 5000000        # every how many time steps we save the seismograms (costly, do not use a very small value; if you use a very large value that is larger than the total number of time steps of the run, the seismograms will automatically be saved once at the end of the run anyway)
-save_ASCII_seismograms          = .true.         # save seismograms in ASCII format or not (they are saved once and only once, at the end of the run)
+save_ASCII_seismograms          = .true.         # save seismograms in ASCII format or not
 save_binary_seismograms         = .true.         # save seismograms in binary format or not (can be used jointly with ASCII above to save both)
 subsamp_seismos                 = 1              # subsampling of the seismograms to create smaller files (but less accurately sampled in time)
 generate_STATIONS               = .true.         # creates a STATION file in ./DATA
@@ -60,32 +60,33 @@
 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)
-cutsnaps                        = 1.             # minimum amplitude in % for JPEG and PostScript snapshots
+cutsnaps                        = 1.             # minimum amplitude kept in % for the JPEG and PostScript snapshots; amplitudes below that are muted
 #### for JPEG color images ####
-output_color_image              = .true.         # output JPEG color image of the results every NSTEP_BETWEEN_OUTPUT_IMAGES time steps
+output_color_image              = .true.         # output JPEG color image of the results every NSTEP_BETWEEN_OUTPUT_IMAGES time steps or not
 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_SOURCES_AND_RECEIVERS      = .true.         # display sources as orange crosses and receivers as 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
+USE_SNAPSHOT_NUMBER_IN_FILENAME = .false.        # use snapshot number in the file name of JPEG color snapshots instead of the time step (for instance to create movies in an easier way later)
 #### 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
+output_postscript_snapshot      = .true.         # output Postscript snapshot of the results every NSTEP_BETWEEN_OUTPUT_IMAGES time steps or not
+imagetype_postscript            = 1              # display 1=displ vector 2=veloc vector 3=accel vector 4=pressure; small arrows are displayed for vectors
 meshvect                        = .true.         # display mesh on PostScript plots or not
-modelvect                       = .false.        # display velocity model on PostScript plots
-boundvect                       = .true.         # display boundary conditions on PostScript plots
-interpol                        = .true.         # interpolation of the PostScript display or not
-pointsdisp                      = 6              # points for interpolation of PostScript snapshots (set to 1 for lower-left corner only)
+modelvect                       = .false.        # display velocity model on PostScript plots or not
+boundvect                       = .true.         # display boundary conditions on PostScript plots or not
+interpol                        = .true.         # interpolation of the PostScript display on a regular grid inside each spectral element, or use the non-evenly spaced GLL points
+pointsdisp                      = 6              # number of points in each direction for interpolation of PostScript snapshots (set to 1 for lower-left corner only)
 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.        # use US letter or European A4 paper for PostScript plots
 ####
-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 a text file every NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS time steps (creates very big files)
-imagetype_TEXT_wavefield_dumps  = 1              # display 1=displ vector 2=veloc vector 3=accel vector 4=pressure
+NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS = 100            # every how many time steps we dump results of the simulation as ASCII or BINARY files (costly, do not use a very small value)
+output_wavefield_dumps          = .false.        # output wave field to a text file every NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS time steps (creates very big files)
+imagetype_wavefield_dumps       = 1              # display 1=displ vector 2=veloc vector 3=accel vector 4=pressure
+use_binary_for_wavefield_dumps  = .false.        # use ASCII or BINARY format for the wave field dumps
 ####
-output_grid_gnuplot             = .false.        # generate a GNUPLOT file containing the grid, and a script to plot it
+output_grid_Gnuplot             = .false.        # generate a GNUPLOT file containing the grid, and a script to plot it
 output_grid_ASCII               = .false.        # dump the grid in an ASCII text file consisting of a set of X,Y,Z points or not
 output_energy                   = .false.        # compute and output total acoustic and elastic energy curves (slows down the code significantly)
 

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/meshfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/meshfem2D.F90	2012-06-05 00:45:17 UTC (rev 20313)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/meshfem2D.F90	2012-06-05 10:55:52 UTC (rev 20314)
@@ -764,7 +764,7 @@
   ! ***
   ! *** create a Gnuplot file that displays the grid
   ! ***
-  if (output_grid_gnuplot .and. .not. read_external_mesh) call save_gnuplot_file(ngnod,nx,nz,x,z)
+  if (output_grid_Gnuplot .and. .not. read_external_mesh) call save_gnuplot_file(ngnod,nx,nz,x,z)
 
 
   !*****************************

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90	2012-06-05 00:45:17 UTC (rev 20313)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90	2012-06-05 10:55:52 UTC (rev 20314)
@@ -98,15 +98,15 @@
   double precision, dimension(:), pointer :: xdeb,zdeb,xfin,zfin
   logical, dimension(:), pointer :: enreg_surf_same_vertical
 
-  integer :: NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS, &
-             subsamp_seismos,imagetype_JPEG,imagetype_TEXT_wavefield_dumps
+  integer :: NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS, &
+             subsamp_seismos,imagetype_JPEG,imagetype_wavefield_dumps
   logical :: output_postscript_snapshot,output_color_image
   integer :: imagetype_postscript
   double precision :: cutsnaps
   logical :: meshvect,modelvect,boundvect,interpol
   integer :: pointsdisp,subsamp_postscript
   double precision :: sizemax_arrows
-  logical :: output_grid_gnuplot,output_grid_ASCII,output_energy,output_TEXT_wavefield_dumps
+  logical :: output_grid_Gnuplot,output_grid_ASCII,output_energy,output_wavefield_dumps,use_binary_for_wavefield_dumps
   logical :: plot_lowerleft_corner_only
 
   ! to store density and velocity model
@@ -387,16 +387,19 @@
   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_integer_p(NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS, 'solver.NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS')
+  call read_value_integer_p(NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS, 'solver.NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS')
   if(err_occurred() /= 0) stop 'error reading parameter 33d in Par_file'
 
-  call read_value_logical_p(output_TEXT_wavefield_dumps, 'solver.output_TEXT_wavefield_dumps')
+  call read_value_logical_p(output_wavefield_dumps, 'solver.output_wavefield_dumps')
   if(err_occurred() /= 0) stop 'error reading parameter 48 in Par_file'
 
-  call read_value_integer_p(imagetype_TEXT_wavefield_dumps, 'solver.imagetype_TEXT_wavefield_dumps')
+  call read_value_integer_p(imagetype_wavefield_dumps, 'solver.imagetype_wavefield_dumps')
   if(err_occurred() /= 0) stop 'error reading parameter 33g in Par_file'
 
-  call read_value_logical_p(output_grid_gnuplot, 'solver.output_grid_gnuplot')
+  call read_value_logical_p(use_binary_for_wavefield_dumps, 'solver.use_binary_for_wavefield_dumps')
+  if(err_occurred() /= 0) stop 'error reading parameter 48 in Par_file'
+
+  call read_value_logical_p(output_grid_Gnuplot, 'solver.output_grid_Gnuplot')
   if(err_occurred() /= 0) stop 'error reading parameter 45 in Par_file'
 
   call read_value_logical_p(output_grid_ASCII, 'solver.output_grid_ASCII')

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90	2012-06-05 00:45:17 UTC (rev 20313)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90	2012-06-05 10:55:52 UTC (rev 20314)
@@ -103,8 +103,8 @@
     write(15,*) 'npgeo nproc'
     write(15,*) npgeo,nproc
 
-    write(15,*) 'output_grid_gnuplot interpol'
-    write(15,*) output_grid_gnuplot,interpol
+    write(15,*) 'output_grid_Gnuplot interpol'
+    write(15,*) output_grid_Gnuplot,interpol
 
     write(15,*) 'NSTEP_BETWEEN_OUTPUT_INFO'
     write(15,*) NSTEP_BETWEEN_OUTPUT_INFO
@@ -115,11 +115,11 @@
     write(15,*) 'NSTEP_BETWEEN_OUTPUT_IMAGES'
     write(15,*) NSTEP_BETWEEN_OUTPUT_IMAGES
 
-    write(15,*) 'NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS'
-    write(15,*) NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS
+    write(15,*) 'NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS'
+    write(15,*) NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS
 
-    write(15,*) 'subsamp_seismos imagetype_JPEG imagetype_TEXT_wavefield_dumps'
-    write(15,*) subsamp_seismos,imagetype_JPEG,imagetype_TEXT_wavefield_dumps
+    write(15,*) 'subsamp_seismos imagetype_JPEG imagetype_wavefield_dumps'
+    write(15,*) subsamp_seismos,imagetype_JPEG,imagetype_wavefield_dumps
 
     write(15,*) 'output_postscript_snapshot output_color_image colors numbers'
     write(15,*) output_postscript_snapshot,output_color_image,' 1 0'
@@ -139,9 +139,12 @@
     write(15,*) 'assign_external_model READ_EXTERNAL_SEP_FILE'
     write(15,*) assign_external_model,READ_EXTERNAL_SEP_FILE
 
-    write(15,*) 'output_grid_ASCII output_energy output_TEXT_wavefield_dumps'
-    write(15,*) output_grid_ASCII,output_energy,output_TEXT_wavefield_dumps
+    write(15,*) 'output_grid_ASCII output_energy output_wavefield_dumps'
+    write(15,*) output_grid_ASCII,output_energy,output_wavefield_dumps
 
+    write(15,*) 'use_binary_for_wavefield_dumps'
+    write(15,*) use_binary_for_wavefield_dumps
+
     write(15,*) 'ATTENUATION_VISCOELASTIC_SOLID ATTENUATION_PORO_FLUID_PART'
     write(15,*) ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_PORO_FLUID_PART
 

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90	2012-06-05 00:45:17 UTC (rev 20313)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90	2012-06-05 10:55:52 UTC (rev 20314)
@@ -45,14 +45,14 @@
 
   subroutine read_databases_init(myrank,ipass, &
                   simulation_title,SIMULATION_TYPE,NOISE_TOMOGRAPHY,SAVE_FORWARD,npgeo,nproc, &
-                  output_grid_gnuplot,interpol,NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP_BETWEEN_OUTPUT_IMAGES, &
-                  NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS,subsamp_seismos,imagetype_JPEG,imagetype_TEXT_wavefield_dumps, &
+                  output_grid_Gnuplot,interpol,NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP_BETWEEN_OUTPUT_IMAGES, &
+                  NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS,subsamp_seismos,imagetype_JPEG,imagetype_wavefield_dumps, &
                   output_postscript_snapshot,output_color_image,colors,numbers, &
                   meshvect,modelvect,boundvect,cutsnaps,subsamp_postscript,sizemax_arrows, &
                   anglerec,initialfield,add_Bielak_conditions, &
                   seismotype,imagetype_postscript,assign_external_model,READ_EXTERNAL_SEP_FILE, &
-                  output_grid_ASCII,output_energy,output_TEXT_wavefield_dumps,ATTENUATION_VISCOELASTIC_SOLID, &
-                  ATTENUATION_PORO_FLUID_PART,save_ASCII_seismograms,save_binary_seismograms, &
+                  output_grid_ASCII,output_energy,output_wavefield_dumps,use_binary_for_wavefield_dumps, &
+                  ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_PORO_FLUID_PART,save_ASCII_seismograms,save_binary_seismograms, &
                   DRAW_SOURCES_AND_RECEIVERS,Q0,freq0,p_sv,NSTEP,deltat,NSOURCES, &
                   factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_IN_BLUE,US_LETTER, &
                   POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0,time_stepping_scheme,&
@@ -67,11 +67,11 @@
   character(len=60) simulation_title
   integer :: SIMULATION_TYPE,NOISE_TOMOGRAPHY,npgeo,nproc
   integer :: colors,numbers,subsamp_postscript,seismotype,imagetype_postscript
-  logical :: SAVE_FORWARD,output_grid_gnuplot,interpol,output_postscript_snapshot, &
+  logical :: SAVE_FORWARD,output_grid_Gnuplot,interpol,output_postscript_snapshot, &
     output_color_image
   logical :: meshvect,modelvect,boundvect,initialfield,add_Bielak_conditions, &
     assign_external_model,READ_EXTERNAL_SEP_FILE, &
-    output_grid_ASCII,output_energy,output_TEXT_wavefield_dumps,p_sv
+    output_grid_ASCII,output_energy,output_wavefield_dumps,p_sv,use_binary_for_wavefield_dumps
   logical :: ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_PORO_FLUID_PART, &
              save_ASCII_seismograms,save_binary_seismograms,DRAW_SOURCES_AND_RECEIVERS
 
@@ -80,8 +80,8 @@
   double precision :: deltat
 
   integer :: NSTEP,NSOURCES
-  integer :: NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS, &
-             subsamp_seismos,imagetype_JPEG,imagetype_TEXT_wavefield_dumps
+  integer :: NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS, &
+             subsamp_seismos,imagetype_JPEG,imagetype_wavefield_dumps
 
 ! factor to subsample color images output by the code (useful for very large models)
   integer :: factor_subsample_image
@@ -167,7 +167,7 @@
   read(IIN,*) npgeo,nproc
 
   read(IIN,"(a80)") datlin
-  read(IIN,*) output_grid_gnuplot,interpol
+  read(IIN,*) output_grid_Gnuplot,interpol
 
   read(IIN,"(a80)") datlin
   read(IIN,*) NSTEP_BETWEEN_OUTPUT_INFO
@@ -179,10 +179,10 @@
   read(IIN,*) NSTEP_BETWEEN_OUTPUT_IMAGES
 
   read(IIN,"(a80)") datlin
-  read(IIN,*) NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS
+  read(IIN,*) NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS
 
   read(IIN,"(a80)") datlin
-  read(IIN,*) subsamp_seismos,imagetype_JPEG,imagetype_TEXT_wavefield_dumps
+  read(IIN,*) subsamp_seismos,imagetype_JPEG,imagetype_wavefield_dumps
 
   read(IIN,"(a80)") datlin
   read(IIN,*) output_postscript_snapshot,output_color_image,colors,numbers
@@ -216,9 +216,12 @@
   read(IIN,*) assign_external_model,READ_EXTERNAL_SEP_FILE
 
   read(IIN,"(a80)") datlin
-  read(IIN,*) output_grid_ASCII,output_energy,output_TEXT_wavefield_dumps
+  read(IIN,*) output_grid_ASCII,output_energy,output_wavefield_dumps
 
   read(IIN,"(a80)") datlin
+  read(IIN,*) use_binary_for_wavefield_dumps
+
+  read(IIN,"(a80)") datlin
   read(IIN,*) ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_PORO_FLUID_PART
 
   read(IIN,"(a80)") datlin

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2012-06-05 00:45:17 UTC (rev 20313)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2012-06-05 10:55:52 UTC (rev 20314)
@@ -522,14 +522,14 @@
 
   integer :: colors,numbers,subsamp_postscript,imagetype_postscript, &
     NSTEP_BETWEEN_OUTPUT_INFO,seismotype,NSTEP_BETWEEN_OUTPUT_SEISMOS,NSTEP_BETWEEN_OUTPUT_IMAGES, &
-    NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS,subsamp_seismos,imagetype_JPEG,imagetype_TEXT_wavefield_dumps
+    NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS,subsamp_seismos,imagetype_JPEG,imagetype_wavefield_dumps
   integer :: numat,ngnod,nspec,pointsdisp, &
     nelemabs,nelem_acoustic_surface,ispecabs,UPPER_LIMIT_DISPLAY
 
   logical interpol,meshvect,modelvect,boundvect,assign_external_model,initialfield, &
-    output_grid_ASCII,output_grid_gnuplot,ATTENUATION_VISCOELASTIC_SOLID,output_postscript_snapshot,output_color_image, &
+    output_grid_ASCII,output_grid_Gnuplot,ATTENUATION_VISCOELASTIC_SOLID,output_postscript_snapshot,output_color_image, &
     plot_lowerleft_corner_only,add_Bielak_conditions,output_energy,READ_EXTERNAL_SEP_FILE, &
-    output_TEXT_wavefield_dumps
+    output_wavefield_dumps,use_binary_for_wavefield_dumps
 
   double precision :: cutsnaps,sizemax_arrows,anglerec,xirec,gammarec
 
@@ -965,15 +965,16 @@
   ipass = 1
   call read_databases_init(myrank,ipass, &
                   simulation_title,SIMULATION_TYPE,NOISE_TOMOGRAPHY,SAVE_FORWARD,npgeo,nproc_read_from_database, &
-                  output_grid_gnuplot,interpol,NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS, &
-                  NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS,subsamp_seismos, &
-                  imagetype_JPEG,imagetype_TEXT_wavefield_dumps, &
+                  output_grid_Gnuplot,interpol,NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS, &
+                  NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS,subsamp_seismos, &
+                  imagetype_JPEG,imagetype_wavefield_dumps, &
                   output_postscript_snapshot,output_color_image,colors,numbers, &
                   meshvect,modelvect,boundvect,cutsnaps,subsamp_postscript,sizemax_arrows, &
                   anglerec,initialfield,add_Bielak_conditions, &
                   seismotype,imagetype_postscript,assign_external_model,READ_EXTERNAL_SEP_FILE, &
-                  output_grid_ASCII,output_energy,output_TEXT_wavefield_dumps,ATTENUATION_VISCOELASTIC_SOLID, &
-                  ATTENUATION_PORO_FLUID_PART,save_ASCII_seismograms,save_binary_seismograms,DRAW_SOURCES_AND_RECEIVERS, &
+                  output_grid_ASCII,output_energy,output_wavefield_dumps,use_binary_for_wavefield_dumps, &
+                  ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_PORO_FLUID_PART,save_ASCII_seismograms, &
+                  save_binary_seismograms,DRAW_SOURCES_AND_RECEIVERS, &
                   Q0,freq0,p_sv,NSTEP,deltat,NSOURCES, &
                   factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_IN_BLUE,US_LETTER, &
                   POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0, time_stepping_scheme, &
@@ -1001,15 +1002,16 @@
     if(ipass > 1) &
        call read_databases_init(myrank,ipass, &
                       simulation_title,SIMULATION_TYPE,NOISE_TOMOGRAPHY,SAVE_FORWARD,npgeo,nproc_read_from_database, &
-                      output_grid_gnuplot,interpol,NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS, &
-                      NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_TEXT_DUMPS,subsamp_seismos, &
-                      imagetype_JPEG,imagetype_TEXT_wavefield_dumps, &
+                      output_grid_Gnuplot,interpol,NSTEP_BETWEEN_OUTPUT_INFO,NSTEP_BETWEEN_OUTPUT_SEISMOS, &
+                      NSTEP_BETWEEN_OUTPUT_IMAGES,NSTEP_BETWEEN_OUTPUT_WAVE_DUMPS,subsamp_seismos, &
+                      imagetype_JPEG,imagetype_wavefield_dumps, &
                       output_postscript_snapshot,output_color_image,colors,numbers, &
                       meshvect,modelvect,boundvect,cutsnaps,subsamp_postscript,sizemax_arrows, &
                       anglerec,initialfield,add_Bielak_conditions, &
                       seismotype,imagetype_postscript,assign_external_model,READ_EXTERNAL_SEP_FILE, &
-                      output_grid_ASCII,output_energy,output_TEXT_wavefield_dumps,ATTENUATION_VISCOELASTIC_SOLID, &
-                      ATTENUATION_PORO_FLUID_PART,save_ASCII_seismograms,save_binary_seismograms,DRAW_SOURCES_AND_RECEIVERS, &
+                      output_grid_ASCII,output_energy,output_wavefield_dumps,use_binary_for_wavefield_dumps, &
+                      ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_PORO_FLUID_PART,save_ASCII_seismograms, &
+                      save_binary_seismograms,DRAW_SOURCES_AND_RECEIVERS, &
                       Q0,freq0,p_sv,NSTEP,deltat,NSOURCES, &
                       factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_IN_BLUE,US_LETTER, &
                       POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0, time_stepping_scheme, &
@@ -1983,7 +1985,7 @@
 !
 !-----   plot the GLL mesh in a Gnuplot file
 !
-  if(output_grid_gnuplot .and. myrank == 0 .and. ipass == 1)  &
+  if(output_grid_Gnuplot .and. myrank == 0 .and. ipass == 1)  &
     call plotgll(knods,ibool,coorg,coord,nglob,npgeo,ngnod,nspec)
 
   if(myrank == 0 .and. ipass == 1)  &
@@ -7949,12 +7951,13 @@
 ! note 1: for SH case, this requires output_color_image = .true. in order to have vector_field_display
 ! note 2: for MPI, it would be more convenient to output a single file rather than one for each myrank
 
-      if (output_TEXT_wavefield_dumps) then
+      if (output_wavefield_dumps) then
         write(wavefield_file,"('OUTPUT_FILES/wavefield',i7.7,'_',i2.2,'_',i3.3,'.txt')") it,SIMULATION_TYPE,myrank
         open(unit=27,file=wavefield_file,status='unknown')
         do ispec = 1,nspec
           do j = 1,NGLLZ
             do i = 1,NGLLX
+!!!!!!!!!! DK DK save NGLOB on the first line maybe
                iglob = ibool(i,j,ispec)
                write(27,'(5e16.6)') coord(1,iglob), coord(2,iglob), &
                               sngl(vector_field_display(1,iglob)), &



More information about the CIG-COMMITS mailing list