[cig-commits] [commit] devel, master: renamed INCLUDE_SEDIMENTS_CRUST to INCLUDE_SEDIMENTS_IN_CRUST (d03666b)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d_globe

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

>---------------------------------------------------------------

commit d03666bb59dadb9fa35ebfd291b98d7d77aedecc
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Mon May 19 00:24:12 2014 +0200

    renamed INCLUDE_SEDIMENTS_CRUST to INCLUDE_SEDIMENTS_IN_CRUST


>---------------------------------------------------------------

d03666bb59dadb9fa35ebfd291b98d7d77aedecc
 setup/constants.h.in              |  2 +-
 src/meshfem3D/model_crust_1_0.f90 | 14 +++++++-------
 src/meshfem3D/model_crust_2_0.f90 |  4 ++--
 src/meshfem3D/model_crustmaps.f90 |  8 ++++----
 src/meshfem3D/model_epcrust.f90   |  2 +-
 src/meshfem3D/model_eucrust.f90   |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/setup/constants.h.in b/setup/constants.h.in
index ac1b88f..c37f29b 100644
--- a/setup/constants.h.in
+++ b/setup/constants.h.in
@@ -202,7 +202,7 @@
   logical, parameter :: SMOOTH_CRUST_EVEN_MORE = .true.
 
 ! use sedimentary layers in crustal model
-  logical, parameter :: INCLUDE_SEDIMENTS_CRUST = .true.
+  logical, parameter :: INCLUDE_SEDIMENTS_IN_CRUST = .true.
   double precision, parameter :: MINIMUM_SEDIMENT_THICKNESS = 2.d0 ! minimim thickness in km
 
 ! default crustal model
diff --git a/src/meshfem3D/model_crust_1_0.f90 b/src/meshfem3D/model_crust_1_0.f90
index 4e2f3d8..7925821 100644
--- a/src/meshfem3D/model_crust_1_0.f90
+++ b/src/meshfem3D/model_crust_1_0.f90
@@ -142,8 +142,7 @@
   ! gets smoothed structure
   call crust_1_0_CAPsmoothed(lat,lon,vps,vss,rhos,thicks)
 
-  ! note: we ignore water & ice sheets
-  ! (only elastic layers are considered)
+  ! note: we ignore water and ice sheets (only elastic layers are considered)
 
   ! whole sediment thickness
   h_sed = thicks(3) + thicks(4) + thicks(5)
@@ -182,15 +181,15 @@
   found_crust = .true.
 
   ! gets corresponding crustal velocities and density
-  if(x > x3 .and. INCLUDE_SEDIMENTS_CRUST ) then
+  if(x > x3 .and. INCLUDE_SEDIMENTS_IN_CRUST ) then
     vp = vps(3)
     vs = vss(3)
     rho = rhos(3)
-  else if(x > x4 .and. INCLUDE_SEDIMENTS_CRUST ) then
+  else if(x > x4 .and. INCLUDE_SEDIMENTS_IN_CRUST ) then
     vp = vps(4)
     vs = vss(4)
     rho = rhos(4)
-  else if(x > x5 .and. INCLUDE_SEDIMENTS_CRUST ) then
+  else if(x > x5 .and. INCLUDE_SEDIMENTS_IN_CRUST ) then
     vp = vps(5)
     vs = vss(5)
     rho = rhos(5)
@@ -321,7 +320,7 @@
   ! frees memory
   deallocate(bnd)
 
