[cig-commits] r19328 - in seismo/2D/SPECFEM2D/trunk: . DATA
dkomati1 at geodynamics.org
dkomati1 at geodynamics.org
Fri Jan 6 16:34:32 PST 2012
Author: dkomati1
Date: 2012-01-06 16:34:31 -0800 (Fri, 06 Jan 2012)
New Revision: 19328
Added:
seismo/2D/SPECFEM2D/trunk/DATA/Par_file
seismo/2D/SPECFEM2D/trunk/DATA/SOURCE
Removed:
seismo/2D/SPECFEM2D/trunk/DATA/Par_file.in
seismo/2D/SPECFEM2D/trunk/DATA/SOURCE.in
Modified:
seismo/2D/SPECFEM2D/trunk/configure
Log:
suppressed DATA/Par_file.in and DATA/SOURCE.in handled by "configure", since it was both useless and dangerous (modifications made by the user would be erased by another "configure" run in the future)
Copied: seismo/2D/SPECFEM2D/trunk/DATA/Par_file (from rev 19327, seismo/2D/SPECFEM2D/trunk/DATA/Par_file.in)
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file (rev 0)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file 2012-01-07 00:34:31 UTC (rev 19328)
@@ -0,0 +1,139 @@
+# title of job
+title = Test for M2 UPPA
+
+# forward or adjoint simulation
+SIMULATION_TYPE = 1 # 1 = forward, 2 = adjoint + kernels
+NOISE_TOMOGRAPHY = 0 # 0 = earthquake simulation, 1/2/3 = noise simulation
+SAVE_FORWARD = .false. # save the last frame, needed for adjoint simulation
+
+# parameters concerning partitioning
+nproc = 1 # number of processes
+partitioning_method = 3 # SCOTCH = 3, ascending order (very bad idea) = 1
+PERFORM_CUTHILL_MCKEE = .true. # perform inverse Cuthill-McKee (1969) optimization/permutation for mesh numbering
+
+ngnod = 9 # number of control nodes per element (4 or 9)
+initialfield = .false. # use a plane wave as source or not
+add_Bielak_conditions = .false. # add Bielak conditions or not if initial plane wave
+assign_external_model = .false. # define external earth model or not
+READ_EXTERNAL_SEP_FILE = .false. # Read external model from DATA/model_velocity.dat_input, or use routine
+TURN_ATTENUATION_ON = .false. # turn attenuation on or off for solid medium
+TURN_VISCATTENUATION_ON = .false. # turn viscous attenuation on or off
+Q0 = 1 # quality factor for viscous attenuation
+freq0 = 10 # frequency for viscous attenuation
+p_sv = .true. # set the type of calculation (P-SV or SH/membrane waves)
+
+# time step parameters
+nt = 1600 # total number of time steps
+deltat = 1.d-3 # duration of a time step
+USER_T0 = 0.0d0 # use this t0 as earliest starting time rather than the automatically calculated one
+
+# source parameters
+NSOURCES = 1 # number of sources [source info read in CMTSOLUTION file]
+force_normal_to_surface = .false. # angleforce normal to surface (external mesh and curve file needed)
+
+# constants for attenuation
+N_SLS = 2 # number of standard linear solids for attenuation
+f0_attenuation = 5.196152422706633 # (Hz) relevant only if source is a Dirac or a Heaviside, else it is f0
+
+# receiver set parameters for seismograms
+seismotype = 1 # record 1=displ 2=veloc 3=accel 4=pressure 6=potential
+generate_STATIONS = .true. # creates a STATION file in ./DATA
+nreceiversets = 1 # number of receiver sets
+anglerec = 0.d0 # angle to rotate components at receivers
+rec_normal_to_surface = .false. # base anglerec normal to surface (external mesh and curve file needed)
+SU_FORMAT = .false. # output seismograms in Seismic Unix format (adjoint traces will be read in the same format)
+
+# first receiver set (repeat these 6 lines and adjust nreceiversets accordingly)
+nrec = 11 # number of receivers
+xdeb = 300. # first receiver x in meters
+zdeb = 2200. # first receiver z in meters
+xfin = 3700. # last receiver x in meters (ignored if onlyone receiver)
+zfin = 2200. # last receiver z in meters (ignored if onlyone receiver)
+enreg_surf_same_vertical = .true. # receivers inside the medium or at the surface
+
+# display parameters
+NTSTEP_BETWEEN_OUTPUT_INFO = 100 # display frequency in time steps
+output_postscript_snapshot = .true. # output Postscript snapshot of the results
+output_color_image = .true. # output JPEG color image of the results
+imagetype = 1 # display 1=displ 2=veloc 3=accel 4=pressure
+cutsnaps = 1. # minimum amplitude in % for snapshots
+meshvect = .true. # display mesh on vector plots or not
+modelvect = .false. # display velocity model on vector plots
+boundvect = .true. # display boundary conditions on plots
+interpol = .true. # interpolation of the display or not
+pointsdisp = 6 # points for interpolation of display (set to 1 for lower-left corner only)
+subsamp_postscript = 1 # subsampling of background velocity model in PostScript snapshots
+factor_subsample_image = 1 # factor to subsample color images output by the code (useful for very large models)
+POWER_DISPLAY_COLOR = 0.30d0 # non linear display to enhance small amplitudes in color images
+DRAW_WATER_CONSTANT_BLUE_IN_JPG = .true. # display acoustic layers as constant blue in JPEG images, because they likely correspond to water
+sizemax_arrows = 1.d0 # maximum size of arrows on vector plots in cm
+US_LETTER = .false. # US letter paper or European A4
+USE_SNAPSHOT_NUMBER_IN_FILENAME = .false. # use snapshot number in the file name of JPEG color snapshots instead of the time step
+gnuplot = .false. # generate a GNUPLOT file for the grid
+output_grid = .false. # save the grid in a text file or not
+output_energy = .false. # compute and output acoustic and elastic energy (slows down the code significantly)
+output_wavefield_snapshot = .false. # output Ux,Uy,Uz text file for each output time (big files)
+
+# velocity and density models
+nbmodels = 4 # nb of different models
+# define models as
+# I: (model_number 1 rho Vp Vs 0 0 QKappa Qmu 0 0 0 0 0 0) or
+# II: (model_number 2 rho c11 c13 c15 c33 c35 c55 0 0 0 0 0 0) or
+# III: (model_number 3 rhos rhof phi c kxx kxz kzz Ks Kf Kfr etaf mufr Qmu).
+# For istropic elastic/acoustic material use I and set Vs to zero to make a given model acoustic, for anisotropic elastic use II,
+# and for isotropic poroelastic material use III. The mesh can contain acoustic, elastic, and poroelastic models simultaneously.
+1 1 2700.d0 3000.d0 1732.051d0 0 0 9999 9999 0 0 0 0 0 0
+2 1 2500.d0 2700.d0 0 0 0 9999 9999 0 0 0 0 0 0
+3 1 2200.d0 2500.d0 1443.375d0 0 0 9999 9999 0 0 0 0 0 0
+4 1 2200.d0 2200.d0 1343.375d0 0 0 9999 9999 0 0 0 0 0 0
+
+# external mesh or not
+read_external_mesh = .false.
+
+# absorbing boundary active or not
+absorbing_conditions = .true.
+
+# for horizontal periodic conditions: detect common points between left and right edges
+ADD_PERIODIC_CONDITIONS = .false.
+
+# horizontal periodicity distance for periodic conditions
+PERIODIC_horiz_dist = 0.3597d0
+
+# grid point detection tolerance for periodic conditions
+PERIODIC_DETECT_TOL = 3.3334d-6
+
+#-----------------------------------------------------------------------------
+# PARAMETERS FOR EXTERNAL MESHING
+
+# data concerning mesh, when generated using third-party app (more info in README)
+# (see also absorbing_conditions above)
+mesh_file = ./DATA/Mesh_canyon/canyon_mesh_file # file containing the mesh
+nodes_coords_file = ./DATA/Mesh_canyon/canyon_nodes_coords_file # file containing the nodes coordinates
+materials_file = ./DATA/Mesh_canyon/canyon_materials_file # file containing the material number for each element
+free_surface_file = ./DATA/Mesh_canyon/canyon_free_surface_file # file containing the free surface
+absorbing_surface_file = ./DATA/Mesh_canyon/canyon_absorbing_surface_file # file containing the absorbing surface
+tangential_detection_curve_file = ./DATA/courbe_eros_nodes # file containing the curve delimiting the velocity model
+
+#-----------------------------------------------------------------------------
+# PARAMETERS FOR INTERNAL MESHING
+
+# file containing interfaces for internal mesh
+interfacesfile = ../EXAMPLES/M2_UPPA/interfaces_M2_UPPA_curved.dat
+
+# geometry of the model (origin lower-left corner = 0,0) and mesh description
+xmin = 0.d0 # abscissa of left side of the model
+xmax = 4000.d0 # abscissa of right side of the model
+nx = 80 # number of elements along X
+
+# absorbing boundary parameters (see absorbing_conditions above)
+absorbbottom = .true.
+absorbright = .true.
+absorbtop = .false.
+absorbleft = .true.
+
+# define the different regions of the model in the (nx,nz) spectral element mesh
+nbregions = 4 # nb of regions and model number for each
+1 80 1 20 1
+1 80 21 40 2
+1 80 41 60 3
+60 70 21 40 4
Deleted: seismo/2D/SPECFEM2D/trunk/DATA/Par_file.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file.in 2012-01-07 00:31:46 UTC (rev 19327)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file.in 2012-01-07 00:34:31 UTC (rev 19328)
@@ -1,139 +0,0 @@
-# title of job
-title = Test for M2 UPPA
-
-# forward or adjoint simulation
-SIMULATION_TYPE = 1 # 1 = forward, 2 = adjoint + kernels
-NOISE_TOMOGRAPHY = 0 # 0 = earthquake simulation, 1/2/3 = noise simulation
-SAVE_FORWARD = .false. # save the last frame, needed for adjoint simulation
-
-# parameters concerning partitioning
-nproc = 1 # number of processes
-partitioning_method = 3 # SCOTCH = 3, ascending order (very bad idea) = 1
-PERFORM_CUTHILL_MCKEE = .true. # perform inverse Cuthill-McKee (1969) optimization/permutation for mesh numbering
-
-ngnod = 9 # number of control nodes per element (4 or 9)
-initialfield = .false. # use a plane wave as source or not
-add_Bielak_conditions = .false. # add Bielak conditions or not if initial plane wave
-assign_external_model = .false. # define external earth model or not
-READ_EXTERNAL_SEP_FILE = .false. # Read external model from DATA/model_velocity.dat_input, or use routine
-TURN_ATTENUATION_ON = .false. # turn attenuation on or off for solid medium
-TURN_VISCATTENUATION_ON = .false. # turn viscous attenuation on or off
-Q0 = 1 # quality factor for viscous attenuation
-freq0 = 10 # frequency for viscous attenuation
-p_sv = .true. # set the type of calculation (P-SV or SH/membrane waves)
-
-# time step parameters
-nt = 1600 # total number of time steps
-deltat = 1.d-3 # duration of a time step
-USER_T0 = 0.0d0 # use this t0 as earliest starting time rather than the automatically calculated one
-
-# source parameters
-NSOURCES = 1 # number of sources [source info read in CMTSOLUTION file]
-force_normal_to_surface = .false. # angleforce normal to surface (external mesh and curve file needed)
-
-# constants for attenuation
-N_SLS = 2 # number of standard linear solids for attenuation
-f0_attenuation = 5.196152422706633 # (Hz) relevant only if source is a Dirac or a Heaviside, else it is f0
-
-# receiver set parameters for seismograms
-seismotype = 1 # record 1=displ 2=veloc 3=accel 4=pressure 6=potential
-generate_STATIONS = .true. # creates a STATION file in ./DATA
-nreceiversets = 1 # number of receiver sets
-anglerec = 0.d0 # angle to rotate components at receivers
-rec_normal_to_surface = .false. # base anglerec normal to surface (external mesh and curve file needed)
-SU_FORMAT = .false. # output seismograms in Seismic Unix format (adjoint traces will be read in the same format)
-
-# first receiver set (repeat these 6 lines and adjust nreceiversets accordingly)
-nrec = 11 # number of receivers
-xdeb = 300. # first receiver x in meters
-zdeb = 2200. # first receiver z in meters
-xfin = 3700. # last receiver x in meters (ignored if onlyone receiver)
-zfin = 2200. # last receiver z in meters (ignored if onlyone receiver)
-enreg_surf_same_vertical = .true. # receivers inside the medium or at the surface
-
-# display parameters
-NTSTEP_BETWEEN_OUTPUT_INFO = 100 # display frequency in time steps
-output_postscript_snapshot = .true. # output Postscript snapshot of the results
-output_color_image = .true. # output JPEG color image of the results
-imagetype = 1 # display 1=displ 2=veloc 3=accel 4=pressure
-cutsnaps = 1. # minimum amplitude in % for snapshots
-meshvect = .true. # display mesh on vector plots or not
-modelvect = .false. # display velocity model on vector plots
-boundvect = .true. # display boundary conditions on plots
-interpol = .true. # interpolation of the display or not
-pointsdisp = 6 # points for interpolation of display (set to 1 for lower-left corner only)
-subsamp_postscript = 1 # subsampling of background velocity model in PostScript snapshots
-factor_subsample_image = 1 # factor to subsample color images output by the code (useful for very large models)
-POWER_DISPLAY_COLOR = 0.30d0 # non linear display to enhance small amplitudes in color images
-DRAW_WATER_CONSTANT_BLUE_IN_JPG = .true. # display acoustic layers as constant blue in JPEG images, because they likely correspond to water
-sizemax_arrows = 1.d0 # maximum size of arrows on vector plots in cm
-US_LETTER = .false. # US letter paper or European A4
-USE_SNAPSHOT_NUMBER_IN_FILENAME = .false. # use snapshot number in the file name of JPEG color snapshots instead of the time step
-gnuplot = .false. # generate a GNUPLOT file for the grid
-output_grid = .false. # save the grid in a text file or not
-output_energy = .false. # compute and output acoustic and elastic energy (slows down the code significantly)
-output_wavefield_snapshot = .false. # output Ux,Uy,Uz text file for each output time (big files)
-
-# velocity and density models
-nbmodels = 4 # nb of different models
-# define models as
-# I: (model_number 1 rho Vp Vs 0 0 QKappa Qmu 0 0 0 0 0 0) or
-# II: (model_number 2 rho c11 c13 c15 c33 c35 c55 0 0 0 0 0 0) or
-# III: (model_number 3 rhos rhof phi c kxx kxz kzz Ks Kf Kfr etaf mufr Qmu).
-# For istropic elastic/acoustic material use I and set Vs to zero to make a given model acoustic, for anisotropic elastic use II,
-# and for isotropic poroelastic material use III. The mesh can contain acoustic, elastic, and poroelastic models simultaneously.
-1 1 2700.d0 3000.d0 1732.051d0 0 0 9999 9999 0 0 0 0 0 0
-2 1 2500.d0 2700.d0 0 0 0 9999 9999 0 0 0 0 0 0
-3 1 2200.d0 2500.d0 1443.375d0 0 0 9999 9999 0 0 0 0 0 0
-4 1 2200.d0 2200.d0 1343.375d0 0 0 9999 9999 0 0 0 0 0 0
-
-# external mesh or not
-read_external_mesh = .false.
-
-# absorbing boundary active or not
-absorbing_conditions = .true.
-
-# for horizontal periodic conditions: detect common points between left and right edges
-ADD_PERIODIC_CONDITIONS = .false.
-
-# horizontal periodicity distance for periodic conditions
-PERIODIC_horiz_dist = 0.3597d0
-
-# grid point detection tolerance for periodic conditions
-PERIODIC_DETECT_TOL = 3.3334d-6
-
-#-----------------------------------------------------------------------------
-# PARAMETERS FOR EXTERNAL MESHING
-
-# data concerning mesh, when generated using third-party app (more info in README)
-# (see also absorbing_conditions above)
-mesh_file = ./DATA/Mesh_canyon/canyon_mesh_file # file containing the mesh
-nodes_coords_file = ./DATA/Mesh_canyon/canyon_nodes_coords_file # file containing the nodes coordinates
-materials_file = ./DATA/Mesh_canyon/canyon_materials_file # file containing the material number for each element
-free_surface_file = ./DATA/Mesh_canyon/canyon_free_surface_file # file containing the free surface
-absorbing_surface_file = ./DATA/Mesh_canyon/canyon_absorbing_surface_file # file containing the absorbing surface
-tangential_detection_curve_file = ./DATA/courbe_eros_nodes # file containing the curve delimiting the velocity model
-
-#-----------------------------------------------------------------------------
-# PARAMETERS FOR INTERNAL MESHING
-
-# file containing interfaces for internal mesh
-interfacesfile = ../EXAMPLES/M2_UPPA/interfaces_M2_UPPA_curved.dat
-
-# geometry of the model (origin lower-left corner = 0,0) and mesh description
-xmin = 0.d0 # abscissa of left side of the model
-xmax = 4000.d0 # abscissa of right side of the model
-nx = 80 # number of elements along X
-
-# absorbing boundary parameters (see absorbing_conditions above)
-absorbbottom = .true.
-absorbright = .true.
-absorbtop = .false.
-absorbleft = .true.
-
-# define the different regions of the model in the (nx,nz) spectral element mesh
-nbregions = 4 # nb of regions and model number for each
-1 80 1 20 1
-1 80 21 40 2
-1 80 41 60 3
-60 70 21 40 4
Copied: seismo/2D/SPECFEM2D/trunk/DATA/SOURCE (from rev 19326, seismo/2D/SPECFEM2D/trunk/DATA/SOURCE.in)
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/SOURCE (rev 0)
+++ seismo/2D/SPECFEM2D/trunk/DATA/SOURCE 2012-01-07 00:34:31 UTC (rev 19328)
@@ -0,0 +1,13 @@
+#source 1. The components of a moment tensor source must be given in N.m, not in dyne.cm as in the DATA/CMTSOLUTION source file of the 3D version of the code.
+source_surf = .false. # source inside the medium or at the surface
+xs = 2500. # source location x in meters
+zs = 2500. # source location z in meters
+source_type = 1 # elastic force or acoustic pressure = 1 or moment tensor = 2
+time_function_type = 1 # Ricker = 1, first derivative = 2, Gaussian = 3, Dirac = 4, Heaviside = 5
+f0 = 10.0 # dominant source frequency (Hz) if not Dirac or Heaviside
+tshift = 0.0 # time shift when multi sources (if one source, must be zero)
+angleforce = 0.0 # angle of the source (for a force only)
+Mxx = 1. # Mxx component (for a moment tensor source only)
+Mzz = 1. # Mzz component (for a moment tensor source only)
+Mxz = 0. # Mxz component (for a moment tensor source only)
+factor = 1.d10 # amplification factor
Deleted: seismo/2D/SPECFEM2D/trunk/DATA/SOURCE.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/SOURCE.in 2012-01-07 00:31:46 UTC (rev 19327)
+++ seismo/2D/SPECFEM2D/trunk/DATA/SOURCE.in 2012-01-07 00:34:31 UTC (rev 19328)
@@ -1,13 +0,0 @@
-#source 1. The components of a moment tensor source must be given in N.m, not in dyne.cm as in the DATA/CMTSOLUTION source file of the 3D version of the code.
-source_surf = .false. # source inside the medium or at the surface
-xs = 2500. # source location x in meters
-zs = 2500. # source location z in meters
-source_type = 1 # elastic force or acoustic pressure = 1 or moment tensor = 2
-time_function_type = 1 # Ricker = 1, first derivative = 2, Gaussian = 3, Dirac = 4, Heaviside = 5
-f0 = 10.0 # dominant source frequency (Hz) if not Dirac or Heaviside
-tshift = 0.0 # time shift when multi sources (if one source, must be zero)
-angleforce = 0.0 # angle of the source (for a force only)
-Mxx = 1. # Mxx component (for a moment tensor source only)
-Mzz = 1. # Mzz component (for a moment tensor source only)
-Mxz = 0. # Mxz component (for a moment tensor source only)
-factor = 1.d10 # amplification factor
Modified: seismo/2D/SPECFEM2D/trunk/configure
===================================================================
--- seismo/2D/SPECFEM2D/trunk/configure 2012-01-07 00:31:46 UTC (rev 19327)
+++ seismo/2D/SPECFEM2D/trunk/configure 2012-01-07 00:34:31 UTC (rev 19328)
@@ -6234,7 +6234,7 @@
# Checks for library functions.
-ac_config_files="$ac_config_files Makefile DATA/Par_file DATA/SOURCE src/meshfem2D/Makefile src/specfem2D/Makefile setup/constants.h setup/precision.h src/meshfem2D/scotch_5.1.11/src/Makefile.inc"
+ac_config_files="$ac_config_files Makefile src/meshfem2D/Makefile src/specfem2D/Makefile setup/constants.h setup/precision.h src/meshfem2D/scotch_5.1.11/src/Makefile.inc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -6929,8 +6929,6 @@
case $ac_config_target in
"setup/config.h") CONFIG_HEADERS="$CONFIG_HEADERS setup/config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "DATA/Par_file") CONFIG_FILES="$CONFIG_FILES DATA/Par_file" ;;
- "DATA/SOURCE") CONFIG_FILES="$CONFIG_FILES DATA/SOURCE" ;;
"src/meshfem2D/Makefile") CONFIG_FILES="$CONFIG_FILES src/meshfem2D/Makefile" ;;
"src/specfem2D/Makefile") CONFIG_FILES="$CONFIG_FILES src/specfem2D/Makefile" ;;
"setup/constants.h") CONFIG_FILES="$CONFIG_FILES setup/constants.h" ;;
More information about the CIG-COMMITS
mailing list