[cig-commits] r13340 - in seismo/3D/SPECFEM3D_GLOBE/branches/pluggable: . MODELS/3D/Montagner MODELS/3D/s20rts MODELS/3D/s29ea MODELS/3D/s362ani MODELS/3D/s362ani_prem MODELS/3D/s362iso MODELS/3D/s362wmani MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0
leif at geodynamics.org
leif at geodynamics.org
Tue Nov 18 17:37:01 PST 2008
Author: leif
Date: 2008-11-18 17:37:01 -0800 (Tue, 18 Nov 2008)
New Revision: 13340
Added:
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/prem
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/prem
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/common
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/ref
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/ref
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/common
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/prem
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/S362ANI
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/common
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/ref
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/common
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/ref
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem
Modified:
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.f90
seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
Log:
Updated the code to use downloaded 3D earth models. Added symlinks to
1D ref models. Wrote a makefile which creates the predefined models.
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.f90 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.f90 2008-11-19 01:37:01 UTC (rev 13340)
@@ -399,7 +399,6 @@
double precision ra(47),pari(14,47)
double precision bet2(14,34,37,73)
double precision alph(73,37),ph(73,37)
- character(len=150) glob_prem3sm01, globpreman3sm01
np1 = 1
np2 = 34
@@ -408,8 +407,7 @@
!
! glob-prem3sm01: model with rho,A,L,xi-1,1-phi,eta
!
- call get_value_string(glob_prem3sm01, 'model.glob_prem3sm01', 'DATA/Montagner_model/glob-prem3sm01')
- open(19,file=glob_prem3sm01,status='old',action='read')
+ open(19,file='@THIS_DIR@/glob-prem3sm01',status='old',action='read')
!
! read the models
@@ -469,8 +467,7 @@
! beta(ipa,idep,ilat,ilon) are sorted in (amplitude, phase)
! normalized, in percents: 100 G/L
!
- call get_value_string(globpreman3sm01, 'model.globpreman3sm01', 'DATA/Montagner_model/globpreman3sm01')
- open(unit=15,file=globpreman3sm01,status='old',action='read')
+ open(unit=15,file='@THIS_DIR@/globpreman3sm01',status='old',action='read')
do nf = 7,nfin,2
ipa = nf
@@ -561,13 +558,11 @@
double precision corpar(21,47)
double precision aa,an,al,af,ac,vpv,vph,vsv,vsh,rho,red,a2l
character(len=80) null
- character(len=150) Adrem119
ifanis = 1
nri = 47
- call get_value_string(Adrem119, 'model.Adrem119', 'DATA/Montagner_model/Adrem119')
- open(unit=13,file=Adrem119,status='old',action='read')
+ open(unit=13,file='@THIS_DIR@/Adrem119',status='old',action='read')
read(13,*,end = 77) nlayer,minlay,moho,nout,neff,nband,kiti,null
if(kiti == 0) read(13,"(20a4)",end = 77) idum1
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/prem
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/prem (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/prem 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/prem
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/prem
___________________________________________________________________
Name: svn:special
+ *
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.f90 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.f90 2008-11-19 01:37:01 UTC (rev 13340)
@@ -110,13 +110,8 @@
integer k,l,m
- character(len=150) S20RTS, P12
-
- call get_value_string(S20RTS, 'model.S20RTS', 'DATA/s20rts/S20RTS.dat')
- call get_value_string(P12, 'model.P12', 'DATA/s20rts/P12.dat')
-
! S20RTS degree 20 S model from Ritsema
- open(unit=10,file=S20RTS,status='old',action='read')
+ open(unit=10,file='@THIS_DIR@/S20RTS.dat',status='old',action='read')
do k=0,NK
do l=0,NS
read(10,*) D3MM_V%dvs_a(k,l,0),(D3MM_V%dvs_a(k,l,m),D3MM_V%dvs_b(k,l,m),m=1,l)
@@ -125,7 +120,7 @@
close(10)
! P12 degree 12 P model from Ritsema
- open(unit=10,file=P12,status='old',action='read')
+ open(unit=10,file='@THIS_DIR@/P12.dat',status='old',action='read')
do k=0,NK
do l=0,12
read(10,*) D3MM_V%dvp_a(k,l,0),(D3MM_V%dvp_a(k,l,m),D3MM_V%dvp_b(k,l,m),m=1,l)
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/prem
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/prem (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/prem 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/prem
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/prem
___________________________________________________________________
Name: svn:special
+ *
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/common
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/common (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/common 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../s362ani/common
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/common
___________________________________________________________________
Name: svn:special
+ *
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/ref
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/ref (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/ref 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/ref
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/ref
___________________________________________________________________
Name: svn:special
+ *
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.f90 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.f90 2008-11-19 01:37:01 UTC (rev 13340)
@@ -58,7 +58,7 @@
integer myrank
- call read_s362ani_mantle_model(myrank,'S2.9EA')
+ call read_s362ani_mantle_model(myrank,'@THIS_DIR@/S2.9EA')
end subroutine read_3d_mantle_model
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/ref
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/ref (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/ref 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/ref
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/ref
___________________________________________________________________
Name: svn:special
+ *
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.f90 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.f90 2008-11-19 01:37:01 UTC (rev 13340)
@@ -58,7 +58,7 @@
integer myrank
- call read_s362ani_mantle_model(myrank,'S362ANI')
+ call read_s362ani_mantle_model(myrank,'@THIS_DIR@/S362ANI')
end subroutine read_3d_mantle_model
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/common
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/common (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/common 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../s362ani/common
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/common
___________________________________________________________________
Name: svn:special
+ *
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/prem
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/prem (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/prem 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/prem
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/prem
___________________________________________________________________
Name: svn:special
+ *
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.f90 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.f90 2008-11-19 01:37:01 UTC (rev 13340)
@@ -58,7 +58,7 @@
integer myrank
- call read_s362ani_mantle_model(myrank,'S362ANI_PREM')
+ call read_s362ani_mantle_model(myrank,'@THIS_DIR@/S362ANI_PREM')
end subroutine read_3d_mantle_model
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/S362ANI
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/S362ANI (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/S362ANI 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../s362ani/S362ANI
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/S362ANI
___________________________________________________________________
Name: svn:special
+ *
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/common
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/common (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/common 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../s362ani/common
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/common
___________________________________________________________________
Name: svn:special
+ *
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/ref
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/ref (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/ref 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/ref
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/ref
___________________________________________________________________
Name: svn:special
+ *
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.f90 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.f90 2008-11-19 01:37:01 UTC (rev 13340)
@@ -58,7 +58,7 @@
integer myrank
- call read_s362ani_mantle_model(myrank,'S362ANI')
+ call read_s362ani_mantle_model(myrank,'@THIS_DIR@/S362ANI')
end subroutine read_3d_mantle_model
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/common
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/common (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/common 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../s362ani/common
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/common
___________________________________________________________________
Name: svn:special
+ *
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/ref
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/ref (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/ref 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/ref
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/ref
___________________________________________________________________
Name: svn:special
+ *
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.f90 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.f90 2008-11-19 01:37:01 UTC (rev 13340)
@@ -58,7 +58,7 @@
integer myrank
- call read_s362ani_mantle_model(myrank,'S362WMANI')
+ call read_s362ani_mantle_model(myrank,'@THIS_DIR@/S362WMANI')
end subroutine read_3d_mantle_model
Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem 2008-11-19 01:37:01 UTC (rev 13340)
@@ -0,0 +1 @@
+link ../../1D_ref/prem
\ No newline at end of file
Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem
___________________________________________________________________
Name: svn:special
+ *
Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in 2008-11-19 01:28:18 UTC (rev 13339)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in 2008-11-19 01:37:01 UTC (rev 13340)
@@ -51,8 +51,6 @@
O = obj
S = @srcdir@
-model_OBJECTS = $(crustal_model_OBJECTS) $(mantle_model_OBJECTS) $(reference_1d_model_OBJECTS)
-
libspecfem_a_OBJECTS = \
$O/add_missing_nodes.o \
$O/add_topography.o \
@@ -183,16 +181,22 @@
include $S/MODELS/crustal/crust2.0/build.mk
-include $S/MODELS/3D_mantle/s20rts/build.mk
-#include $S/MODELS/3D_mantle/s362ani/build.mk
-#include $S/MODELS/3D_mantle/s29ea/build.mk
-#include $S/MODELS/3D_mantle/s362ani_prem/build.mk
-#include $S/MODELS/3D_mantle/s362iso/build.mk
-#include $S/MODELS/3D_mantle/s362wmani/build.mk
-#include $S/MODELS/3D_mantle/transversely_isotropic_prem_plus_3D_crust_2.0/build.mk
-#include $S/MODELS/3D_mantle/Montagner/build.mk
-#include $S/MODELS/3D_mantle/none/build.mk
+# This file is generated by 'specfem3D.py'.
+include model.mk
+model_OBJECTS += $(crustal_model_OBJECTS)
+
+
+#include $S/MODELS/3D/s20rts/build.mk
+#include $S/MODELS/3D/s362ani/build.mk
+#include $S/MODELS/3D/s29ea/build.mk
+#include $S/MODELS/3D/s362ani_prem/build.mk
+#include $S/MODELS/3D/s362iso/build.mk
+#include $S/MODELS/3D/s362wmani/build.mk
+#include $S/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/build.mk
+#include $S/MODELS/3D/Montagner/build.mk
+#include $S/MODELS/3D/none/build.mk
+
# This is determined by the 3D mantle model.
#include $S/MODELS/1D_ref/prem/build.mk
#include $S/MODELS/1D_ref/iasp91/build.mk
More information about the CIG-COMMITS
mailing list