-  ! additional info
+  ! output debug info if needed
   if( DEBUG_FILE_OUTPUT ) then
     ! allocates temporary arrays
     allocate(thc(CRUST_NLA,CRUST_NLO), &
@@ -401,7 +400,8 @@
 
     ! frees memory
     deallocate(ths,thc)
-  endif
+
+  endif ! of if( DEBUG_FILE_OUTPUT )
 
   end subroutine read_crust_1_0_model
 
diff --git a/src/meshfem3D/model_crust_2_0.f90 b/src/meshfem3D/model_crust_2_0.f90
index dbfff89..1a1cd5b 100644
--- a/src/meshfem3D/model_crust_2_0.f90
+++ b/src/meshfem3D/model_crust_2_0.f90
@@ -168,11 +168,11 @@
   found_crust = .true.
 
   ! gets corresponding crustal velocities and density
-  if(x > x3 .and. INCLUDE_SEDIMENTS_CRUST ) then
+  if(x > x3 .and. INCLUDE_SEDIMENTS_IN_CRUST ) then
     vp = vps(3)
     vs = vss(3)
     rho = rhos(3)
-  else if(x > x4 .and. INCLUDE_SEDIMENTS_CRUST ) then
+  else if(x > x4 .and. INCLUDE_SEDIMENTS_IN_CRUST ) then
     vp = vps(4)
     vs = vss(4)
     rho = rhos(4)
diff --git a/src/meshfem3D/model_crustmaps.f90 b/src/meshfem3D/model_crustmaps.f90
index f365415..bf3b99d 100644
--- a/src/meshfem3D/model_crustmaps.f90
+++ b/src/meshfem3D/model_crustmaps.f90
@@ -259,13 +259,13 @@
   x7 = (R_EARTH-(h_uc+thicks(4)+thicks(5))*1000.0d0)/R_EARTH
 
   found_crust = .true.
-! if(x > x3 .and. INCLUDE_SEDIMENTS_CRUST .and. h_sed > MINIMUM_SEDIMENT_THICKNESS) then
-  if(x > x3 .and. INCLUDE_SEDIMENTS_CRUST ) then
+! if(x > x3 .and. INCLUDE_SEDIMENTS_IN_CRUST .and. h_sed > MINIMUM_SEDIMENT_THICKNESS) then
+  if(x > x3 .and. INCLUDE_SEDIMENTS_IN_CRUST ) then
    vp = vps(1)
    vs = vss(1)
    rho = rhos(1)
-! else if(x > x4 .and. INCLUDE_SEDIMENTS_CRUST .and. h_sed > MINIMUM_SEDIMENT_THICKNESS) then
-  else if(x > x4 .and. INCLUDE_SEDIMENTS_CRUST ) then
+! else if(x > x4 .and. INCLUDE_SEDIMENTS_IN_CRUST .and. h_sed > MINIMUM_SEDIMENT_THICKNESS) then
+  else if(x > x4 .and. INCLUDE_SEDIMENTS_IN_CRUST ) then
    vp = vps(2)
    vs = vss(2)
    rho = rhos(2)
diff --git a/src/meshfem3D/model_epcrust.f90 b/src/meshfem3D/model_epcrust.f90
index 4afc64f..b9d20a2 100644
--- a/src/meshfem3D/model_epcrust.f90
+++ b/src/meshfem3D/model_epcrust.f90
@@ -217,7 +217,7 @@
 
   found_crust=.true.
 
-  if ( dep > basement .and. INCLUDE_SEDIMENTS_CRUST &
+  if ( dep > basement .and. INCLUDE_SEDIMENTS_IN_CRUST &
           .and. zsmooth(1) >= MINIMUM_SEDIMENT_THICKNESS ) then ! Hejun Zhu add minimum sediment thickness
     vp=vpsmooth(1)
     vs=vssmooth(1)
diff --git a/src/meshfem3D/model_eucrust.f90 b/src/meshfem3D/model_eucrust.f90
index 5d4b85c..d2e8336 100644
--- a/src/meshfem3D/model_eucrust.f90
+++ b/src/meshfem3D/model_eucrust.f90
@@ -230,7 +230,7 @@
 
               scaleval = dsqrt(PI*GRAV*RHOAV)
 
-              if( x > x3 .and. INCLUDE_SEDIMENTS_CRUST &
+              if( x > x3 .and. INCLUDE_SEDIMENTS_IN_CRUST &
                 .and. h_basement > MINIMUM_SEDIMENT_THICKNESS) then
                 ! above sediment basement, returns average upper crust value
                 ! since no special sediment values are given