[cig-commits] r19344 - in seismo/2D/SPECFEM2D/trunk: DATA EXAMPLES/Abel_Brest EXAMPLES/Gmsh_example_MPI EXAMPLES/Gmsh_example_serial EXAMPLES/INDUSTRIAL_FORMAT EXAMPLES/M2_UPPA EXAMPLES/Rayleigh_wave_no_crack EXAMPLES/Rayleigh_wave_with_crack EXAMPLES/Tape2007 EXAMPLES/Tape2007_kernel EXAMPLES/Tromp2005 EXAMPLES/Tromp2005_kernel EXAMPLES/acoustic_poroelastic EXAMPLES/attenuation EXAMPLES/canyon EXAMPLES/fluid_solid/fluid_solid_external_mesh EXAMPLES/fluid_solid/from_2000_Geophysics_paper_flat_ocean_bottom EXAMPLES/fluid_solid/from_2000_Geophysics_paper_sinusoidal_ocean_bottom EXAMPLES/init_plane EXAMPLES/noise_layered/model_0 EXAMPLES/noise_layered/model_1 EXAMPLES/noise_layered/model_2 EXAMPLES/noise_uniform src/meshfem2D src/specfem2D

dkomati1 at geodynamics.org dkomati1 at geodynamics.org
Mon Jan 9 13:55:08 PST 2012


Author: dkomati1
Date: 2012-01-09 13:55:07 -0800 (Mon, 09 Jan 2012)
New Revision: 19344

Modified:
   seismo/2D/SPECFEM2D/trunk/DATA/Par_file
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Abel_Brest/Par_file_Abel_Balanche_bathy_source_solid
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_MPI/Par_file_Gmsh_SqrCircles.in
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_serial/Par_file_Gmsh_SqrCircles.in
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/INDUSTRIAL_FORMAT/Par_file
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/M2_UPPA/Par_file_M2_UPPA
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_no_crack/Par_file_Rayleigh_2D
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_with_crack/Par_file_Rayleigh_2D
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_132rec_checker
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_onerec
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007_kernel/Par_file_Tape2007_onerec
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005_s100
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005_kernel/Par_file_Tromp2005
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/acoustic_poroelastic/Par_file_acoustic_poroelastic
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/attenuation/Par_file_attenuation_2D
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/canyon/Par_file_canyon
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/fluid_solid_external_mesh/Par_file_fluid_solid
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_flat_ocean_bottom/Par_file_fluid_solid
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_sinusoidal_ocean_bottom/Par_file_fluid_solid
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_for
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_kernel
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_fair
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_good
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_best
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_fair
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_good
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_fair
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_good
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_1
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_2
   seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_3
   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/checkgrid.F90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_energy.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_fluid.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_solid.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_pressure.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/get_poroelastic_velocities.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/gmat01.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/initialize_simulation.F90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90
   seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
Log:
renamed two flags to ATTENUATION_VISCOELASTIC_SOLID and ATTENUATION_POROELASTIC_SOLID to avoid confusion;
also removed useless white spaces


Modified: seismo/2D/SPECFEM2D/trunk/DATA/Par_file
===================================================================
--- seismo/2D/SPECFEM2D/trunk/DATA/Par_file	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/DATA/Par_file	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Abel_Brest/Par_file_Abel_Balanche_bathy_source_solid
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Abel_Brest/Par_file_Abel_Balanche_bathy_source_solid	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Abel_Brest/Par_file_Abel_Balanche_bathy_source_solid	2012-01-09 21:55:07 UTC (rev 19344)
@@ -10,14 +10,14 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)
@@ -32,7 +32,7 @@
 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 
+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
@@ -132,7 +132,7 @@
 nx                              = 134             # number of elements along X
 
 # absorbing boundary parameters (see absorbing_conditions above)
-absorbbottom                    = .true.         
+absorbbottom                    = .true.
 absorbright                     = .true.
 absorbtop                       = .false.
 absorbleft                      = .true.

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_MPI/Par_file_Gmsh_SqrCircles.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_MPI/Par_file_Gmsh_SqrCircles.in	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_MPI/Par_file_Gmsh_SqrCircles.in	2012-01-09 21:55:07 UTC (rev 19344)
@@ -10,15 +10,15 @@
 nproc                           = 4              # number of processes
 partitioning_method             = 3              # ascending order = 1, Scotch = 3
 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 SEP file 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 
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)
@@ -32,7 +32,7 @@
 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 
+# 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
 
@@ -78,7 +78,7 @@
 # velocity and density models
 nbmodels                        = 2              # nb of different models
 # define models as I: (model_number,1,rho,Vp,Vs,0,0,QKappa Qmu) or II: (model_number,2,rho,c11,c13,c15,c33,c35,c55) 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, 
+# 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, & poroelastic models simultaneously
 1 1 2000.d0 1680.d0 0.0d0 0 0 10.d0 10.d0 0 0 0 0 0 0
 2 1 1000.d0 1477.d0 0.0d0 0 0 10.d0 10.d0 0 0 0 0 0 0
@@ -128,7 +128,7 @@
 nx                              = 835             # number of elements along X
 
 # absorbing boundaries parameters
-absorbbottom                    = .true.         
+absorbbottom                    = .true.
 absorbright                     = .true.
 absorbtop                       = .true.
 absorbleft                      = .true.

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_serial/Par_file_Gmsh_SqrCircles.in
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_serial/Par_file_Gmsh_SqrCircles.in	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Gmsh_example_serial/Par_file_Gmsh_SqrCircles.in	2012-01-09 21:55:07 UTC (rev 19344)
@@ -10,15 +10,15 @@
 nproc                           = 1              # number of processes
 partitioning_method             = 3              # ascending order = 1, Scotch = 3
 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 SEP file 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 
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)
@@ -32,7 +32,7 @@
 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 
+# 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
 
@@ -78,7 +78,7 @@
 # velocity and density models
 nbmodels                        = 2              # nb of different models
 # define models as I: (model_number,1,rho,Vp,Vs,0,0,QKappa Qmu) or II: (model_number,2,rho,c11,c13,c15,c33,c35,c55) 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, 
+# 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, & poroelastic models simultaneously
 1 1 2000.d0 1680.d0 0.0d0 0 0 10.d0 10.d0 0 0 0 0 0 0
 2 1 1000.d0 1477.d0 0.0d0 0 0 10.d0 10.d0 0 0 0 0 0 0
@@ -128,7 +128,7 @@
 nx                              = 835             # number of elements along X
 
 # absorbing boundaries parameters
