[cig-commits] r13354 - 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 MODELS/crustal MODELS/crustal/crust2.0 MODELS/crustal/none

leif at geodynamics.org leif at geodynamics.org
Wed Nov 19 17:45:01 PST 2008 

Author: leif
Date: 2008-11-19 17:45:01 -0800 (Wed, 19 Nov 2008)
New Revision: 13354

Added:
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/no_crust
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/crust2.0
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/crust2.0
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/crust2.0
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/crust2.0
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/crust2.0
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/crust2.0
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/crust2.0
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/none/
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/none/crustal_model_none.f90
Modified:
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/crustal_model.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/meshfem3D.f90
Log:
Allow users to define their own crustal model.


Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/no_crust
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/no_crust	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/no_crust	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/none
\ No newline at end of file


Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/no_crust
___________________________________________________________________
Name: svn:special
   + *

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/crust2.0
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/crust2.0	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/crust2.0	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/crust2.0
\ No newline at end of file


Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/crust2.0
___________________________________________________________________
Name: svn:special
   + *

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/crust2.0
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/crust2.0	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/crust2.0	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/crust2.0
\ No newline at end of file


Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/crust2.0
___________________________________________________________________
Name: svn:special
   + *

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/crust2.0
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/crust2.0	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/crust2.0	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/crust2.0
\ No newline at end of file


Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/crust2.0
___________________________________________________________________
Name: svn:special
   + *

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/crust2.0
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/crust2.0	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/crust2.0	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/crust2.0
\ No newline at end of file


Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/crust2.0
___________________________________________________________________
Name: svn:special
   + *

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/crust2.0
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/crust2.0	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/crust2.0	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/crust2.0
\ No newline at end of file


Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/crust2.0
___________________________________________________________________
Name: svn:special
   + *

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/crust2.0
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/crust2.0	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/crust2.0	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/crust2.0
\ No newline at end of file


Property changes on: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/crust2.0
___________________________________________________________________
Name: svn:special
   + *

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/crust2.0
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/crust2.0	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/crust2.0	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1 @@
+link ../../crustal/crust2.0
\ 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/crust2.0
___________________________________________________________________
Name: svn:special
   + *

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/crustal_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/crustal_model.f90	2008-11-20 00:47:59 UTC (rev 13353)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/crust2.0/crustal_model.f90	2008-11-20 01:45:01 UTC (rev 13354)
@@ -58,7 +58,7 @@
 
 !---------------------------
 
-  subroutine read_crust_2_0(myrank)
+  subroutine read_crust(myrank)
 
   use crustal_model_module
   implicit none
@@ -77,7 +77,7 @@
   call MPI_BCAST(CM_V%abbreviation,NCAP_CRUST*NCAP_CRUST,MPI_CHARACTER,0,MPI_COMM_WORLD,ier)
   call MPI_BCAST(CM_V%code,2*NKEYS_CRUST,MPI_CHARACTER,0,MPI_COMM_WORLD,ier)
 
-  end subroutine read_crust_2_0
+  end subroutine read_crust
 
 !---------------------------
 
@@ -155,18 +155,13 @@
 
   double precision h_moho_min,h_moho_max
 
-  character(len=150) CNtype2, CNtype2_key_modif
-
-  call get_value_string(CNtype2, 'model.CNtype2', 'DATA/crust2.0/CNtype2.txt')
-  call get_value_string(CNtype2_key_modif, 'model.CNtype2_key_modif', 'DATA/crust2.0/CNtype2_key_modif.txt')
-
-  open(unit=1,file=CNtype2,status='old',action='read')
+  open(unit=1,file='@THIS_DIR@/CNtype2.txt',status='old',action='read')
   do ila=1,NCAP_CRUST/2
     read(1,*) icolat,(CM_V%abbreviation(ila,i),i=1,NCAP_CRUST)
   enddo
   close(1)
 
-  open(unit=1,file=CNtype2_key_modif,status='old',action='read')
+  open(unit=1,file='@THIS_DIR@/CNtype2_key_modif.txt',status='old',action='read')
   h_moho_min=HUGEVAL
   h_moho_max=-HUGEVAL
   do ikey=1,NKEYS_CRUST

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/none/crustal_model_none.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/none/crustal_model_none.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/crustal/none/crustal_model_none.f90	2008-11-20 01:45:01 UTC (rev 13354)
@@ -0,0 +1,48 @@
+!=====================================================================
+!
+!          S p e c f e m 3 D  G l o b e  V e r s i o n  4 . 0
+!          --------------------------------------------------
+!
+!          Main authors: Dimitri Komatitsch and Jeroen Tromp
+!    Seismological Laboratory, California Institute of Technology, USA
+!             and University of Pau / CNRS / INRIA, France
+! (c) California Institute of Technology and University of Pau / CNRS / INRIA
+!                            February 2008
+!
+! This program is free software; you can redistribute it and/or modify
+! it under the terms of the GNU General Public License as published by
+! the Free Software Foundation; either version 2 of the License, or
+! (at your option) any later version.
+!
+! This program is distributed in the hope that it will be useful,
+! but WITHOUT ANY WARRANTY; without even the implied warranty of
+! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+! GNU General Public License for more details.
+!
+! You should have received a copy of the GNU General Public License along
+! with this program; if not, write to the Free Software Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+!=====================================================================
+
+subroutine read_crust(myrank)
+
+  implicit none
+
+  integer myrank
+
+  stop 'CRUSTAL is true, but there is no crust defined!'
+
+end subroutine read_crust
+
+
+subroutine crustal_model(lat,lon,x,vp,vs,rho,moho,found_crust)
+
+  implicit none
+
+  double precision lat,lon,x,vp,vs,rho,moho
+  logical found_crust
+
+  stop 'CRUSTAL is true, but there is no crust defined!'
+
+end subroutine crustal_model

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in	2008-11-20 00:47:59 UTC (rev 13353)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in	2008-11-20 01:45:01 UTC (rev 13354)
@@ -179,14 +179,9 @@
 #### includes
 ####
 
-include $S/MODELS/crustal/crust2.0/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
@@ -197,7 +192,10 @@
 #include $S/MODELS/3D/Montagner/build.mk
 #include $S/MODELS/3D/none/build.mk
 
-# This is determined by the 3D mantle model.
+# This is determined by the 3D model.
+#include $S/MODELS/crustal/crust2.0/build.mk
+
+# This is determined by the 3D model.
 #include $S/MODELS/1D_ref/prem/build.mk
 #include $S/MODELS/1D_ref/iasp91/build.mk
 #include $S/MODELS/1D_ref/1066a/build.mk

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/meshfem3D.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/meshfem3D.f90	2008-11-20 00:47:59 UTC (rev 13353)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/meshfem3D.f90	2008-11-20 01:45:01 UTC (rev 13354)
@@ -860,7 +860,7 @@
   call read_3d_mantle_model(myrank)
 
   if(CRUSTAL) then
-    call read_crust_2_0(myrank)
+    call read_crust(myrank)
   endif
 
   if(ANISOTROPIC_INNER_CORE) then

More information about the CIG-COMMITS mailing list