[cig-commits] r14609 - in seismo/3D/SPECFEM3D_GLOBE/branches/pluggable: . MODELS/1D_ref/1066a MODELS/1D_ref/ak135 MODELS/1D_ref/blank MODELS/1D_ref/iasp91 MODELS/1D_ref/prem MODELS/1D_ref/ref
leif at geodynamics.org
leif at geodynamics.org
Mon Apr 6 13:56:20 PDT 2009
Author: leif
Date: 2009-04-06 13:56:19 -0700 (Mon, 06 Apr 2009)
New Revision: 14609
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.serial.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.serial.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.serial.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.serial.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.serial.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.serial.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/anisotropic_inner_core_model.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/attenuation_model.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/read_compute_parameters.f90
Log:
Incredibly, Fortran 90/95 limits identifiers to 31 characters.
Intel's ifort enforces this when given "-e03", which is included in
FLAGS_(NO_)CHECK by 'flags.guess'. I renamed various pluggable earth
model API routines accordingly.
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -49,17 +49,17 @@
!-------------------
- subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
+ subroutine aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
double precision x,vp,vp0,vs,vs0,rho,rho0
stop 'anisotropic inner core not implemented for 1066a'
- end subroutine reference_1d_model_aniso_inner_core_model_setup
+ end subroutine aniso_inner_core_model_setup
!-------------------
- subroutine reference_1d_model_attenuation_model_setup(AM_V)
+ subroutine ref1d_attenuation_model_setup(AM_V)
use model_1066a_module
implicit none
@@ -98,7 +98,7 @@
AM_V%Qr(:) = M1066a_V%radius_1066a(:)
AM_V%Qmu(:) = M1066a_V%Qmu_1066a(:)
- end subroutine reference_1d_model_attenuation_model_setup
+ end subroutine ref1d_attenuation_model_setup
!-------------------
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.serial.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.serial.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -67,10 +67,10 @@
!-------------------
- subroutine reference_1d_model_adjust_time_step(DT)
+ subroutine adjust_time_step(DT)
double precision DT
DT = DT*0.20d0
- end subroutine reference_1d_model_adjust_time_step
+ end subroutine adjust_time_step
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -48,17 +48,17 @@
!-------------------
- subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
+ subroutine aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
double precision x,vp,vp0,vs,vs0,rho,rho0
stop 'anisotropic inner core not implemented for ak135'
- end subroutine reference_1d_model_aniso_inner_core_model_setup
+ end subroutine aniso_inner_core_model_setup
!-------------------
- subroutine reference_1d_model_attenuation_model_setup(AM_V)
+ subroutine ref1d_attenuation_model_setup(AM_V)
use model_ak135_module
implicit none
@@ -97,7 +97,7 @@
AM_V%Qr(:) = Mak135_V%radius_ak135(:)
AM_V%Qmu(:) = Mak135_V%Qmu_ak135(:)
- end subroutine reference_1d_model_attenuation_model_setup
+ end subroutine ref1d_attenuation_model_setup
!-------------------
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.serial.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.serial.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -65,10 +65,10 @@
!-------------------
- subroutine reference_1d_model_adjust_time_step(DT)
+ subroutine adjust_time_step(DT)
double precision DT
! no-op
- end subroutine reference_1d_model_adjust_time_step
+ end subroutine adjust_time_step
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -25,7 +25,7 @@
!
!=====================================================================
-subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
+subroutine aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
implicit none
@@ -35,7 +35,7 @@
stop 'anisotropic inner core not implemented'
-end subroutine reference_1d_model_aniso_inner_core_model_setup
+end subroutine aniso_inner_core_model_setup
subroutine define_reference_1d_model(USE_EXTERNAL_CRUSTAL_MODEL)
@@ -47,7 +47,7 @@
end subroutine define_reference_1d_model
-subroutine reference_1d_model_attenuation_model_setup(AM_V)
+subroutine ref1d_attenuation_model_setup(AM_V)
implicit none
@@ -77,7 +77,7 @@
! Define attenuation model here.
-end subroutine reference_1d_model_attenuation_model_setup
+end subroutine ref1d_attenuation_model_setup
subroutine get_reference_1d_model(myrank,r_prem,rho,vpv,vph,vsv,vsh,eta_aniso, &
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.serial.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.serial.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -40,10 +40,10 @@
end subroutine get_reference_1d_model_radii
-subroutine reference_1d_model_adjust_time_step(DT)
+subroutine adjust_time_step(DT)
double precision DT
! If necessary, adjust time step here.
-end subroutine reference_1d_model_adjust_time_step
+end subroutine adjust_time_step
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -26,7 +26,7 @@
!=====================================================================
- subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
+ subroutine aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
implicit none
@@ -41,7 +41,7 @@
vs0=3.56454d0
rho0=13.0885d0
- end subroutine reference_1d_model_aniso_inner_core_model_setup
+ end subroutine aniso_inner_core_model_setup
!-------------------
@@ -55,7 +55,7 @@
!-------------------
- subroutine reference_1d_model_attenuation_model_setup(AM_V)
+ subroutine ref1d_attenuation_model_setup(AM_V)
implicit none
@@ -101,7 +101,7 @@
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 /)
- end subroutine reference_1d_model_attenuation_model_setup
+ end subroutine ref1d_attenuation_model_setup
!-------------------
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.serial.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.serial.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -62,10 +62,10 @@
!-------------------
- subroutine reference_1d_model_adjust_time_step(DT)
+ subroutine adjust_time_step(DT)
double precision DT
! no-op
- end subroutine reference_1d_model_adjust_time_step
+ end subroutine adjust_time_step
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -26,7 +26,7 @@
!=====================================================================
- subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
+ subroutine aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
implicit none
@@ -41,7 +41,7 @@
vs0=3.6678d0
rho0=13.0885d0
- end subroutine reference_1d_model_aniso_inner_core_model_setup
+ end subroutine aniso_inner_core_model_setup
!
!=====================================================================
@@ -59,7 +59,7 @@
!=====================================================================
!
- subroutine reference_1d_model_attenuation_model_setup(AM_V)
+ subroutine ref1d_attenuation_model_setup(AM_V)
implicit none
@@ -105,7 +105,7 @@
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 /)
- end subroutine reference_1d_model_attenuation_model_setup
+ end subroutine ref1d_attenuation_model_setup
!
!=====================================================================
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.serial.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.serial.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -61,10 +61,10 @@
!=====================================================================
!
- subroutine reference_1d_model_adjust_time_step(DT)
+ subroutine adjust_time_step(DT)
double precision DT
! no-op
- end subroutine reference_1d_model_adjust_time_step
+ end subroutine adjust_time_step
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -51,17 +51,17 @@
!-------------------
- subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
+ subroutine aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
double precision x,vp,vp0,vs,vs0,rho,rho0
stop 'anisotropic inner core not implemented for ref'
- end subroutine reference_1d_model_aniso_inner_core_model_setup
+ end subroutine aniso_inner_core_model_setup
!-------------------
- subroutine reference_1d_model_attenuation_model_setup(AM_V)
+ subroutine ref1d_attenuation_model_setup(AM_V)
use model_ref_module
implicit none
@@ -100,7 +100,7 @@
AM_V%Qr(:) = Mref_V%radius_ref(:)
AM_V%Qmu(:) = Mref_V%Qmu_ref(:)
- end subroutine reference_1d_model_attenuation_model_setup
+ end subroutine ref1d_attenuation_model_setup
!-------------------
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.serial.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.serial.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -59,10 +59,10 @@
!-------------------
- subroutine reference_1d_model_adjust_time_step(DT)
+ subroutine adjust_time_step(DT)
double precision DT
! no-op
- end subroutine reference_1d_model_adjust_time_step
+ end subroutine adjust_time_step
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/anisotropic_inner_core_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/anisotropic_inner_core_model.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/anisotropic_inner_core_model.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -50,7 +50,7 @@
double precision c66
double precision scale_fac
- call reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
+ call aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
! elastic tensor for hexagonal symmetry in reduced notation:
!
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/attenuation_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/attenuation_model.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/attenuation_model.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -138,7 +138,7 @@
if(myrank > 0) return
call define_reference_1d_model(.FALSE.)
- call reference_1d_model_attenuation_model_setup(AM_V)
+ call ref1d_attenuation_model_setup(AM_V)
do i = 1, AM_V%Qn
call attenuation_conversion(AM_V%Qmu(i), AM_V%QT_c_source, AM_V%Qtau_s, tau_e, AM_V, AM_S,AS_V)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/read_compute_parameters.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/read_compute_parameters.f90 2009-04-06 19:54:09 UTC (rev 14608)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/read_compute_parameters.f90 2009-04-06 20:56:19 UTC (rev 14609)
@@ -474,7 +474,7 @@
endif
endif
- call reference_1d_model_adjust_time_step(DT)
+ call adjust_time_step(DT)
if( .not. ATTENUATION_RANGE_PREDEFINED ) then
call auto_attenuation_periods(ANGULAR_WIDTH_XI_IN_DEGREES, NEX_MAX, &
More information about the CIG-COMMITS
mailing list