-absorbbottom                    = .true.         
+absorbbottom                    = .true.
 absorbright                     = .true.
 absorbtop                       = .true.
 absorbleft                      = .true.

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/INDUSTRIAL_FORMAT/Par_file
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/INDUSTRIAL_FORMAT/Par_file	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/INDUSTRIAL_FORMAT/Par_file	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/M2_UPPA/Par_file_M2_UPPA
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/M2_UPPA/Par_file_M2_UPPA	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/M2_UPPA/Par_file_M2_UPPA	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_no_crack/Par_file_Rayleigh_2D
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_no_crack/Par_file_Rayleigh_2D	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_no_crack/Par_file_Rayleigh_2D	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 add_Bielak_conditions           = .true.         # 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_with_crack/Par_file_Rayleigh_2D
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_with_crack/Par_file_Rayleigh_2D	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Rayleigh_wave_with_crack/Par_file_Rayleigh_2D	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_132rec_checker
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_132rec_checker	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_132rec_checker	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 add_Bielak_conditions           = .false.        # add Bielak conditions or not if initial plane wave
 assign_external_model           = .true.        # define external earth model or not
 READ_EXTERNAL_SEP_FILE          = .true.        # Read external SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_onerec
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_onerec	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007/Par_file_Tape2007_onerec	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007_kernel/Par_file_Tape2007_onerec
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007_kernel/Par_file_Tape2007_onerec	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tape2007_kernel/Par_file_Tape2007_onerec	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005_s100
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005_s100	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005/Par_file_Tromp2005_s100	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005_kernel/Par_file_Tromp2005
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005_kernel/Par_file_Tromp2005	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/Tromp2005_kernel/Par_file_Tromp2005	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/acoustic_poroelastic/Par_file_acoustic_poroelastic
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/acoustic_poroelastic/Par_file_acoustic_poroelastic	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/acoustic_poroelastic/Par_file_acoustic_poroelastic	2012-01-09 21:55:07 UTC (rev 19344)
@@ -10,14 +10,14 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)
@@ -32,7 +32,7 @@
 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 
+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
@@ -132,7 +132,7 @@
 nx                              = 260            # number of elements along X
 
 # absorbing boundary parameters (see absorbing_conditions above)
-absorbbottom                    = .true.         
+absorbbottom                    = .true.
 absorbright                     = .true.
 absorbtop                       = .false.
 absorbleft                      = .true.

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/attenuation/Par_file_attenuation_2D
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/attenuation/Par_file_attenuation_2D	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/attenuation/Par_file_attenuation_2D	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file from DATA/model_velocity.dat_input, or use routine
-TURN_ATTENUATION_ON             = .true.        # turn attenuation on or off for solid medium
-TURN_VISCATTENUATION_ON         = .false.        # turn viscous attenuation on or off
+ATTENUATION_VISCOELASTIC_SOLID  = .true.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/canyon/Par_file_canyon
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/canyon/Par_file_canyon	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/canyon/Par_file_canyon	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 add_Bielak_conditions           = .true.         # 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/fluid_solid_external_mesh/Par_file_fluid_solid
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/fluid_solid_external_mesh/Par_file_fluid_solid	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/fluid_solid_external_mesh/Par_file_fluid_solid	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_flat_ocean_bottom/Par_file_fluid_solid
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_flat_ocean_bottom/Par_file_fluid_solid	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_flat_ocean_bottom/Par_file_fluid_solid	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_sinusoidal_ocean_bottom/Par_file_fluid_solid
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_sinusoidal_ocean_bottom/Par_file_fluid_solid	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/fluid_solid/from_2000_Geophysics_paper_sinusoidal_ocean_bottom/Par_file_fluid_solid	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_for
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_for	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_for	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_kernel
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_kernel	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/init_plane/Par_file_Slave_kernel	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 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)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_fair
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_fair	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_fair	2012-01-09 21:55:07 UTC (rev 19344)
@@ -15,8 +15,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_good
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_good	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_0/Par_file_good	2012-01-09 21:55:07 UTC (rev 19344)
@@ -15,8 +15,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_best
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_best	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_best	2012-01-09 21:55:07 UTC (rev 19344)
@@ -15,8 +15,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_fair
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_fair	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_fair	2012-01-09 21:55:07 UTC (rev 19344)
@@ -15,8 +15,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_good
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_good	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_1/Par_file_good	2012-01-09 21:55:07 UTC (rev 19344)
@@ -15,8 +15,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_fair
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_fair	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_fair	2012-01-09 21:55:07 UTC (rev 19344)
@@ -15,8 +15,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_good
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_good	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_layered/model_2/Par_file_good	2012-01-09 21:55:07 UTC (rev 19344)
@@ -15,8 +15,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_1
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_1	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_1	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_2
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_2	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_2	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_3
===================================================================
--- seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_3	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/EXAMPLES/noise_uniform/Par_file_noise_3	2012-01-09 21:55:07 UTC (rev 19344)
@@ -16,8 +16,8 @@
 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 SEP file 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
+ATTENUATION_VISCOELASTIC_SOLID  = .false.        # turn attenuation (viscoelasticity) on or off for non-poroelastic solid parts of the model
+ATTENUATION_POROELASTIC_SOLID   = .false.        # turn viscous attenuation on or off for poroelastic solid parts of the model
 Q0                              =  1             # quality factor for viscous attenuation
 freq0                           =  10            # frequency for viscous attenuation
 p_sv                            = .false.        # set the type of calculation (P-SV or SH/membrane waves)

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/read_parameter_file.F90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -68,7 +68,7 @@
   integer :: nx,ngnod
 
   logical :: initialfield,add_Bielak_conditions,assign_external_model, &
-            READ_EXTERNAL_SEP_FILE,TURN_ATTENUATION_ON,TURN_VISCATTENUATION_ON
+            READ_EXTERNAL_SEP_FILE,ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_POROELASTIC_SOLID
 
   double precision :: Q0,freq0
 
@@ -207,11 +207,11 @@
   call read_value_logical_p(READ_EXTERNAL_SEP_FILE, 'mesher.READ_EXTERNAL_SEP_FILE')
   if(err_occurred() /= 0) stop 'error reading parameter 10 in Par_file'
 
-  call read_value_logical_p(TURN_ATTENUATION_ON, 'solver.TURN_ATTENUATION_ON')
+  call read_value_logical_p(ATTENUATION_VISCOELASTIC_SOLID, 'solver.ATTENUATION_VISCOELASTIC_SOLID')
   if(err_occurred() /= 0) stop 'error reading parameter 11 in Par_file'
 
   ! read viscous attenuation parameters (poroelastic media)
-  call read_value_logical_p(TURN_VISCATTENUATION_ON, 'solver.TURN_VISCATTENUATION_ON')
+  call read_value_logical_p(ATTENUATION_POROELASTIC_SOLID, 'solver.ATTENUATION_POROELASTIC_SOLID')
   if(err_occurred() /= 0) stop 'error reading parameter 12 in Par_file'
 
   call read_value_double_precision_p(Q0, 'solver.Q0')

Modified: seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/meshfem2D/save_databases.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -127,11 +127,11 @@
     write(15,*) 'assign_external_model READ_EXTERNAL_SEP_FILE'
     write(15,*) assign_external_model,READ_EXTERNAL_SEP_FILE
 
-    write(15,*) 'output_grid output_energy output_wavefield_snapshot TURN_ATTENUATION_ON'
-    write(15,*) output_grid,output_energy,output_wavefield_snapshot,TURN_ATTENUATION_ON
+    write(15,*) 'output_grid output_energy output_wavefield_snapshot ATTENUATION_VISCOELASTIC_SOLID'
+    write(15,*) output_grid,output_energy,output_wavefield_snapshot,ATTENUATION_VISCOELASTIC_SOLID
 
