[cig-commits] [commit] devel, master: updated some comments (198182e)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Nov 6 08:16:31 PST 2014
Repository : https://github.com/geodynamics/specfem3d_globe
On branches: devel,master
Link : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f
>---------------------------------------------------------------
commit 198182e05000a9a0336243be2a401de933187b6c
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date: Sun May 18 17:28:24 2014 +0200
updated some comments
>---------------------------------------------------------------
198182e05000a9a0336243be2a401de933187b6c
src/meshfem3D/model_crust_1_0.f90 | 4 ++--
src/meshfem3D/model_crust_2_0.f90 | 12 +++++-------
src/meshfem3D/model_crustmaps.f90 | 33 +++++++++++++++------------------
3 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/src/meshfem3D/model_crust_1_0.f90 b/src/meshfem3D/model_crust_1_0.f90
index a3e4c54..b57112e 100644
--- a/src/meshfem3D/model_crust_1_0.f90
+++ b/src/meshfem3D/model_crust_1_0.f90
@@ -41,8 +41,8 @@
! 1) water
! 2) ice
! 3) upper sediments (VP, VS, rho not defined in all cells)
-! 4) middle sediments "
-! 5) lower sediments "
+! 4) middle sediments (VP, VS, rho not defined in all cells)
+! 5) lower sediments (VP, VS, rho not defined in all cells)
! 6) upper crystalline crust
! 7) middle crystalline crust
! 8) lower crystalline crust
diff --git a/src/meshfem3D/model_crust_2_0.f90 b/src/meshfem3D/model_crust_2_0.f90
index 6c85721..35bd78d 100644
--- a/src/meshfem3D/model_crust_2_0.f90
+++ b/src/meshfem3D/model_crust_2_0.f90
@@ -266,14 +266,13 @@
!-------------------------------------------------------------------------------------------------
!
- subroutine crust_CAPsmoothed(lat,lon,velp,vels,rho,thick,abbreviation,&
- code,thlr,velocp,velocs,dens)
+ subroutine crust_CAPsmoothed(lat,lon,velp,vels,rho,thick,abbreviation,code,thlr,velocp,velocs,dens)
! crustal vp and vs in km/s, layer thickness in km
!
! crust2.0 is smoothed with a cap of size CAP using NTHETA points
! in the theta direction and NPHI in the phi direction.
-! The cap is rotated to the North Pole.
+! The cap is first rotated to the North Pole for easier implementation.
use constants
use model_crust_2_0_par,only: NLAYERS_CRUST,NKEYS_CRUST,NCAP_CRUST
@@ -472,7 +471,7 @@
thtp(i)=thlr(i,ikey)
enddo
- ! get distance to Moho from the bottom of the ocean or the ice
+ ! get distance to Moho from the bottom of the ocean or the ice
thtp(NLAYERS_CRUST) = thlr(NLAYERS_CRUST,ikey) - thtp(1) - thtp(2)
end subroutine get_crust_structure
@@ -545,8 +544,7 @@
sinp = dsin(phi)
cosp = dcos(phi)
- ! set up rotation matrix to go from cap at North pole
- ! to cap around point of interest
+ ! set up rotation matrix to go from cap at North pole to cap around point of interest
rotation_matrix(1,1) = cosp*cost
rotation_matrix(1,2) = -sinp
rotation_matrix(1,3) = cosp*sint
@@ -571,7 +569,7 @@
i = i+1
- ! get the weight associated with this integration point (same for all phi)
+ ! get the weight associated with this integration point (same for all phi)
weight(i) = wght
total = total + weight(i)
diff --git a/src/meshfem3D/model_crustmaps.f90 b/src/meshfem3D/model_crustmaps.f90
index a917177..6935dbb 100644
--- a/src/meshfem3D/model_crustmaps.f90
+++ b/src/meshfem3D/model_crustmaps.f90
@@ -28,15 +28,15 @@
!--------------------------------------------------------------------------------------------------
! General Crustmaps
!
-! combines Crust2.0 and EUcrust07 for moho depths; the crustal maps are
-! interpolating the crustal velocities from Crust2.0 onto the more detailed EUcrust
+! combines Crust2.0 and EUcrust07 for moho depths; the crustal maps
+! interpolate the crustal velocities from Crust2.0 onto the more detailed EUcrust
! crustal depths where ever they are defined.
! current crustmaps (cmaps) take sediment thickness
! and moho depths from EUcrust07 if possible and interpolate corresponding
! velocity/densities given from Crust2.0.
!
-! main author: Matthias Meschede (meschede at princeton.edu)
+! main author: Matthias Meschede (meschede AT princeton DOT edu)
!--------------------------------------------------------------------------------------------------
module model_crustmaps_par
@@ -177,7 +177,7 @@
velocsnp(l) = velocsnp(l)/360.0/dble(CRUSTMAP_RESOLUTION)
velocssp(l) = velocssp(l)/360.0/dble(CRUSTMAP_RESOLUTION)
-! print *,'thicknessnp(',l,')',thicknessnp(l)
+! print *,'thicknessnp(',l,')',thicknessnp(l)
enddo
end subroutine read_general_crustmap
@@ -193,9 +193,7 @@
implicit none
- double precision, intent(out), &
- dimension(180*CRUSTMAP_RESOLUTION,360*CRUSTMAP_RESOLUTION)&
- :: var
+ double precision, intent(out), dimension(180*CRUSTMAP_RESOLUTION,360*CRUSTMAP_RESOLUTION) :: var
character(len=1), intent(in) :: var_letter
integer, intent(in) :: ind
@@ -226,7 +224,6 @@
end subroutine read_general_crustmap_layer
-
!
!-------------------------------------------------------------------------------------------------
!
@@ -262,14 +259,12 @@
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 .and. h_sed > MINIMUM_SEDIMENT_THICKNESS) then
if(x > x3 .and. INCLUDE_SEDIMENTS_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 .and. h_sed > MINIMUM_SEDIMENT_THICKNESS) then
else if(x > x4 .and. INCLUDE_SEDIMENTS_CRUST ) then
vp = vps(2)
vs = vss(2)
@@ -451,7 +446,7 @@
weightlr=(1.0-weightup)*(1.0-weightleft)
if(iupcolat==0) then
- ! north pole
+ ! North pole
do i=1,NLAYERS_CRUSTMAP
thickl(i)=weightul*thicknessnp(i)+weightur*thicknessnp(i)+&
weightll*thickness(1,ileftlng,i)+weightlr*thickness(1,irightlng,i)
@@ -464,7 +459,7 @@
weightll*velocs(1,ileftlng,i)+weightlr*velocs(1,irightlng,i)
enddo
else if(iupcolat==180*CRUSTMAP_RESOLUTION) then
- ! south pole
+ ! South pole
do i=1,NLAYERS_CRUSTMAP
thickl(i)=weightul*thickness(iupcolat,ileftlng,i)+weightur*thickness(iupcolat,irightlng,i)+&
weightll*thicknesssp(i)+weightlr*thicknesssp(i)
@@ -485,10 +480,10 @@
weightll*velocp(iupcolat+1,ileftlng,i)+weightlr*velocp(iupcolat+1,irightlng,i)
velsl(i)=weightul*velocs(iupcolat,ileftlng,i)+weightur*velocs(iupcolat,irightlng,i)+&
weightll*velocs(iupcolat+1,ileftlng,i)+weightlr*velocs(iupcolat+1,irightlng,i)
- ! thicks(i)=1.0
- ! rhos(i)=1.0
- ! velp(i)=1.0
- ! vels(i)=1.0i
+ ! thicks(i)=1.0
+ ! rhos(i)=1.0
+ ! velp(i)=1.0
+ ! vels(i)=1.0i
enddo
endif
@@ -533,6 +528,7 @@
if(lat > 90.0d0 .or. lat < -90.0d0 .or. lng > 180.0d0 .or. lng < -180.0d0) &
stop 'error in latitude/longitude range in icolat_ilon'
+! map longitudes to [0,360]
if(lng<0) then
xlng=lng+360.0
else
@@ -555,3 +551,4 @@
if(ileftlng>360*CRUSTMAP_RESOLUTION) ileftlng=1
end subroutine ibilinearmap
+
More information about the CIG-COMMITS
mailing list