[cig-commits] [commit] devel: updates formatting and removes trailing spaces (7b315ac)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Jan 8 11:54:18 PST 2015
Repository : https://github.com/geodynamics/specfem3d_globe
On branch : devel
Link : https://github.com/geodynamics/specfem3d_globe/compare/3ad4ad0dda8bce0265d5fa9ed7567ee338346d81...133892d126073f174444ba2cb859e8cc72f5478e
>---------------------------------------------------------------
commit 7b315aceebea7652b79e5d4d85a9be13fa09dde7
Author: daniel peter <peterda at ethz.ch>
Date: Thu Jan 8 20:34:27 2015 +0100
updates formatting and removes trailing spaces
>---------------------------------------------------------------
7b315aceebea7652b79e5d4d85a9be13fa09dde7
src/meshfem3D/meshfem3D.f90 | 0
src/meshfem3D/model_attenuation.f90 | 66 ++++++++++++++++++-------------------
src/specfem3D/get_attenuation.f90 | 4 +--
src/specfem3D/specfem3D.F90 | 0
4 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/src/meshfem3D/model_attenuation.f90 b/src/meshfem3D/model_attenuation.f90
index 01414bc..dc3bbcc 100644
--- a/src/meshfem3D/model_attenuation.f90
+++ b/src/meshfem3D/model_attenuation.f90
@@ -275,33 +275,33 @@
! sets up attenuation storage (for all possible Qmu values defined in the 1D models)
allocate(AM_V%Qr(AM_V%Qn), &
- AM_V%Qmu(AM_V%Qn), &
- AM_V%interval_Q(AM_V%Qn), &
- AM_V%Qtau_e(N_SLS,AM_V%Qn), &
- stat=ier)
+ AM_V%Qmu(AM_V%Qn), &
+ AM_V%interval_Q(AM_V%Qn), &
+ AM_V%Qtau_e(N_SLS,AM_V%Qn), &
+ stat=ier)
if (ier /= 0 ) call exit_MPI(myrank,'Error allocating AM_V arrays')
if (REFERENCE_1D_MODEL == REFERENCE_MODEL_PREM) then
- AM_V%Qr(:) = (/ 0.0d0, RICB, RICB, RCMB, RCMB, R670, R670, R220, R220, R80, R80, R_EARTH /)
- AM_V%Qmu(:) = (/ 84.6d0, 84.6d0, 0.0d0, 0.0d0, 312.0d0, 312.0d0, 143.0d0, 143.0d0, 80.0d0, 80.0d0, 600.0d0, 600.0d0 /)
+ AM_V%Qr(:) = (/ 0.0d0, RICB, RICB, RCMB, RCMB, R670, R670, R220, R220, R80, R80, R_EARTH /)
+ AM_V%Qmu(:) = (/ 84.6d0, 84.6d0, 0.0d0, 0.0d0, 312.0d0, 312.0d0, 143.0d0, 143.0d0, 80.0d0, 80.0d0, 600.0d0, 600.0d0 /)
else if (REFERENCE_1D_MODEL == REFERENCE_MODEL_IASP91) then
- AM_V%Qr(:) = (/ 0.0d0, RICB, RICB, RCMB, RCMB, R670, R670, R220, R220, R120, R120, R_EARTH /)
- AM_V%Qmu(:) = (/ 84.6d0, 84.6d0, 0.0d0, 0.0d0, 312.0d0, 312.0d0, 143.0d0, 143.0d0, 80.0d0, 80.0d0, 600.0d0, 600.0d0 /)
+ AM_V%Qr(:) = (/ 0.0d0, RICB, RICB, RCMB, RCMB, R670, R670, R220, R220, R120, R120, R_EARTH /)
+ AM_V%Qmu(:) = (/ 84.6d0, 84.6d0, 0.0d0, 0.0d0, 312.0d0, 312.0d0, 143.0d0, 143.0d0, 80.0d0, 80.0d0, 600.0d0, 600.0d0 /)
else if (REFERENCE_1D_MODEL == REFERENCE_MODEL_AK135F_NO_MUD) then
- AM_V%Qr(:) = Mak135_V_radius_ak135(:)
- AM_V%Qmu(:) = Mak135_V_Qmu_ak135(:)
+ AM_V%Qr(:) = Mak135_V_radius_ak135(:)
+ AM_V%Qmu(:) = Mak135_V_Qmu_ak135(:)
else if (REFERENCE_1D_MODEL == REFERENCE_MODEL_1066A) then
- AM_V%Qr(:) = M1066a_V_radius_1066a(:)
- AM_V%Qmu(:) = M1066a_V_Qmu_1066a(:)
+ AM_V%Qr(:) = M1066a_V_radius_1066a(:)
+ AM_V%Qmu(:) = M1066a_V_Qmu_1066a(:)
else if (REFERENCE_1D_MODEL == REFERENCE_MODEL_1DREF) then
- AM_V%Qr(:) = Mref_V_radius_ref(:)
- AM_V%Qmu(:) = Mref_V_Qmu_ref(:)
+ AM_V%Qr(:) = Mref_V_radius_ref(:)
+ AM_V%Qmu(:) = Mref_V_Qmu_ref(:)
else if (REFERENCE_1D_MODEL == REFERENCE_MODEL_JP1D) then
- AM_V%Qr(:) = (/ 0.0d0, RICB, RICB, RCMB, RCMB, R670, R670, R220, R220, R120, R120, R_EARTH /)
- AM_V%Qmu(:) = (/ 84.6d0, 84.6d0, 0.0d0, 0.0d0, 312.0d0, 312.0d0, 143.0d0, 143.0d0, 80.0d0, 80.0d0, 600.0d0, 600.0d0 /)
+ AM_V%Qr(:) = (/ 0.0d0, RICB, RICB, RCMB, RCMB, R670, R670, R220, R220, R120, R120, R_EARTH /)
+ AM_V%Qmu(:) = (/ 84.6d0, 84.6d0, 0.0d0, 0.0d0, 312.0d0, 312.0d0, 143.0d0, 143.0d0, 80.0d0, 80.0d0, 600.0d0, 600.0d0 /)
else if (REFERENCE_1D_MODEL == REFERENCE_MODEL_SEA1D) then
- AM_V%Qr(:) = SEA1DM_V_radius_sea1d(:)
- AM_V%Qmu(:) = SEA1DM_V_Qmu_sea1d(:)
+ AM_V%Qr(:) = SEA1DM_V_radius_sea1d(:)
+ AM_V%Qmu(:) = SEA1DM_V_Qmu_sea1d(:)
endif
do i = 1, AM_V%Qn
@@ -482,21 +482,21 @@
Qmu_new = dble(Qtmp) / dble(AM_S%Q_resolution)
if (rw > 0) then
- ! READ
- if (AM_S%Qmu_storage(Qtmp) > 0) then
- ! READ SUCCESSFUL
- tau_e(:) = AM_S%tau_e_storage(:, Qtmp)
- Qmu = AM_S%Qmu_storage(Qtmp)
- rw = 1
- else
- ! READ NOT SUCCESSFUL
- rw = -1
- endif
+ ! READ
+ if (AM_S%Qmu_storage(Qtmp) > 0) then
+ ! READ SUCCESSFUL
+ tau_e(:) = AM_S%tau_e_storage(:, Qtmp)
+ Qmu = AM_S%Qmu_storage(Qtmp)
+ rw = 1
+ else
+ ! READ NOT SUCCESSFUL
+ rw = -1
+ endif
else
- ! WRITE SUCCESSFUL
- AM_S%tau_e_storage(:,Qtmp) = tau_e(:)
- AM_S%Qmu_storage(Qtmp) = Qmu
- rw = 1
+ ! WRITE SUCCESSFUL
+ AM_S%tau_e_storage(:,Qtmp) = tau_e(:)
+ AM_S%Qmu_storage(Qtmp) = Qmu
+ rw = 1
endif
end subroutine model_attenuation_storage
@@ -549,7 +549,7 @@
dexpval = (exp2-exp1) / ((n*1.0d0) - 1)
do i = 1,n
- tau_s(i) = 1.0 / (PI * 2.0d0 * 10**(exp1 + (i - 1)* 1.0d0 *dexpval))
+ tau_s(i) = 1.0 / (PI * 2.0d0 * 10**(exp1 + (i - 1)* 1.0d0 *dexpval))
enddo
end subroutine attenuation_tau_sigma
diff --git a/src/specfem3D/get_attenuation.f90 b/src/specfem3D/get_attenuation.f90
index 961c180..8a512fd 100644
--- a/src/specfem3D/get_attenuation.f90
+++ b/src/specfem3D/get_attenuation.f90
@@ -217,8 +217,8 @@
!--- check that the correction factor is close to one
if (scale_factor < 0.8d0 .or. scale_factor > 1.2d0) then
- print*,'Error: incorrect scale factor: ', scale_factor
- call exit_MPI(myrank,'incorrect correction factor in attenuation model')
+ print*,'Error: incorrect scale factor: ', scale_factor
+ call exit_MPI(myrank,'incorrect correction factor in attenuation model')
endif
end subroutine get_attenuation_scale_factor
More information about the CIG-COMMITS
mailing list