-    write(15,*) 'TURN_VISCATTENUATION_ON Q0 freq0'
-    write(15,*) TURN_VISCATTENUATION_ON,Q0,freq0
+    write(15,*) 'ATTENUATION_POROELASTIC_SOLID Q0 freq0'
+    write(15,*) ATTENUATION_POROELASTIC_SOLID,Q0,freq0
 
     write(15,*) 'p_sv'
     write(15,*) p_sv

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/checkgrid.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/checkgrid.F90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/checkgrid.F90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -50,7 +50,7 @@
                       coorg,xinterp,zinterp,shapeint,knods,simulation_title, &
                       npgeo,pointsdisp,ngnod,any_elastic,any_poroelastic,all_anisotropic, &
                       myrank,nproc,NSOURCES,poroelastic, &
-                      freq0,Q0,TURN_VISCATTENUATION_ON,US_LETTER,output_postscript_snapshot)
+                      freq0,Q0,ATTENUATION_POROELASTIC_SOLID,US_LETTER,output_postscript_snapshot)
 
 ! check the mesh, stability and number of points per wavelength
 
@@ -102,7 +102,7 @@
   double precision :: deltat
 
   logical :: assign_external_model,initialfield,any_elastic,any_poroelastic,all_anisotropic, &
-          TURN_VISCATTENUATION_ON,output_postscript_snapshot
+          ATTENUATION_POROELASTIC_SOLID,output_postscript_snapshot
 
   integer :: myrank,nproc
 
@@ -276,7 +276,7 @@
       M_biot = kappa_s*kappa_s/(D_biot - kappa_fr)
 
       call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mu_fr,phi, &
-             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
       cpIloc = sqrt(cpIsquare)
       cpIIloc = sqrt(cpIIsquare)
@@ -592,7 +592,7 @@
       M_biot = kappa_s*kappa_s/(D_biot - kappa_fr)
 
       call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mu_fr,phi, &
-             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
       cpIloc = sqrt(cpIsquare)
       cpIIloc = sqrt(cpIIsquare)
@@ -1076,7 +1076,7 @@
       M_biot = kappa_s*kappa_s/(D_biot - kappa_fr)
 
       call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mu_fr,phi, &
-           tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+           tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
       cpIloc = sqrt(cpIsquare)
     else
@@ -1430,7 +1430,7 @@
       M_biot = kappa_s*kappa_s/(D_biot - kappa_fr)
 
     call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mu_fr,phi, &
-             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
     cpIloc = sqrt(cpIsquare)
     csloc = sqrt(cssquare)
@@ -1848,7 +1848,7 @@
       M_biot = kappa_s*kappa_s/(D_biot - kappa_fr)
 
     call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mu_fr,phi, &
-             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+             tort,denst_s,denst_f,eta_f,perm,f0(1),freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
     cpIloc = sqrt(cpIsquare)
    else

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_energy.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_energy.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_energy.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -54,7 +54,7 @@
                             anisotropic,anisotropy,wxgll,wzgll,numat, &
                             pressure_element,vector_field_element,e1,e11, &
                             potential_dot_acoustic,potential_dot_dot_acoustic, &
-                            TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS,p_sv)
+                            ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS,p_sv)
 
 ! compute kinetic and potential energy in the solid (acoustic elements are excluded)
 
@@ -78,7 +78,7 @@
   real(kind=CUSTOM_REAL), dimension(nglob_acoustic) :: &
     potential_dot_acoustic,potential_dot_dot_acoustic
 
-  logical :: TURN_ATTENUATION_ON,p_sv
+  logical :: ATTENUATION_VISCOELASTIC_SOLID,p_sv
 
   integer :: it
   double precision :: t0,deltat
@@ -350,7 +350,7 @@
                   nglob_acoustic,nglob_elastic,nglob_poroelastic,assign_external_model, &
                   numat,kmato,density,porosity,tortuosity,poroelastcoef,vpext,vsext,rhoext, &
                   c11ext,c13ext,c15ext,c33ext,c35ext,c55ext,anisotropic,anisotropy,ispec,e1,e11, &
