[cig-commits] r13283 - in seismo/3D/SPECFEM3D_GLOBE/branches/pluggable: . MODELS MODELS/1D_ref MODELS/1D_ref/1066a MODELS/1D_ref/ak135 MODELS/1D_ref/iasp91 MODELS/1D_ref/prem MODELS/1D_ref/ref MODELS/3D_mantle MODELS/3D_mantle/s20rts MODELS/3D_mantle/s362ani MODELS/crustal MODELS/crustal/crust2.0
leif at geodynamics.org
leif at geodynamics.org
Mon Nov 10 17:59:25 PST 2008
Author: leif
Date: 2008-11-10 17:59:24 -0800 (Mon, 10 Nov 2008)
New Revision: 13283
Added:
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s20rts/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s362ani/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/
Removed:
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1066a/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/ak135/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crust2.0/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/iasp91/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/prem/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/ref/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/s20rts/
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/s362ani/
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s20rts/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s362ani/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/build.mk
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/get_model.f90
Log:
Partitioned models into subdirectories. Corrected a mistake I made in
get_model().
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1066a)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1066a/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -3,5 +3,5 @@
$O/model_1066a.o \
$(EMPTY_MACRO)
-$O/model_1066a.o: constants.h $S/MODELS/1066a/model_1066a.f90
- ${MPIFCCOMPILE_CHECK} -c -o $O/model_1066a.o ${FCFLAGS_f90} $S/MODELS/1066a/model_1066a.f90
+$O/model_1066a.o: constants.h $S/MODELS/1D_ref/1066a/model_1066a.f90
+ ${MPIFCCOMPILE_CHECK} -c -o $O/model_1066a.o ${FCFLAGS_f90} $S/MODELS/1D_ref/1066a/model_1066a.f90
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135 (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/ak135)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/ak135/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -3,5 +3,5 @@
$O/model_ak135.o \
$(EMPTY_MACRO)
-$O/model_ak135.o: constants.h $S/MODELS/ak135/model_ak135.f90
- ${MPIFCCOMPILE_CHECK} -c -o $O/model_ak135.o ${FCFLAGS_f90} $S/MODELS/ak135/model_ak135.f90
+$O/model_ak135.o: constants.h $S/MODELS/1D_ref/ak135/model_ak135.f90
+ ${MPIFCCOMPILE_CHECK} -c -o $O/model_ak135.o ${FCFLAGS_f90} $S/MODELS/1D_ref/ak135/model_ak135.f90
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91 (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/iasp91)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/iasp91/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -3,5 +3,5 @@
$O/model_iasp91.o \
$(EMPTY_MACRO)
-$O/model_iasp91.o: constants.h $S/MODELS/iasp91/model_iasp91.f90
- ${MPIFCCOMPILE_CHECK} -c -o $O/model_iasp91.o ${FCFLAGS_f90} $S/MODELS/iasp91/model_iasp91.f90
+$O/model_iasp91.o: constants.h $S/MODELS/1D_ref/iasp91/model_iasp91.f90
+ ${MPIFCCOMPILE_CHECK} -c -o $O/model_iasp91.o ${FCFLAGS_f90} $S/MODELS/1D_ref/iasp91/model_iasp91.f90
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/prem)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/prem/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -3,5 +3,5 @@
$O/model_prem.o \
$(EMPTY_MACRO)
-$O/model_prem.o: constants.h $S/MODELS/prem/model_prem.f90
- ${FCCOMPILE_CHECK} -c -o $O/model_prem.o ${FCFLAGS_f90} $S/MODELS/prem/model_prem.f90
+$O/model_prem.o: constants.h $S/MODELS/1D_ref/prem/model_prem.f90
+ ${FCCOMPILE_CHECK} -c -o $O/model_prem.o ${FCFLAGS_f90} $S/MODELS/1D_ref/prem/model_prem.f90
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/ref)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/ref/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -3,5 +3,5 @@
$O/model_ref.o \
$(EMPTY_MACRO)
-$O/model_ref.o: constants.h $S/MODELS/ref/model_ref.f90
- ${MPIFCCOMPILE_CHECK} -c -o $O/model_ref.o ${FCFLAGS_f90} $S/MODELS/ref/model_ref.f90
+$O/model_ref.o: constants.h $S/MODELS/1D_ref/ref/model_ref.f90
+ ${MPIFCCOMPILE_CHECK} -c -o $O/model_ref.o ${FCFLAGS_f90} $S/MODELS/1D_ref/ref/model_ref.f90
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s20rts (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/s20rts)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s20rts/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/s20rts/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s20rts/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -3,5 +3,5 @@
$O/mantle_model.o \
$(EMPTY_MACRO)
-$O/mantle_model.o: constants.h $S/MODELS/s20rts/mantle_model.f90
- ${MPIFCCOMPILE_CHECK} -c -o $O/mantle_model.o ${FCFLAGS_f90} $S/MODELS/s20rts/mantle_model.f90
+$O/mantle_model.o: constants.h $S/MODELS/3D_mantle/s20rts/mantle_model.f90
+ ${MPIFCCOMPILE_CHECK} -c -o $O/mantle_model.o ${FCFLAGS_f90} $S/MODELS/3D_mantle/s20rts/mantle_model.f90
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s362ani (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/s362ani)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s362ani/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/s362ani/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D_mantle/s362ani/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -4,8 +4,8 @@
$O/s362ani.o \
$(EMPTY_MACRO)
-$O/add_topography_410_650.o: constants.h $S/MODELS/s362ani/add_topography_410_650.f90
- ${FCCOMPILE_CHECK} -c -o $O/add_topography_410_650.o ${FCFLAGS_f90} $S/MODELS/s362ani/add_topography_410_650.f90
+$O/add_topography_410_650.o: constants.h $S/MODELS/3D_mantle/s362ani/add_topography_410_650.f90
+ ${FCCOMPILE_CHECK} -c -o $O/add_topography_410_650.o ${FCFLAGS_f90} $S/MODELS/3D_mantle/s362ani/add_topography_410_650.f90
-$O/s362ani.o: constants.h $S/MODELS/s362ani/s362ani.f90
- ${MPIFCCOMPILE_CHECK} -c -o $O/s362ani.o ${FCFLAGS_f90} $S/MODELS/s362ani/s362ani.f90
+$O/s362ani.o: constants.h $S/MODELS/3D_mantle/s362ani/s362ani.f90
+ ${MPIFCCOMPILE_CHECK} -c -o $O/s362ani.o ${FCFLAGS_f90} $S/MODELS/3D_mantle/s362ani/s362ani.f90
Copied: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0 (from rev 13275, seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crust2.0)
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/build.mk
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crust2.0/build.mk 2008-11-08 00:24:07 UTC (rev 13275)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/build.mk 2008-11-11 01:59:24 UTC (rev 13283)
@@ -1,7 +1,7 @@
-crust_2_0_OBJECTS = \
+crustal_model_OBJECTS = \
$O/crustal_model.o \
$(EMPTY_MACRO)
-$O/crustal_model.o: constants.h $S/MODELS/crust2.0/crustal_model.f90
- ${MPIFCCOMPILE_CHECK} -c -o $O/crustal_model.o ${FCFLAGS_f90} $S/MODELS/crust2.0/crustal_model.f90
+$O/crustal_model.o: constants.h $S/MODELS/crustal/crust2.0/crustal_model.f90
+ ${MPIFCCOMPILE_CHECK} -c -o $O/crustal_model.o ${FCFLAGS_f90} $S/MODELS/crustal/crust2.0/crustal_model.f90
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in 2008-11-10 22:06:10 UTC (rev 13282)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in 2008-11-11 01:59:24 UTC (rev 13283)
@@ -51,7 +51,7 @@
O = obj
S = @srcdir@
-model_OBJECTS = $(crust_2_0_OBJECTS) $(s20rts_OBJECTS) $(s362ani_OBJECTS) $(reference_1d_model_OBJECTS)
+model_OBJECTS = $(crustal_model_OBJECTS) $(s20rts_OBJECTS) $(s362ani_OBJECTS) $(reference_1d_model_OBJECTS)
libspecfem_a_OBJECTS = \
$O/add_missing_nodes.o \
@@ -182,17 +182,18 @@
#### includes
####
-include $S/MODELS/crust2.0/build.mk
-include $S/MODELS/s20rts/build.mk
-include $S/MODELS/s362ani/build.mk
+include $S/MODELS/crustal/crust2.0/build.mk
-include $S/MODELS/prem/build.mk
-#include $S/MODELS/iasp91/build.mk
-#include $S/MODELS/1066a/build.mk
-#include $S/MODELS/ak135/build.mk
-#include $S/MODELS/ref/build.mk
+include $S/MODELS/3D_mantle/s20rts/build.mk
+include $S/MODELS/3D_mantle/s362ani/build.mk
+include $S/MODELS/1D_ref/prem/build.mk
+#include $S/MODELS/1D_ref/iasp91/build.mk
+#include $S/MODELS/1D_ref/1066a/build.mk
+#include $S/MODELS/1D_ref/ak135/build.mk
+#include $S/MODELS/1D_ref/ref/build.mk
+
####
#### rules for executables
####
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/get_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/get_model.f90 2008-11-10 22:06:10 UTC (rev 13282)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/get_model.f90 2008-11-11 01:59:24 UTC (rev 13283)
@@ -193,25 +193,31 @@
! get the 3-D model parameters
if(ISOTROPIC_3D_MANTLE) then
- if(r_prem > RCMB/R_EARTH .and. r_prem < RMOHO/R_EARTH) then
- radius = r
- else if(r_prem >= RMOHO/R_EARTH) then
- ! extend 3-D mantle model above the Moho to the surface before adding the crust
- radius = 0.999999d0*RMOHO/R_EARTH ! r_moho
- endif
+ do
+ if(r_prem > RCMB/R_EARTH .and. r_prem < RMOHO/R_EARTH) then
+ radius = r
+ else if(r_prem >= RMOHO/R_EARTH) then
+ ! extend 3-D mantle model above the Moho to the surface before adding the crust
+ radius = 0.999999d0*RMOHO/R_EARTH ! r_moho
+ else
+ exit
+ endif
- call xyz_2_rthetaphi_dble(xmesh,ymesh,zmesh,r_dummy,theta,phi)
- call reduce(theta,phi)
- if(THREE_D_MODEL == THREE_D_MODEL_S20RTS) then
- call get_model_s20rts(radius,theta,phi,vpv,vph,vsv,vsh,rho,eta_aniso)
- elseif(THREE_D_MODEL == THREE_D_MODEL_S362ANI .or. THREE_D_MODEL == THREE_D_MODEL_S362WMANI &
- .or. THREE_D_MODEL == THREE_D_MODEL_S362ANI_PREM .or. THREE_D_MODEL == THREE_D_MODEL_S29EA) then
- call get_model_s362ani(radius,theta,phi,vpv,vph,vsv,vsh,rho,eta_aniso, &
- TRANSVERSE_ISOTROPY)
- else
- stop 'unknown 3D Earth model in get_model'
- endif
+ call xyz_2_rthetaphi_dble(xmesh,ymesh,zmesh,r_dummy,theta,phi)
+ call reduce(theta,phi)
+ if(THREE_D_MODEL == THREE_D_MODEL_S20RTS) then
+ call get_model_s20rts(radius,theta,phi,vpv,vph,vsv,vsh,rho,eta_aniso)
+ elseif(THREE_D_MODEL == THREE_D_MODEL_S362ANI .or. THREE_D_MODEL == THREE_D_MODEL_S362WMANI &
+ .or. THREE_D_MODEL == THREE_D_MODEL_S362ANI_PREM .or. THREE_D_MODEL == THREE_D_MODEL_S29EA) then
+ call get_model_s362ani(radius,theta,phi,vpv,vph,vsv,vsh,rho,eta_aniso, &
+ TRANSVERSE_ISOTROPY)
+ else
+ stop 'unknown 3D Earth model in get_model'
+ endif
+ exit
+ end do
+
endif
if(ANISOTROPIC_INNER_CORE .and. iregion_code == IREGION_INNER_CORE) &
@@ -232,7 +238,7 @@
call reduce(theta,phi)
call aniso_mantle_model(radius,theta,phi,rho,c11,c12,c13,c14,c15,c16, &
c22,c23,c24,c25,c26,c33,c34,c35,c36,c44,c45,c46,c55,c56,c66,AMM_V)
-
+
else
! fill the rest of the mantle with the isotropic model
c11 = rho*vpv*vpv
More information about the CIG-COMMITS
mailing list