[cig-commits] [commit] devel, master: made source code of model_crust_2_0.f90 closer to that of model_crust_1_0.f90 (1260874)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:16:43 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit 12608745ebd824452eeda733eaa3ee01dc70b990
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Mon May 19 00:31:43 2014 +0200
made source code of model_crust_2_0.f90 closer to that of model_crust_1_0.f90
>---------------------------------------------------------------
12608745ebd824452eeda733eaa3ee01dc70b990
src/meshfem3D/model_crust_1_0.f90 | 2 +-
src/meshfem3D/model_crust_2_0.f90 | 18 +++++++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/meshfem3D/model_crust_1_0.f90 b/src/meshfem3D/model_crust_1_0.f90
index 7925821..15b32db 100644
--- a/src/meshfem3D/model_crust_1_0.f90
+++ b/src/meshfem3D/model_crust_1_0.f90
@@ -174,7 +174,7 @@
! print*,' lat/lon/x:',lat,lon,x
!endif
- ! no matter found_crust true or false, output moho thickness
+ ! no matter if found_crust is true or false, compute moho thickness
moho = (h_uc+thicks(7)+thicks(8)) * scaleval
! gets corresponding crustal velocities and density
diff --git a/src/meshfem3D/model_crust_2_0.f90 b/src/meshfem3D/model_crust_2_0.f90
index 1a1cd5b..cfeef89 100644
--- a/src/meshfem3D/model_crust_2_0.f90
+++ b/src/meshfem3D/model_crust_2_0.f90
@@ -141,17 +141,27 @@
call crust_2_0_CAPsmoothed(lat,lon,vps,vss,rhos,thicks,abbreviation, &
code,crust_thickness,crust_vp,crust_vs,crust_rho)
+ ! note: we ignore water and ice sheets (only elastic layers are considered)
+
+ ! whole sediment thickness
+ h_sed = thicks(3) + thicks(4)
+
+ ! upper crust thickness (including sediments above)
+ h_uc = h_sed + thicks(5)
+
! non-dimensionalization factor
scaleval = ONE / R_EARTH_KM
! non-dimensionalizes thickness (given in km)
! upper sediment
x3 = ONE - thicks(3) * scaleval
- h_sed = thicks(3) + thicks(4)
+ ! all sediments
x4 = ONE - h_sed * scaleval
- h_uc = h_sed + thicks(5)
+ ! upper crust
x5 = ONE - h_uc * scaleval
+ ! middle crust
x6 = ONE - (h_uc+thicks(6)) * scaleval
+ ! lower crust
x7 = ONE - (h_uc+thicks(6)+thicks(7)) * scaleval
! checks moho value
@@ -161,7 +171,7 @@
! print*,' lat/lon/x:',lat,lon,x
!endif
- ! no matter found_crust true or false, output moho thickness
+ ! no matter if found_crust is true or false, compute moho thickness
moho = (h_uc+thicks(6)+thicks(7)) * scaleval
! gets corresponding crustal velocities and density
@@ -395,8 +405,10 @@
if( h_sed < MINIMUM_SEDIMENT_THICKNESS ) then
velpl(3) = velpl(5)
velpl(4) = velpl(5)
+
velsl(3) = velsl(5)
velsl(4) = velsl(5)
+
rhol(3) = rhol(5)
rhol(4) = rhol(5)
endif
More information about the CIG-COMMITS
mailing list