-                  TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS)
+                  ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS)
 
       ! compute velocity vector field in this element
       call compute_vector_one_element(vector_field_element,potential_dot_acoustic, &

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_fluid.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_fluid.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_fluid.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -44,7 +44,7 @@
   subroutine compute_forces_poro_fluid(nglob,nspec,myrank,nelemabs,numat, &
                ispec_selected_source,ispec_selected_rec,is_proc_source,which_proc_receiver,&
                source_type,it,NSTEP,anyabs, &
-               initialfield,TURN_ATTENUATION_ON,TURN_VISCATTENUATION_ON,deltatcube, &
+               initialfield,ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_POROELASTIC_SOLID,deltatcube, &
                deltatfourth,twelvedeltat,fourdeltatsquare,ibool,kmato,numabs,poroelastic,codeabs, &
                accelw_poroelastic,velocw_poroelastic,displw_poroelastic,velocs_poroelastic,displs_poroelastic,&
                b_accelw_poroelastic,b_displw_poroelastic,b_displs_poroelastic,&
@@ -78,7 +78,7 @@
   integer, dimension(nelemabs) :: ib_bottom
   integer, dimension(nelemabs) :: ib_top
 
-  logical :: anyabs,initialfield,TURN_ATTENUATION_ON
+  logical :: anyabs,initialfield,ATTENUATION_VISCOELASTIC_SOLID
   logical :: SAVE_FORWARD
 
   double precision ::deltatcube,deltatfourth,twelvedeltat,fourdeltatsquare
@@ -123,7 +123,7 @@
   double precision, dimension(NGLLX,NGLLZ,nspec) :: rx_viscous
   double precision, dimension(NGLLX,NGLLZ,nspec) :: rz_viscous
   double precision :: theta_e,theta_s
-  logical TURN_VISCATTENUATION_ON
+  logical ATTENUATION_POROELASTIC_SOLID
   double precision, dimension(3):: bl_unrelaxed,bl_relaxed
 
 ! derivatives of Lagrange polynomials
@@ -183,7 +183,7 @@
   real(kind=CUSTOM_REAL) :: Un,Unp1,tauinv,Sn,Snp1,theta_n,theta_np1,tauinvsquare,tauinvcube,tauinvUn
 
 ! compute Grad(displs_poroelastic) at time step n for attenuation
-  if(TURN_ATTENUATION_ON) call compute_gradient_attenuation(displs_poroelastic,dux_dxl_n,duz_dxl_n, &
+  if(ATTENUATION_VISCOELASTIC_SOLID) call compute_gradient_attenuation(displs_poroelastic,dux_dxl_n,duz_dxl_n, &
       dux_dzl_n,duz_dzl_n,xix,xiz,gammax,gammaz,ibool,poroelastic,hprime_xx,hprime_zz,nspec,nglob)
 
 ! loop over spectral elements
@@ -314,7 +314,7 @@
 
 ! compute stress tensor (include attenuation if needed)
 
-  if(TURN_ATTENUATION_ON) then
+  if(ATTENUATION_VISCOELASTIC_SOLID) then
 ! Dissipation only controlled by frame share attenuation in poroelastic (see Morency & Tromp, GJI 2008).
 ! attenuation is implemented following the memory variable formulation of
 ! J. M. Carcione, Seismic modeling in viscoelastic media, Geophysics,
@@ -475,7 +475,7 @@
           bl_relaxed(2) = etal_f*invpermlxz
           bl_relaxed(3) = etal_f*invpermlzz
 
-    if(TURN_VISCATTENUATION_ON) then
+    if(ATTENUATION_POROELASTIC_SOLID) then
           bl_unrelaxed(1) = etal_f*invpermlxx*theta_e/theta_s
           bl_unrelaxed(2) = etal_f*invpermlxz*theta_e/theta_s
           bl_unrelaxed(3) = etal_f*invpermlzz*theta_e/theta_s
@@ -486,7 +486,7 @@
 
           iglob = ibool(i,j,ispec)
 
-     if(TURN_VISCATTENUATION_ON) then
+     if(ATTENUATION_POROELASTIC_SOLID) then
 ! compute the viscous damping term with the unrelaxed viscous coef and add memory variable
       viscodampx = velocw_poroelastic(1,iglob)*bl_unrelaxed(1) + velocw_poroelastic(2,iglob)*bl_unrelaxed(2)&
                  - rx_viscous(i,j,ispec)
@@ -552,7 +552,7 @@
       M_biot = kappal_s*kappal_s/(D_biot - kappal_fr)
 
     call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mul_fr,phil, &
-             tortl,rhol_s,rhol_f,etal_f,permlxx,f0,freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+             tortl,rhol_s,rhol_f,etal_f,permlxx,f0,freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
       cpIl = sqrt(cpIsquare)
       cpIIl = sqrt(cpIIsquare)
@@ -864,7 +864,7 @@
   endif ! if not using an initial field
 
 ! implement attenuation
-  if(TURN_ATTENUATION_ON) then
+  if(ATTENUATION_VISCOELASTIC_SOLID) then
 
 ! compute Grad(displs_poroelastic) at time step n+1 for attenuation
     call compute_gradient_attenuation(displs_poroelastic,dux_dxl_np1,duz_dxl_np1, &

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_solid.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_solid.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_poro_solid.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -44,7 +44,7 @@
   subroutine compute_forces_poro_solid(nglob,nspec,myrank,nelemabs,numat, &
                ispec_selected_source,ispec_selected_rec,is_proc_source,which_proc_receiver,&
                source_type,it,NSTEP,anyabs, &
-               initialfield,TURN_ATTENUATION_ON,TURN_VISCATTENUATION_ON,deltatcube, &
+               initialfield,ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_POROELASTIC_SOLID,deltatcube, &
                deltatfourth,twelvedeltat,fourdeltatsquare,ibool,kmato,numabs,poroelastic,codeabs, &
                accels_poroelastic,velocs_poroelastic,velocw_poroelastic,displs_poroelastic,displw_poroelastic,&
                b_accels_poroelastic,b_displs_poroelastic,b_displw_poroelastic,&
@@ -78,7 +78,7 @@
   integer, dimension(nelemabs) :: ib_bottom
   integer, dimension(nelemabs) :: ib_top
 
-  logical :: anyabs,initialfield,TURN_ATTENUATION_ON
+  logical :: anyabs,initialfield,ATTENUATION_VISCOELASTIC_SOLID
   logical :: SAVE_FORWARD
 
   double precision :: deltatcube,deltatfourth,twelvedeltat,fourdeltatsquare
@@ -123,7 +123,7 @@
   double precision, dimension(NGLLX,NGLLZ,nspec) :: rx_viscous
   double precision, dimension(NGLLX,NGLLZ,nspec) :: rz_viscous
   double precision :: theta_e,theta_s
-  logical TURN_VISCATTENUATION_ON
+  logical ATTENUATION_POROELASTIC_SOLID
   double precision, dimension(3):: bl_unrelaxed,bl_relaxed
 
 ! derivatives of Lagrange polynomials
@@ -185,7 +185,7 @@
   real(kind=CUSTOM_REAL) :: Un,Unp1,tauinv,Sn,Snp1,theta_n,theta_np1,tauinvsquare,tauinvcube,tauinvUn
 
 ! compute Grad(displs_poroelastic) at time step n for attenuation
-  if(TURN_ATTENUATION_ON) call compute_gradient_attenuation(displs_poroelastic,dux_dxl_n,duz_dxl_n, &
+  if(ATTENUATION_VISCOELASTIC_SOLID) call compute_gradient_attenuation(displs_poroelastic,dux_dxl_n,duz_dxl_n, &
       dux_dzl_n,duz_dzl_n,xix,xiz,gammax,gammaz,ibool,poroelastic,hprime_xx,hprime_zz,nspec,nglob)
 
 ! loop over spectral elements
@@ -315,7 +315,7 @@
 
 ! compute stress tensor (include attenuation or anisotropy if needed)
 
-  if(TURN_ATTENUATION_ON) then
+  if(ATTENUATION_VISCOELASTIC_SOLID) then
 ! Dissipation only controlled by frame share attenuation in poroelastic (see Morency & Tromp, GJI 2008).
 ! attenuation is implemented following the memory variable formulation of
 ! J. M. Carcione, Seismic modeling in viscoelastic media, Geophysics,
@@ -495,7 +495,7 @@
           bl_relaxed(2) = etal_f*invpermlxz
           bl_relaxed(3) = etal_f*invpermlzz
 
-    if(TURN_VISCATTENUATION_ON) then
+    if(ATTENUATION_POROELASTIC_SOLID) then
           bl_unrelaxed(1) = etal_f*invpermlxx*theta_e/theta_s
           bl_unrelaxed(2) = etal_f*invpermlxz*theta_e/theta_s
           bl_unrelaxed(3) = etal_f*invpermlzz*theta_e/theta_s
@@ -506,7 +506,7 @@
 
           iglob = ibool(i,j,ispec)
 
-     if(TURN_VISCATTENUATION_ON) then
+     if(ATTENUATION_POROELASTIC_SOLID) then
 ! compute the viscous damping term with the unrelaxed viscous coef and add memory variable
       viscodampx = velocw_poroelastic(1,iglob)*bl_unrelaxed(1) + velocw_poroelastic(2,iglob)*bl_unrelaxed(2)&
                   - rx_viscous(i,j,ispec)
@@ -571,7 +571,7 @@
       M_biot = kappal_s*kappal_s/(D_biot - kappal_fr)
 
     call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mul_fr,phil, &
-             tortl,rhol_s,rhol_f,etal_f,permlxx,f0,freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+             tortl,rhol_s,rhol_f,etal_f,permlxx,f0,freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
       cpIl = sqrt(cpIsquare)
       cpIIl = sqrt(cpIIsquare)
@@ -880,7 +880,7 @@
   endif ! if not using an initial field
 
 ! implement attenuation
-  if(TURN_ATTENUATION_ON) then
+  if(ATTENUATION_VISCOELASTIC_SOLID) then
 
 ! compute Grad(displs_poroelastic) at time step n+1 for attenuation
     call compute_gradient_attenuation(displs_poroelastic,dux_dxl_np1,duz_dxl_np1, &

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_forces_viscoelastic.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -45,7 +45,7 @@
 subroutine compute_forces_viscoelastic(p_sv,nglob,nspec,myrank,nelemabs,numat, &
      ispec_selected_source,ispec_selected_rec,is_proc_source,which_proc_receiver, &
      source_type,it,NSTEP,anyabs,assign_external_model, &
-     initialfield,TURN_ATTENUATION_ON,angleforce,deltatcube, &
+     initialfield,ATTENUATION_VISCOELASTIC_SOLID,angleforce,deltatcube, &
      deltatfourth,twelvedeltat,fourdeltatsquare,ibool,kmato,numabs,elastic,codeabs, &
      accel_elastic,veloc_elastic,displ_elastic,b_accel_elastic,b_displ_elastic, &
      density,poroelastcoef,xix,xiz,gammax,gammaz, &
@@ -80,7 +80,7 @@
   integer, dimension(nelemabs) :: ib_bottom
   integer, dimension(nelemabs) :: ib_top
 
-  logical :: anyabs,assign_external_model,initialfield,TURN_ATTENUATION_ON,add_Bielak_conditions
+  logical :: anyabs,assign_external_model,initialfield,ATTENUATION_VISCOELASTIC_SOLID,add_Bielak_conditions
 
   logical :: SAVE_FORWARD
 
@@ -188,7 +188,7 @@
   sigma_zz = 0
 
   ! compute Grad(displ_elastic) at time step n for attenuation
-  if(TURN_ATTENUATION_ON) then
+  if(ATTENUATION_VISCOELASTIC_SOLID) then
      call compute_gradient_attenuation(displ_elastic,dux_dxl_n,duz_dxl_n, &
           dux_dzl_n,duz_dzl_n,xix,xiz,gammax,gammaz,ibool,elastic,hprime_xx,hprime_zz,nspec,nglob)
   endif
@@ -305,7 +305,7 @@
 
               ! compute stress tensor (include attenuation or anisotropy if needed)
 
-              if(TURN_ATTENUATION_ON) then
+              if(ATTENUATION_VISCOELASTIC_SOLID) then
 
                  ! attenuation is implemented following the memory variable formulation of
                  ! J. M. Carcione, Seismic modeling in viscoelastic media, Geophysics,
@@ -940,7 +940,7 @@
   endif ! if not using an initial field
 
   ! implement attenuation
-  if(TURN_ATTENUATION_ON) then
+  if(ATTENUATION_VISCOELASTIC_SOLID) then
 
      ! compute Grad(displ_elastic) at time step n+1 for attenuation
      call compute_gradient_attenuation(displ_elastic,dux_dxl_np1,duz_dxl_np1, &

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_pressure.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_pressure.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/compute_pressure.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -48,7 +48,7 @@
                   nglob,nglob_acoustic,nglob_elastic,nglob_poroelastic,assign_external_model, &
                   numat,kmato,density,porosity,tortuosity,poroelastcoef,vpext,vsext,rhoext, &
                   c11ext,c13ext,c15ext,c33ext,c35ext,c55ext,anisotropic,anisotropy,e1,e11, &
-                  TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS)
+                  ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS)
 
 ! compute pressure in acoustic elements and in elastic elements
 
@@ -85,7 +85,7 @@
   real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLX) :: hprime_xx
   real(kind=CUSTOM_REAL), dimension(NGLLZ,NGLLZ) :: hprime_zz
 
-  logical :: assign_external_model,TURN_ATTENUATION_ON
+  logical :: assign_external_model,ATTENUATION_VISCOELASTIC_SOLID
 
   integer :: N_SLS
   real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLZ,nspec,N_SLS) :: e1,e11
@@ -107,7 +107,7 @@
          nglob_acoustic,nglob_elastic,nglob_poroelastic,assign_external_model, &
          numat,kmato,density,porosity,tortuosity,poroelastcoef,vpext,vsext,rhoext, &
          c11ext,c13ext,c15ext,c33ext,c35ext,c55ext,anisotropic,anisotropy,ispec,e1,e11, &
-         TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS)
+         ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS)
 
 ! use vector_field_display as temporary storage, store pressure in its second component
     do j = 1,NGLLZ
@@ -131,7 +131,7 @@
          nglob_acoustic,nglob_elastic,nglob_poroelastic,assign_external_model, &
          numat,kmato,density,porosity,tortuosity,poroelastcoef,vpext,vsext,rhoext, &
          c11ext,c13ext,c15ext,c33ext,c35ext,c55ext,anisotropic,anisotropy,ispec,e1,e11, &
-         TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS)
+         ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS)
 
 ! compute pressure in acoustic elements and in elastic elements
 
@@ -168,7 +168,7 @@
   real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLX) :: hprime_xx
   real(kind=CUSTOM_REAL), dimension(NGLLZ,NGLLZ) :: hprime_zz
 
-  logical :: assign_external_model,TURN_ATTENUATION_ON
+  logical :: assign_external_model,ATTENUATION_VISCOELASTIC_SOLID
 
   integer :: N_SLS
   real(kind=CUSTOM_REAL), dimension(NGLLX,NGLLZ,nspec,N_SLS) :: e1,e11
@@ -272,7 +272,7 @@
 
 ! compute diagonal components of the stress tensor (include attenuation or anisotropy if needed)
 
-        if(TURN_ATTENUATION_ON) then
+        if(ATTENUATION_VISCOELASTIC_SOLID) then
 
 ! attenuation is implemented following the memory variable formulation of
 ! J. M. Carcione, Seismic modeling in viscoelastic media, Geophysics,
@@ -423,7 +423,7 @@
 
 ! compute diagonal components of the stress tensor (include attenuation if needed)
 
-        if(TURN_ATTENUATION_ON) then
+        if(ATTENUATION_VISCOELASTIC_SOLID) then
 !-------------------- ATTENTION TO BE DEFINED ------------------------------!
 
 ! attenuation is implemented following the memory variable formulation of

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/get_poroelastic_velocities.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/get_poroelastic_velocities.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/get_poroelastic_velocities.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -46,7 +46,7 @@
 !----
 
   subroutine get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare,H_biot,C_biot,M_biot,mul_fr,phil, &
-             tortl,rhol_s,rhol_f,etal_f,perm,fi,f0,Q0,w_c,TURN_VISCATTENUATION_ON)
+             tortl,rhol_s,rhol_f,etal_f,perm,fi,f0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
   implicit none
 
@@ -64,7 +64,7 @@
   double precision :: wi,fi,taus,taue,Q0,bbr,bbi
 
   double precision :: gA,gB,sa,sb,xxs,yys
-  logical :: TURN_VISCATTENUATION_ON
+  logical :: ATTENUATION_POROELASTIC_SOLID
 
     rhol_bar =  (1.d0 - phil)*rhol_s + phil*rhol_f
 
@@ -78,7 +78,7 @@
     taue = (sqrt(Q0*Q0+1) +1)/(w0il*Q0)
     taus = (sqrt(Q0*Q0+1) -1)/(w0il*Q0)
 
-     if(TURN_VISCATTENUATION_ON) then
+     if(ATTENUATION_POROELASTIC_SOLID) then
 ! high frequency, with memory variables
     bbr = etal_f/perm*(1.d0+alpha*alpha*taus*taue)/(1.d0 + alpha*alpha*taus*taus)
     bbi = etal_f/perm*alpha*(taue-taus)/(1.d0 + alpha*alpha*taus*taus)

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/gmat01.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/gmat01.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/gmat01.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -45,7 +45,7 @@
   subroutine gmat01(density_array,porosity_array,tortuosity_array, &
                     aniso_array,permeability,poroelastcoef, &
                     numat,myrank,ipass,QKappa_array,Qmu_array, &
-                    freq0,Q0,f0,TURN_VISCATTENUATION_ON)
+                    freq0,Q0,f0,ATTENUATION_POROELASTIC_SOLID)
 
 ! reads properties of a 2D isotropic or anisotropic linear elastic element
 
@@ -57,7 +57,7 @@
   double precision :: aniso_array(6,numat),tortuosity_array(numat),permeability(3,numat)
   double precision :: QKappa_array(numat),Qmu_array(numat)
   double precision :: f0,Q0,freq0
-  logical :: TURN_VISCATTENUATION_ON
+  logical :: ATTENUATION_POROELASTIC_SOLID
 
   ! local parameters
   double precision :: lambdaplus2mu,kappa
@@ -199,7 +199,7 @@
         call get_poroelastic_velocities(cpIsquare,cpIIsquare,cssquare, &
                                   H_biot,C_biot,M_biot,mu_fr,phi, &
                                   tortuosity,density(1),density(2),eta_f, &
-                                  val4,f0,freq0,Q0,w_c,TURN_VISCATTENUATION_ON)
+                                  val4,f0,freq0,Q0,w_c,ATTENUATION_POROELASTIC_SOLID)
 
         porosity_array(n) = val2
         tortuosity_array(n) = val3

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/initialize_simulation.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/initialize_simulation.F90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/initialize_simulation.F90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -114,7 +114,7 @@
 
   subroutine initialize_simulation_domains(any_acoustic,any_elastic,any_poroelastic, &
                                 anisotropic,elastic,poroelastic,porosity,anisotropy,kmato,numat, &
-                                nspec,nspec_allocate,p_sv,TURN_ATTENUATION_ON)
+                                nspec,nspec_allocate,p_sv,ATTENUATION_VISCOELASTIC_SOLID)
 
   implicit none
   include "constants.h"
@@ -131,7 +131,7 @@
   integer, dimension(nspec) :: kmato
 
   logical :: any_acoustic,any_elastic,any_poroelastic
-  logical :: p_sv,TURN_ATTENUATION_ON
+  logical :: p_sv,ATTENUATION_VISCOELASTIC_SOLID
 
   ! local parameters
   integer :: ispec
@@ -177,7 +177,7 @@
     print*, '*************** WARNING ***************'
     stop
   endif
-  if(.not. p_sv .and. (TURN_ATTENUATION_ON)) then
+  if(.not. p_sv .and. (ATTENUATION_VISCOELASTIC_SOLID)) then
     print*, '*************** WARNING ***************'
     print*, 'Attenuation and anisotropy are not implemented for surface (membrane) waves calculation'
     print*, '*************** WARNING ***************'
@@ -185,7 +185,7 @@
   endif
 
 
-  if(TURN_ATTENUATION_ON) then
+  if(ATTENUATION_VISCOELASTIC_SOLID) then
     nspec_allocate = nspec
   else
     nspec_allocate = 1

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/read_databases.f90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -51,8 +51,8 @@
                   meshvect,modelvect,boundvect,cutsnaps,subsamp_postscript,sizemax_arrows, &
                   anglerec,initialfield,add_Bielak_conditions, &
                   seismotype,imagetype,assign_external_model,READ_EXTERNAL_SEP_FILE, &
-                  output_grid,output_energy,output_wavefield_snapshot,TURN_ATTENUATION_ON, &
-                  TURN_VISCATTENUATION_ON,Q0,freq0,p_sv, &
+                  output_grid,output_energy,output_wavefield_snapshot,ATTENUATION_VISCOELASTIC_SOLID, &
+                  ATTENUATION_POROELASTIC_SOLID,Q0,freq0,p_sv, &
                   NSTEP,deltat,NTSTEP_BETWEEN_OUTPUT_SEISMO,NSOURCES, &
                   factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_CONSTANT_BLUE_IN_JPG,US_LETTER, &
                   POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0, &
@@ -72,7 +72,7 @@
   logical :: meshvect,modelvect,boundvect,initialfield,add_Bielak_conditions, &
     assign_external_model,READ_EXTERNAL_SEP_FILE, &
     output_grid,output_energy,output_wavefield_snapshot,p_sv
-  logical :: TURN_ATTENUATION_ON,TURN_VISCATTENUATION_ON
+  logical :: ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_POROELASTIC_SOLID
 
   double precision :: cutsnaps,sizemax_arrows,anglerec
   double precision :: Q0,freq0
@@ -194,10 +194,10 @@
   read(IIN,*) assign_external_model,READ_EXTERNAL_SEP_FILE
 
   read(IIN,"(a80)") datlin
-  read(IIN,*) output_grid,output_energy,output_wavefield_snapshot,TURN_ATTENUATION_ON
+  read(IIN,*) output_grid,output_energy,output_wavefield_snapshot,ATTENUATION_VISCOELASTIC_SOLID
 
   read(IIN,"(a80)") datlin
-  read(IIN,*) TURN_VISCATTENUATION_ON,Q0,freq0
+  read(IIN,*) ATTENUATION_POROELASTIC_SOLID,Q0,freq0
 
   read(IIN,"(a80)") datlin
   read(IIN,*) p_sv
@@ -241,7 +241,7 @@
     write(IOUT,600) NTSTEP_BETWEEN_OUTPUT_INFO,colors,numbers
     write(IOUT,700) seismotype,anglerec
     write(IOUT,750) initialfield,add_Bielak_conditions,assign_external_model,&
-                    READ_EXTERNAL_SEP_FILE,TURN_ATTENUATION_ON, &
+                    READ_EXTERNAL_SEP_FILE,ATTENUATION_VISCOELASTIC_SOLID, &
                     output_grid,output_energy
     write(IOUT,800) imagetype,100.d0*cutsnaps,subsamp_postscript
   endif
@@ -252,7 +252,7 @@
   if (myrank == 0 .and. ipass == 1) write(IOUT,703) NSTEP,deltat,NSTEP*deltat
 
   if( SIMULATION_TYPE == 1 .and. SAVE_FORWARD .and. &
-    (TURN_ATTENUATION_ON .or. TURN_VISCATTENUATION_ON) ) then
+    (ATTENUATION_VISCOELASTIC_SOLID .or. ATTENUATION_POROELASTIC_SOLID) ) then
     print*, '*************** WARNING ***************'
     print*, 'Anisotropy & Attenuation & Viscous damping are not presently implemented for adjoint calculations'
     stop
@@ -289,7 +289,7 @@
   'Add Bielak conditions . . . .(add_Bielak_conditions) = ',l6/5x, &
   'Assign external model . . . .(assign_external_model) = ',l6/5x, &
   'Read external SEP file . . .(READ_EXTERNAL_SEP_FILE) = ',l6/5x, &
-  'Turn attenuation on or off. . .(TURN_ATTENUATION_ON) = ',l6/5x, &
+  'Turn attenuation on or off. . .(ATTENUATION_VISCOELASTIC_SOLID) = ',l6/5x, &
   'Save grid in external file or not. . . (output_grid) = ',l6/5x, &
   'Save a file with total energy or not.(output_energy) = ',l6)
 

Modified: seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2012-01-09 18:37:16 UTC (rev 19343)
+++ seismo/2D/SPECFEM2D/trunk/src/specfem2D/specfem2D.F90	2012-01-09 21:55:07 UTC (rev 19344)
@@ -500,7 +500,7 @@
     nelemabs,nelem_acoustic_surface,ispecabs,UPPER_LIMIT_DISPLAY
 
   logical interpol,meshvect,modelvect,boundvect,assign_external_model,initialfield, &
-    output_grid,gnuplot,TURN_ATTENUATION_ON,output_postscript_snapshot,output_color_image, &
+    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_wavefield_snapshot
 
@@ -535,7 +535,7 @@
   double precision :: theta_e,theta_s
   double precision :: Q0,freq0
   double precision :: alphaval,betaval,gammaval,thetainv
-  logical :: TURN_VISCATTENUATION_ON
+  logical :: ATTENUATION_POROELASTIC_SOLID
   double precision, dimension(NGLLX,NGLLZ) :: viscox_loc,viscoz_loc
   double precision :: Sn,Snp1,etal_f
   double precision, dimension(3):: bl_relaxed
@@ -907,8 +907,8 @@
                   meshvect,modelvect,boundvect,cutsnaps,subsamp_postscript,sizemax_arrows, &
                   anglerec,initialfield,add_Bielak_conditions, &
                   seismotype,imagetype,assign_external_model,READ_EXTERNAL_SEP_FILE, &
-                  output_grid,output_energy,output_wavefield_snapshot,TURN_ATTENUATION_ON, &
-                  TURN_VISCATTENUATION_ON,Q0,freq0,p_sv, &
+                  output_grid,output_energy,output_wavefield_snapshot,ATTENUATION_VISCOELASTIC_SOLID, &
+                  ATTENUATION_POROELASTIC_SOLID,Q0,freq0,p_sv, &
                   NSTEP,deltat,NTSTEP_BETWEEN_OUTPUT_SEISMO,NSOURCES, &
                   factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_CONSTANT_BLUE_IN_JPG,US_LETTER, &
                   POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0, &
@@ -939,8 +939,8 @@
                       meshvect,modelvect,boundvect,cutsnaps,subsamp_postscript,sizemax_arrows, &
                       anglerec,initialfield,add_Bielak_conditions, &
                       seismotype,imagetype,assign_external_model,READ_EXTERNAL_SEP_FILE, &
-                      output_grid,output_energy,output_wavefield_snapshot,TURN_ATTENUATION_ON, &
-                      TURN_VISCATTENUATION_ON,Q0,freq0,p_sv, &
+                      output_grid,output_energy,output_wavefield_snapshot,ATTENUATION_VISCOELASTIC_SOLID, &
+                      ATTENUATION_POROELASTIC_SOLID,Q0,freq0,p_sv, &
                       NSTEP,deltat,NTSTEP_BETWEEN_OUTPUT_SEISMO,NSOURCES, &
                       factor_subsample_image,USE_SNAPSHOT_NUMBER_IN_FILENAME,DRAW_WATER_CONSTANT_BLUE_IN_JPG,US_LETTER, &
                       POWER_DISPLAY_COLOR,PERFORM_CUTHILL_MCKEE,SU_FORMAT,USER_T0, &
@@ -1054,7 +1054,7 @@
   !---- read the material properties
   !
   call gmat01(density,porosity,tortuosity,anisotropy,permeability,poroelastcoef,numat,&
-              myrank,ipass,QKappa_attenuation,Qmu_attenuation,freq0,Q0,f0(1),TURN_VISCATTENUATION_ON)
+              myrank,ipass,QKappa_attenuation,Qmu_attenuation,freq0,Q0,f0(1),ATTENUATION_POROELASTIC_SOLID)
   !
   !----  read spectral macrobloc data
   !
@@ -1154,7 +1154,7 @@
 !-------------------------------------------------------------------------------
   call initialize_simulation_domains(any_acoustic,any_elastic,any_poroelastic, &
                                 anisotropic,elastic,poroelastic,porosity,anisotropy,kmato,numat, &
-                                nspec,nspec_allocate,p_sv,TURN_ATTENUATION_ON)
+                                nspec,nspec_allocate,p_sv,ATTENUATION_VISCOELASTIC_SOLID)
 
   ! allocate memory variables for attenuation
   if(ipass == 1) then
@@ -1198,7 +1198,7 @@
 
 ! allocate memory variables for viscous attenuation (poroelastic media)
   if(ipass == 1) then
-    if(TURN_VISCATTENUATION_ON) then
+    if(ATTENUATION_POROELASTIC_SOLID) then
       allocate(rx_viscous(NGLLX,NGLLZ,nspec))
       allocate(rz_viscous(NGLLX,NGLLZ,nspec))
       allocate(viscox(NGLLX,NGLLZ,nspec))
@@ -1906,7 +1906,7 @@
   if(all_anisotropic .and. anyabs) &
     call exit_MPI('Cannot put absorbing boundaries if anisotropic materials along edges')
 
-  if(TURN_ATTENUATION_ON .and. all_anisotropic) then
+  if(ATTENUATION_VISCOELASTIC_SOLID .and. all_anisotropic) then
     call exit_MPI('Cannot turn attenuation on in anisotropic materials')
   end if
 
@@ -1930,7 +1930,7 @@
 #endif
 
   ! for acoustic
-  if(TURN_ATTENUATION_ON .and. .not. any_elastic_glob) &
+  if(ATTENUATION_VISCOELASTIC_SOLID .and. .not. any_elastic_glob) &
     call exit_MPI('currently cannot have attenuation if acoustic/poroelastic simulation only')
 
 !
@@ -2805,7 +2805,7 @@
                  coorg,xinterp,zinterp,shape2D_display,knods,simulation_title, &
                  npgeo,pointsdisp,ngnod,any_elastic,any_poroelastic,all_anisotropic, &
                  myrank,nproc,NSOURCES,poroelastic, &
-                 freq0,Q0,TURN_VISCATTENUATION_ON,US_LETTER,output_postscript_snapshot)
+                 freq0,Q0,ATTENUATION_POROELASTIC_SOLID,US_LETTER,output_postscript_snapshot)
 
 ! convert receiver angle to radians
   anglerec = anglerec * pi / 180.d0
@@ -3133,7 +3133,7 @@
 
       ! call Paco's routine to compute in frequency and convert to time by Fourier transform
       call paco_beyond_critical(coord,nglob,deltat,NSTEP,angleforce(1),&
-              f0(1),cploc,csloc,TURN_ATTENUATION_ON,QKappa_attenuation(1),source_type(1),v0x_left,v0z_left, &
+              f0(1),cploc,csloc,ATTENUATION_VISCOELASTIC_SOLID,QKappa_attenuation(1),source_type(1),v0x_left,v0z_left, &
               v0x_right,v0z_right,v0x_bot,v0z_bot,t0x_left,t0z_left,t0x_right,t0z_right, &
               t0x_bot,t0z_bot,left_bound(1:count_left),right_bound(1:count_right),bot_bound(1:count_bottom), &
               count_left,count_right,count_bottom,displ_elastic,veloc_elastic,accel_elastic,x_source(1))
@@ -3553,7 +3553,7 @@
 ! the common nodes forming the edge are computed here
   if(coupled_elastic_poro) then
 
-    if(TURN_ATTENUATION_ON .or. TURN_VISCATTENUATION_ON) &
+    if(ATTENUATION_VISCOELASTIC_SOLID .or. ATTENUATION_POROELASTIC_SOLID) &
                    stop 'Attenuation not supported for mixed elastic/poroelastic simulations'
 
     if ( myrank == 0 ) then
@@ -3912,7 +3912,7 @@
   seismo_current = 0
 
 ! Precompute Runge Kutta coefficients if viscous attenuation
-  if(TURN_VISCATTENUATION_ON) then
+  if(ATTENUATION_POROELASTIC_SOLID) then
     theta_e = (sqrt(Q0**2+1.d0) +1.d0)/(2.d0*pi*freq0*Q0)
     theta_s = (sqrt(Q0**2+1.d0) -1.d0)/(2.d0*pi*freq0*Q0)
 
@@ -4166,7 +4166,7 @@
 !--------------------------------------------------------------------------------------------
 ! implement viscous attenuation for poroelastic media
 !
-    if(TURN_VISCATTENUATION_ON .and. any_poroelastic) then
+    if(ATTENUATION_POROELASTIC_SOLID .and. any_poroelastic) then
       ! update memory variables with fourth-order Runge-Kutta time scheme for attenuation
       ! loop over spectral elements
       do ispec = 1,nspec
@@ -4685,7 +4685,7 @@
       call compute_forces_viscoelastic(p_sv,nglob,nspec,myrank,nelemabs,numat, &
                ispec_selected_source,ispec_selected_rec,is_proc_source,which_proc_receiver, &
                source_type,it,NSTEP,anyabs,assign_external_model, &
-               initialfield,TURN_ATTENUATION_ON,angleforce,deltatcube, &
+               initialfield,ATTENUATION_VISCOELASTIC_SOLID,angleforce,deltatcube, &
                deltatfourth,twelvedeltat,fourdeltatsquare,ibool,kmato,numabs,elastic,codeabs, &
                accel_elastic,veloc_elastic,displ_elastic,b_accel_elastic,b_displ_elastic, &
                density,poroelastcoef,xix,xiz,gammax,gammaz, &
@@ -5320,7 +5320,7 @@
       call compute_forces_poro_solid(nglob,nspec,myrank,nelemabs,numat, &
                ispec_selected_source,ispec_selected_rec,is_proc_source,which_proc_receiver,&
                source_type,it,NSTEP,anyabs, &
-               initialfield,TURN_ATTENUATION_ON,TURN_VISCATTENUATION_ON,deltatcube, &
+               initialfield,ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_POROELASTIC_SOLID,deltatcube, &
                deltatfourth,twelvedeltat,fourdeltatsquare,ibool,kmato,numabs,poroelastic,codeabs, &
                accels_poroelastic,velocs_poroelastic,velocw_poroelastic,displs_poroelastic,displw_poroelastic,&
                b_accels_poroelastic,b_displs_poroelastic,b_displw_poroelastic,&
@@ -5343,7 +5343,7 @@
       call compute_forces_poro_fluid(nglob,nspec,myrank,nelemabs,numat, &
                ispec_selected_source,ispec_selected_rec,is_proc_source,which_proc_receiver,&
                source_type,it,NSTEP,anyabs, &
-               initialfield,TURN_ATTENUATION_ON,TURN_VISCATTENUATION_ON,deltatcube, &
+               initialfield,ATTENUATION_VISCOELASTIC_SOLID,ATTENUATION_POROELASTIC_SOLID,deltatcube, &
                deltatfourth,twelvedeltat,fourdeltatsquare,ibool,kmato,numabs,poroelastic,codeabs, &
                accelw_poroelastic,velocw_poroelastic,displw_poroelastic,velocs_poroelastic,displs_poroelastic,&
                b_accelw_poroelastic,b_displw_poroelastic,b_displs_poroelastic,&
@@ -6187,7 +6187,7 @@
                         anisotropic,anisotropy,wxgll,wzgll,numat, &
                         pressure_element,vector_field_element,e1,e11, &
                         potential_dot_acoustic,potential_dot_dot_acoustic, &
-                        TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS,p_sv)
+                        ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS,p_sv)
 
 !----  display time step and max of norm of displacement
     if(mod(it,NTSTEP_BETWEEN_OUTPUT_INFO) == 0 .or. it == 5 .or. it == NSTEP) then
@@ -6216,7 +6216,7 @@
               nglob_acoustic,nglob_elastic,nglob_poroelastic,assign_external_model, &
               numat,kmato,density,porosity,tortuosity,poroelastcoef,vpext,vsext,rhoext, &
               c11ext,c13ext,c15ext,c33ext,c35ext,c55ext,anisotropic,anisotropy,ispec,e1,e11, &
-              TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS)
+              ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS)
 
       else if(.not. elastic(ispec) .and. .not. poroelastic(ispec)) then
 
@@ -6978,7 +6978,7 @@
                      nglob,nglob_acoustic,nglob_elastic,nglob_poroelastic,assign_external_model, &
                      numat,kmato,density,porosity,tortuosity,poroelastcoef,vpext,vsext,rhoext, &
                      c11ext,c13ext,c15ext,c33ext,c35ext,c55ext,anisotropic,anisotropy,e1,e11, &
-                     TURN_ATTENUATION_ON,Mu_nu1,Mu_nu2,N_SLS)
+                     ATTENUATION_VISCOELASTIC_SOLID,Mu_nu1,Mu_nu2,N_SLS)
 
         else if(imagetype == 4 .and. .not. p_sv) then
           call exit_MPI('cannot draw pressure field for SH (membrane) waves')



More information about the CIG-COMMITS mailing list