[cig-commits] r14162 - 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 MODELS/3D MODELS/3D/Montagner MODELS/3D/blank MODELS/3D/blank-c MODELS/3D/citcoms_isotropic_no_crust 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
Thu Feb 26 16:59:07 PST 2009


Author: leif
Date: 2009-02-26 16:59:07 -0800 (Thu, 26 Feb 2009)
New Revision: 14162

Added:
   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.serial.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.serial.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.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.serial.f90
Removed:
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/none/
Modified:
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.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/iasp91/model_iasp91.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.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/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/prepare-model.py
Log:
Cleanly separate the subset of model plug-ins which is a dependency of
the serial codes.  The three plug-in routines called from
read_compute_parameters() -- get_model_properties(),
get_reference_1d_model_radii(), and reference_1d_model_adjust_time_step()
-- must reside in a source file that ends with ".serial.f90" or
".serial.c".  The code in "*.serial.*" source files cannot use MPI.


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-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -49,57 +49,6 @@
 
 !-------------------
 
-  subroutine get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
-     R80,R120,R220,R400,R600,R670,R771, &
-     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
-
-  implicit none
-
-  include "constants.h"
-
-  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
-       R80,R120,R220,R400,R600,R670,R771, &
-       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
-
-  ! values below corrected by Ying Zhou <yingz at gps.caltech.edu>
-
-  ! 1066A
-  RMOHO = 6360000.d0
-  R400 = 5950000.d0
-  R600 = 5781000.d0
-  R670 = 5700000.d0
-  RCMB = 3484300.d0
-  RICB = 1229480.d0
-
-  ! values for 1066A that are not discontinuities
-  RTOPDDOUBLEPRIME = 3631000.d0
-  R220 = 6161000.d0
-  R771 = 5611000.d0
-  ! RMIDDLE_CRUST used only for high resolution FFSW1C model, with 3 elements crust simulations
-  ! mid_crust = 10 km
-  RMIDDLE_CRUST = 6361000.d0
-  R80 = 6291000.d0
-
-  ! model 1066A has no oceans, therefore we use the radius of the Earth instead
-  ROCEAN = R_EARTH
-
-  RHO_TOP_OC = 9917.4500 / RHOAV
-  RHO_BOTTOM_OC = 12160.6500 / RHOAV
-
-  end subroutine get_reference_1d_model_radii
-
-!-------------------
-
-  subroutine reference_1d_model_adjust_time_step(DT)
-
-  double precision DT
-
-  DT = DT*0.20d0
-
-  end subroutine reference_1d_model_adjust_time_step
-
-!-------------------
-
   subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
 
   double precision x,vp,vp0,vs,vs0,rho,rho0

Added: 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	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/1066a/model_1066a.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,76 @@
+!=====================================================================
+!
+!          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 get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
+     R80,R120,R220,R400,R600,R670,R771, &
+     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
+
+  implicit none
+
+  include "constants.h"
+
+  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
+       R80,R120,R220,R400,R600,R670,R771, &
+       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
+
+  ! values below corrected by Ying Zhou <yingz at gps.caltech.edu>
+
+  ! 1066A
+  RMOHO = 6360000.d0
+  R400 = 5950000.d0
+  R600 = 5781000.d0
+  R670 = 5700000.d0
+  RCMB = 3484300.d0
+  RICB = 1229480.d0
+
+  ! values for 1066A that are not discontinuities
+  RTOPDDOUBLEPRIME = 3631000.d0
+  R220 = 6161000.d0
+  R771 = 5611000.d0
+  ! RMIDDLE_CRUST used only for high resolution FFSW1C model, with 3 elements crust simulations
+  ! mid_crust = 10 km
+  RMIDDLE_CRUST = 6361000.d0
+  R80 = 6291000.d0
+
+  ! model 1066A has no oceans, therefore we use the radius of the Earth instead
+  ROCEAN = R_EARTH
+
+  RHO_TOP_OC = 9917.4500 / RHOAV
+  RHO_BOTTOM_OC = 12160.6500 / RHOAV
+
+  end subroutine get_reference_1d_model_radii
+
+!-------------------
+
+  subroutine reference_1d_model_adjust_time_step(DT)
+
+  double precision DT
+
+  DT = DT*0.20d0
+
+  end subroutine reference_1d_model_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-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -48,56 +48,6 @@
 
 !-------------------
 
-  subroutine get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
-     R80,R120,R220,R400,R600,R670,R771, &
-     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
-
-  implicit none
-
-  include "constants.h"
-
-  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
-       R80,R120,R220,R400,R600,R670,R771, &
-       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
-
-  ! our implementation of AK135 has not been checked carefully yet
-  ! therefore let us doublecheck it carefully one day
-
-  ! values below corrected by Ying Zhou <yingz at gps.caltech.edu>
-
-  ! AK135 without the 300 meters of mud layer
-  ROCEAN = 6368000.d0
-  RMIDDLE_CRUST = 6361000.d0
-  RMOHO  = 6353000.d0
-  R80    = 6291000.d0
-  R220   = 6161000.d0
-  R400   = 5961000.d0
-  R670   = 5711000.d0
-  RTOPDDOUBLEPRIME = 3631000.d0
-  RCMB   = 3479500.d0
-  RICB   = 1217500.d0
-
-  ! values for AK135 that are not discontinuities
-  R600 = 5771000.d0
-  R771 = 5611000.d0
-
-  RHO_TOP_OC = 9914.5000 / RHOAV
-  RHO_BOTTOM_OC = 12139.1000 / RHOAV
-
-  end subroutine get_reference_1d_model_radii
-
-!-------------------
-
-  subroutine reference_1d_model_adjust_time_step(DT)
-
-  double precision DT
-
-  ! no-op
-
-  end subroutine reference_1d_model_adjust_time_step
-
-!-------------------
-
   subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
 
   double precision x,vp,vp0,vs,vs0,rho,rho0

Added: 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	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ak135/model_ak135.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,74 @@
+!=====================================================================
+!
+!          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 get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
+     R80,R120,R220,R400,R600,R670,R771, &
+     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
+
+  implicit none
+
+  include "constants.h"
+
+  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
+       R80,R120,R220,R400,R600,R670,R771, &
+       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
+
+  ! our implementation of AK135 has not been checked carefully yet
+  ! therefore let us doublecheck it carefully one day
+
+  ! values below corrected by Ying Zhou <yingz at gps.caltech.edu>
+
+  ! AK135 without the 300 meters of mud layer
+  ROCEAN = 6368000.d0
+  RMIDDLE_CRUST = 6361000.d0
+  RMOHO  = 6353000.d0
+  R80    = 6291000.d0
+  R220   = 6161000.d0
+  R400   = 5961000.d0
+  R670   = 5711000.d0
+  RTOPDDOUBLEPRIME = 3631000.d0
+  RCMB   = 3479500.d0
+  RICB   = 1217500.d0
+
+  ! values for AK135 that are not discontinuities
+  R600 = 5771000.d0
+  R771 = 5611000.d0
+
+  RHO_TOP_OC = 9914.5000 / RHOAV
+  RHO_BOTTOM_OC = 12139.1000 / RHOAV
+
+  end subroutine get_reference_1d_model_radii
+
+!-------------------
+
+  subroutine reference_1d_model_adjust_time_step(DT)
+
+  double precision DT
+
+  ! no-op
+
+  end subroutine reference_1d_model_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-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -25,30 +25,6 @@
 !
 !=====================================================================
 
-subroutine get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
-     R80,R120,R220,R400,R600,R670,R771, &
-     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
-
-  implicit none
-
-  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
-       R80,R120,R220,R400,R600,R670,R771, &
-       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
-
-  ! Define radii here.
-
-end subroutine get_reference_1d_model_radii
-
-
-subroutine reference_1d_model_adjust_time_step(DT)
-
-  double precision DT
-
-  ! If necessary, adjust time step here.
-
-end subroutine reference_1d_model_adjust_time_step
-
-
 subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
 
   implicit none

Added: 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	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/blank/my_1D_ref_model.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,49 @@
+!=====================================================================
+!
+!          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 get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
+     R80,R120,R220,R400,R600,R670,R771, &
+     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
+
+  implicit none
+
+  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
+       R80,R120,R220,R400,R600,R670,R771, &
+       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
+
+  ! Define radii here.
+
+end subroutine get_reference_1d_model_radii
+
+
+subroutine reference_1d_model_adjust_time_step(DT)
+
+  double precision DT
+
+  ! If necessary, adjust time step here.
+
+end subroutine reference_1d_model_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-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -25,52 +25,7 @@
 !
 !=====================================================================
 
-  subroutine get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
-     R80,R120,R220,R400,R600,R670,R771, &
-     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
 
-  implicit none
-
-  include "constants.h"
-
-  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
-       R80,R120,R220,R400,R600,R670,R771, &
-       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
-
-  ! IASP91
-  ROCEAN = 6371000.d0
-  RMIDDLE_CRUST = 6351000.d0
-  RMOHO = 6336000.d0
-  R80  = 6291000.d0
-  R120 = 6251000.d0
-  R220 = 6161000.d0
-  R400 = 5961000.d0
-  ! there is no d600 discontinuity in IASP91 therefore this value is useless
-  ! but it needs to be there for compatibility with other subroutines
-  R600 = R_EARTH - 600000.d0
-  R670 = 5711000.d0
-  R771 = 5611000.d0
-  RTOPDDOUBLEPRIME = 3631000.d0
-  RCMB = 3482000.d0
-  RICB = 1217000.d0
-
-  RHO_TOP_OC = 9900.2379 / RHOAV
-  RHO_BOTTOM_OC = 12168.6383 / RHOAV
-
-  end subroutine get_reference_1d_model_radii
-
-!-------------------
-
-  subroutine reference_1d_model_adjust_time_step(DT)
-
-  double precision DT
-
-  ! no-op
-
-  end subroutine reference_1d_model_adjust_time_step
-
-!-------------------
-
   subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
 
   implicit none

Added: 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	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/iasp91/model_iasp91.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,71 @@
+!=====================================================================
+!
+!          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 get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
+     R80,R120,R220,R400,R600,R670,R771, &
+     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
+
+  implicit none
+
+  include "constants.h"
+
+  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
+       R80,R120,R220,R400,R600,R670,R771, &
+       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
+
+  ! IASP91
+  ROCEAN = 6371000.d0
+  RMIDDLE_CRUST = 6351000.d0
+  RMOHO = 6336000.d0
+  R80  = 6291000.d0
+  R120 = 6251000.d0
+  R220 = 6161000.d0
+  R400 = 5961000.d0
+  ! there is no d600 discontinuity in IASP91 therefore this value is useless
+  ! but it needs to be there for compatibility with other subroutines
+  R600 = R_EARTH - 600000.d0
+  R670 = 5711000.d0
+  R771 = 5611000.d0
+  RTOPDDOUBLEPRIME = 3631000.d0
+  RCMB = 3482000.d0
+  RICB = 1217000.d0
+
+  RHO_TOP_OC = 9900.2379 / RHOAV
+  RHO_BOTTOM_OC = 12168.6383 / RHOAV
+
+  end subroutine get_reference_1d_model_radii
+
+!-------------------
+
+  subroutine reference_1d_model_adjust_time_step(DT)
+
+  double precision DT
+
+  ! no-op
+
+  end subroutine reference_1d_model_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-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -25,53 +25,7 @@
 !
 !=====================================================================
 
-  subroutine get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
-     R80,R120,R220,R400,R600,R670,R771, &
-     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
 
-  implicit none
-
-  include "constants.h"
-
-  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
-       R80,R120,R220,R400,R600,R670,R771, &
-       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
-
-  ! PREM
-  ROCEAN = 6368000.d0
-  RMIDDLE_CRUST = 6356000.d0
-  RMOHO = 6346600.d0
-  R80  = 6291000.d0
-  R220 = 6151000.d0
-  R400 = 5971000.d0
-  R600 = 5771000.d0
-  R670 = 5701000.d0
-  R771 = 5600000.d0
-  RTOPDDOUBLEPRIME = 3630000.d0
-  RCMB = 3480000.d0
-  RICB = 1221000.d0
-
-  RHO_TOP_OC = 9903.4384 / RHOAV
-  RHO_BOTTOM_OC = 12166.5885 / RHOAV
-
-  end subroutine get_reference_1d_model_radii
-
-!
-!=====================================================================
-!
-
-  subroutine reference_1d_model_adjust_time_step(DT)
-
-  double precision DT
-
-  ! no-op
-
-  end subroutine reference_1d_model_adjust_time_step
-
-!
-!=====================================================================
-!
-
   subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
 
   implicit none

Added: 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	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/prem/model_prem.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,70 @@
+!=====================================================================
+!
+!          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 get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
+     R80,R120,R220,R400,R600,R670,R771, &
+     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
+
+  implicit none
+
+  include "constants.h"
+
+  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
+       R80,R120,R220,R400,R600,R670,R771, &
+       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
+
+  ! PREM
+  ROCEAN = 6368000.d0
+  RMIDDLE_CRUST = 6356000.d0
+  RMOHO = 6346600.d0
+  R80  = 6291000.d0
+  R220 = 6151000.d0
+  R400 = 5971000.d0
+  R600 = 5771000.d0
+  R670 = 5701000.d0
+  R771 = 5600000.d0
+  RTOPDDOUBLEPRIME = 3630000.d0
+  RCMB = 3480000.d0
+  RICB = 1221000.d0
+
+  RHO_TOP_OC = 9903.4384 / RHOAV
+  RHO_BOTTOM_OC = 12166.5885 / RHOAV
+
+  end subroutine get_reference_1d_model_radii
+
+!
+!=====================================================================
+!
+
+  subroutine reference_1d_model_adjust_time_step(DT)
+
+  double precision DT
+
+  ! no-op
+
+  end subroutine reference_1d_model_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-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -51,49 +51,6 @@
 
 !-------------------
 
-  subroutine get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
-     R80,R120,R220,R400,R600,R670,R771, &
-     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
-
-  implicit none
-
-  include "constants.h"
-
-  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
-       R80,R120,R220,R400,R600,R670,R771, &
-       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
-
-  ! REF
-  ROCEAN = 6368000.d0
-  RMIDDLE_CRUST = 6356000.d0
-  RMOHO = 6346600.d0
-  R80  = 6291000.d0
-  R220 = 6151000.d0
-  R400 = 5961000.d0
-  R600 = 5771000.d0
-  R670 = 5721000.d0
-  R771 = 5600000.d0
-  RTOPDDOUBLEPRIME = 3630000.d0
-  RCMB = 3479958.d0
-  RICB = 1221491.d0
-
-  RHO_TOP_OC = 9903.48 / RHOAV
-  RHO_BOTTOM_OC = 12166.35 / RHOAV
-
-  end subroutine get_reference_1d_model_radii
-
-!-------------------
-
-  subroutine reference_1d_model_adjust_time_step(DT)
-
-  double precision DT
-
-  ! no-op
-
-  end subroutine reference_1d_model_adjust_time_step
-
-!-------------------
-
   subroutine reference_1d_model_aniso_inner_core_model_setup(x,vp,vp0,vs,vs0,rho,rho0)
 
   double precision x,vp,vp0,vs,vs0,rho,rho0

Added: 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	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/1D_ref/ref/model_ref.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,68 @@
+!=====================================================================
+!
+!          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 get_reference_1d_model_radii(ROCEAN,RMIDDLE_CRUST,RMOHO, &
+     R80,R120,R220,R400,R600,R670,R771, &
+     RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC)
+
+  implicit none
+
+  include "constants.h"
+
+  double precision ROCEAN,RMIDDLE_CRUST,RMOHO, &
+       R80,R120,R220,R400,R600,R670,R771, &
+       RTOPDDOUBLEPRIME,RCMB,RICB,RHO_TOP_OC,RHO_BOTTOM_OC
+
+  ! REF
+  ROCEAN = 6368000.d0
+  RMIDDLE_CRUST = 6356000.d0
+  RMOHO = 6346600.d0
+  R80  = 6291000.d0
+  R220 = 6151000.d0
+  R400 = 5961000.d0
+  R600 = 5771000.d0
+  R670 = 5721000.d0
+  R771 = 5600000.d0
+  RTOPDDOUBLEPRIME = 3630000.d0
+  RCMB = 3479958.d0
+  RICB = 1221491.d0
+
+  RHO_TOP_OC = 9903.48 / RHOAV
+  RHO_BOTTOM_OC = 12166.35 / RHOAV
+
+  end subroutine get_reference_1d_model_radii
+
+!-------------------
+
+  subroutine reference_1d_model_adjust_time_step(DT)
+
+  double precision DT
+
+  ! no-op
+
+  end subroutine reference_1d_model_adjust_time_step

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	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -58,33 +58,6 @@
 
 !--------------------------------------------------------------------
 
-  subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .true.
-  ISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .false.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-  end subroutine get_model_properties
-
-!--------------------------------------------------------------------
-
   subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/Montagner/anisotropic_mantle_model.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,52 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .true.
+  ISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .false.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+  end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,61 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  ! Define model properties here.
-
-  ! HONOR_1D_SPHERICAL_MOHO: honor PREM Moho or not: doing so drastically reduces
-  ! the stability condition and therefore the time step, resulting in expensive
-  ! calculations. If not, honor a fictitious Moho at the depth of 40 km
-  ! in order to have even radial sampling from the d220 to the Earth surface.
-  HONOR_1D_SPHERICAL_MOHO = .false.
-
-  ! ONE_CRUST: in order to increase stability and therefore to allow cheaper
-  ! simulations (larger time step), 1D models can be run with just one average crustal
-  ! layer instead of two.
-  ONE_CRUST = .false.
-
-  ! TRANSVERSE_ISOTROPY
-  TRANSVERSE_ISOTROPY = .false.
-
-  ! ISOTROPIC_3D_MANTLE and ANISOTROPIC_3D_MANTLE: Set exactly one of
-  ! these two flags for 3D models.  If you set ISOTROPIC_3D_MANTLE,
-  ! the subroutine 'iso_mantle_model' will be called; if you set
-  ! ANISOTROPIC_3D_MANTLE instead, the subroutine 'aniso_mantle_model'
-  ! will be called.
-  ISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_3D_MANTLE = .false.
-
-  ! ANISOTROPIC_INNER_CORE
-  ANISOTROPIC_INNER_CORE = .false.
-
-  ! CRUSTAL
-  CRUSTAL = .false.
-
-  ! CASE_3D: this flag allows the stretching of the elements in the crustal
-  ! layers in the case of 3D models. The purpose of this stretching is to squeeze more
-  ! GLL points per km in the upper part of the crust than in the lower part.
-  CASE_3D = .false.
-
-  ! ATTENUATION_3D
-  ATTENUATION_3D = .false.
-
-end subroutine get_model_properties
-
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank/my_mantle_model.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,81 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  ! Define model properties here.
+
+  ! HONOR_1D_SPHERICAL_MOHO: honor PREM Moho or not: doing so drastically reduces
+  ! the stability condition and therefore the time step, resulting in expensive
+  ! calculations. If not, honor a fictitious Moho at the depth of 40 km
+  ! in order to have even radial sampling from the d220 to the Earth surface.
+  HONOR_1D_SPHERICAL_MOHO = .false.
+
+  ! ONE_CRUST: in order to increase stability and therefore to allow cheaper
+  ! simulations (larger time step), 1D models can be run with just one average crustal
+  ! layer instead of two.
+  ONE_CRUST = .false.
+
+  ! TRANSVERSE_ISOTROPY
+  TRANSVERSE_ISOTROPY = .false.
+
+  ! ISOTROPIC_3D_MANTLE and ANISOTROPIC_3D_MANTLE: Set exactly one of
+  ! these two flags for 3D models.  If you set ISOTROPIC_3D_MANTLE,
+  ! the subroutine 'iso_mantle_model' will be called; if you set
+  ! ANISOTROPIC_3D_MANTLE instead, the subroutine 'aniso_mantle_model'
+  ! will be called.
+  ISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_3D_MANTLE = .false.
+
+  ! ANISOTROPIC_INNER_CORE
+  ANISOTROPIC_INNER_CORE = .false.
+
+  ! CRUSTAL
+  CRUSTAL = .false.
+
+  ! CASE_3D: this flag allows the stretching of the elements in the crustal
+  ! layers in the case of 3D models. The purpose of this stretching is to squeeze more
+  ! GLL points per km in the upper part of the crust than in the lower part.
+  CASE_3D = .false.
+
+  ! ATTENUATION_3D
+  ATTENUATION_3D = .false.
+
+end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,61 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  ! Define model properties here.
-
-  ! HONOR_1D_SPHERICAL_MOHO: honor PREM Moho or not: doing so drastically reduces
-  ! the stability condition and therefore the time step, resulting in expensive
-  ! calculations. If not, honor a fictitious Moho at the depth of 40 km
-  ! in order to have even radial sampling from the d220 to the Earth surface.
-  HONOR_1D_SPHERICAL_MOHO = .false.
-
-  ! ONE_CRUST: in order to increase stability and therefore to allow cheaper
-  ! simulations (larger time step), 1D models can be run with just one average crustal
-  ! layer instead of two.
-  ONE_CRUST = .false.
-
-  ! TRANSVERSE_ISOTROPY
-  TRANSVERSE_ISOTROPY = .false.
-
-  ! ISOTROPIC_3D_MANTLE and ANISOTROPIC_3D_MANTLE: Set exactly one of
-  ! these two flags for 3D models.  If you set ISOTROPIC_3D_MANTLE,
-  ! the subroutine 'iso_mantle_model' will be called; if you set
-  ! ANISOTROPIC_3D_MANTLE instead, the subroutine 'aniso_mantle_model'
-  ! will be called.
-  ISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_3D_MANTLE = .false.
-
-  ! ANISOTROPIC_INNER_CORE
-  ANISOTROPIC_INNER_CORE = .false.
-
-  ! CRUSTAL
-  CRUSTAL = .false.
-
-  ! CASE_3D: this flag allows the stretching of the elements in the crustal
-  ! layers in the case of 3D models. The purpose of this stretching is to squeeze more
-  ! GLL points per km in the upper part of the crust than in the lower part.
-  CASE_3D = .false.
-
-  ! ATTENUATION_3D
-  ATTENUATION_3D = .false.
-
-end subroutine get_model_properties
-
-
 subroutine aniso_mantle_model(r,theta,phi,rho, &
      c11,c12,c13,c14,c15,c16,c22,c23,c24,c25,c26,c33,c34,c35,c36,c44,c45,c46,c55,c56,c66)
 

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/blank-c/fortran_stuff.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,81 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  ! Define model properties here.
+
+  ! HONOR_1D_SPHERICAL_MOHO: honor PREM Moho or not: doing so drastically reduces
+  ! the stability condition and therefore the time step, resulting in expensive
+  ! calculations. If not, honor a fictitious Moho at the depth of 40 km
+  ! in order to have even radial sampling from the d220 to the Earth surface.
+  HONOR_1D_SPHERICAL_MOHO = .false.
+
+  ! ONE_CRUST: in order to increase stability and therefore to allow cheaper
+  ! simulations (larger time step), 1D models can be run with just one average crustal
+  ! layer instead of two.
+  ONE_CRUST = .false.
+
+  ! TRANSVERSE_ISOTROPY
+  TRANSVERSE_ISOTROPY = .false.
+
+  ! ISOTROPIC_3D_MANTLE and ANISOTROPIC_3D_MANTLE: Set exactly one of
+  ! these two flags for 3D models.  If you set ISOTROPIC_3D_MANTLE,
+  ! the subroutine 'iso_mantle_model' will be called; if you set
+  ! ANISOTROPIC_3D_MANTLE instead, the subroutine 'aniso_mantle_model'
+  ! will be called.
+  ISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_3D_MANTLE = .false.
+
+  ! ANISOTROPIC_INNER_CORE
+  ANISOTROPIC_INNER_CORE = .false.
+
+  ! CRUSTAL
+  CRUSTAL = .false.
+
+  ! CASE_3D: this flag allows the stretching of the elements in the crustal
+  ! layers in the case of 3D models. The purpose of this stretching is to squeeze more
+  ! GLL points per km in the upper part of the crust than in the lower part.
+  CASE_3D = .false.
+
+  ! ATTENUATION_3D
+  ATTENUATION_3D = .false.
+
+end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -28,38 +28,6 @@
 
 !---------------------------
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  HONOR_1D_SPHERICAL_MOHO = .false.
-  ONE_CRUST = .true.
-
-  TRANSVERSE_ISOTROPY = .true.
-
-  ISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-
-  CRUSTAL = .false.
-  CASE_3D = .false.
-
-  ATTENUATION_3D = .false.
-
-end subroutine get_model_properties
-
-!---------------------------
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,57 @@
+!=====================================================================
+!
+!          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 Softwait Foundation, Inc.,
+! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+!
+!=====================================================================
+
+
+subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  HONOR_1D_SPHERICAL_MOHO = .false.
+  ONE_CRUST = .true.
+
+  TRANSVERSE_ISOTROPY = .true.
+
+  ISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+
+  CRUSTAL = .false.
+  CASE_3D = .false.
+
+  ATTENUATION_3D = .false.
+
+end subroutine get_model_properties

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	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -48,33 +48,6 @@
 
 !---------------------------
 
-  subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .true.
-  ISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .true.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-  end subroutine get_model_properties
-
-!---------------------------
-
   subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s20rts/mantle_model.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,51 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .true.
+  ISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .true.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+  end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,32 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .true.
-  ISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .true.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-end subroutine get_model_properties
-
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s29ea/s29ea.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,52 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .true.
+  ISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .true.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,32 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .true.
-  ISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .true.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-end subroutine get_model_properties
-
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani/s362ani.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,52 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .true.
+  ISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .true.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+end subroutine get_model_properties

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	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,32 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .true.
-  ISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .true.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-end subroutine get_model_properties
-
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362ani_prem/s362ani_prem.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,52 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .true.
+  ISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .true.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,32 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .false.
-  ISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .true.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-end subroutine get_model_properties
-
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362iso/s362iso.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,52 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .false.
+  ISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .true.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,32 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .true.
-  ISOTROPIC_3D_MANTLE = .true.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .true.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-end subroutine get_model_properties
-
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/s362wmani/s362wmani.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,52 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .true.
+  ISOTROPIC_3D_MANTLE = .true.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .true.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.f90	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -26,32 +26,6 @@
 !=====================================================================
 
 
-subroutine get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
-     TRANSVERSE_ISOTROPY, &
-     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
-     CRUSTAL,CASE_3D, &
-     ATTENUATION_3D)
-
-  implicit none
-
-  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
-       TRANSVERSE_ISOTROPY,&
-       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
-       CRUSTAL,CASE_3D,&
-       ATTENUATION_3D
-
-  TRANSVERSE_ISOTROPY = .true.
-  ISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_3D_MANTLE = .false.
-  ANISOTROPIC_INNER_CORE = .false.
-  CRUSTAL = .true.
-  ATTENUATION_3D = .false.
-  ONE_CRUST = .true.
-  CASE_3D = .true.
-
-end subroutine get_model_properties
-
-
 subroutine read_3d_mantle_model()
 
   implicit none

Added: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.serial.f90	                        (rev 0)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/prem_plus_crust.serial.f90	2009-02-27 00:59:07 UTC (rev 14162)
@@ -0,0 +1,52 @@
+!=====================================================================
+!
+!          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 get_model_properties(HONOR_1D_SPHERICAL_MOHO,ONE_CRUST, &
+     TRANSVERSE_ISOTROPY, &
+     ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE, &
+     CRUSTAL,CASE_3D, &
+     ATTENUATION_3D)
+
+  implicit none
+
+  logical HONOR_1D_SPHERICAL_MOHO,ONE_CRUST,&
+       TRANSVERSE_ISOTROPY,&
+       ISOTROPIC_3D_MANTLE,ANISOTROPIC_3D_MANTLE,ANISOTROPIC_INNER_CORE,&
+       CRUSTAL,CASE_3D,&
+       ATTENUATION_3D
+
+  TRANSVERSE_ISOTROPY = .true.
+  ISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_3D_MANTLE = .false.
+  ANISOTROPIC_INNER_CORE = .false.
+  CRUSTAL = .true.
+  ATTENUATION_3D = .false.
+  ONE_CRUST = .true.
+  CASE_3D = .true.
+
+end subroutine get_model_properties

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/Makefile.in	2009-02-27 00:59:07 UTC (rev 14162)
@@ -221,7 +221,7 @@
 	${MPIFCCOMPILE_NO_CHECK} -o xspecfem3D $(XSPECFEM_OBJECTS) $(MPILIBS)
 
 
-SERIAL_LIBS = $(model_OBJECTS) $O/exit_mpi_dummy.o $(LIBSPECFEM)
+SERIAL_LIBS = $(model_SERIAL_OBJECTS) $(LIBSPECFEM)
 
 xconvolve_source_timefunction: $O/convolve_source_timefunction.o
 	${FCCOMPILE_CHECK} -o xconvolve_source_timefunction $O/convolve_source_timefunction.o
@@ -360,9 +360,6 @@
 $O/exit_mpi.o: constants.h $S/exit_mpi.f90
 	${MPIFCCOMPILE_CHECK} -c -o $O/exit_mpi.o ${FCFLAGS_f90} $S/exit_mpi.f90
 
-$O/exit_mpi_dummy.o: constants.h $S/MODELS/harness/lib/chino/exit_mpi.f90
-	${FCCOMPILE_CHECK} -c -o $O/exit_mpi_dummy.o ${FCFLAGS_f90} $S/MODELS/harness/lib/chino/exit_mpi.f90
-
 $O/count_number_of_sources.o: constants.h $S/count_number_of_sources.f90
 	${FCCOMPILE_CHECK} -c -o $O/count_number_of_sources.o ${FCFLAGS_f90} $S/count_number_of_sources.f90
 

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/prepare-model.py
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/prepare-model.py	2009-02-26 20:44:59 UTC (rev 14161)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/prepare-model.py	2009-02-27 00:59:07 UTC (rev 14162)
@@ -18,6 +18,8 @@
         path = "model"
 
         directories = []
+        serialFortranSourceFiles = []
+        serialCSourceFiles = []
         fortranSourceFiles = []
         cSourceFiles = []
 
@@ -33,9 +35,15 @@
             elif tarinfo.name.endswith(".f90") or tarinfo.name.endswith(".c"):
                 pathname = os.path.join(path, tarinfo.name)
                 if tarinfo.name.endswith(".f90"):
-                    fortranSourceFiles.append(pathname)
+                    if tarinfo.name.endswith(".serial.f90"):
+                        serialFortranSourceFiles.append(pathname)
+                    else:
+                        fortranSourceFiles.append(pathname)
                 else:
-                    cSourceFiles.append(pathname)
+                    if tarinfo.name.endswith(".serial.c"):
+                        serialCSourceFiles.append(pathname)
+                    else:
+                        cSourceFiles.append(pathname)
                 thisDir = dirname(tarinfo.name) # see bcast_model.c
                 s = tgz.extractfile(tarinfo)
                 f = open(pathname, "w")
@@ -63,12 +71,29 @@
         # Generate the make include file.
         s = open("model.mk", "w")
         print >>s
+        print >>s, "model_SERIAL_OBJECTS = \\"
+        for sourceFile in chain(serialFortranSourceFiles, serialCSourceFiles):
+            base = splitext(basename(sourceFile))[0]
+            print >>s, "\t$O/%s.o \\" % base
+        print >>s, "\t$(empty)"
+        print >>s
         print >>s, "model_OBJECTS = \\"
         for sourceFile in chain(fortranSourceFiles, cSourceFiles):
             base = splitext(basename(sourceFile))[0]
             print >>s, "\t$O/%s.o \\" % base
+        print >>s, "\t$(model_SERIAL_OBJECTS) \\"
         print >>s, "\t$(empty)"
         print >>s
+        for sourceFile in serialFortranSourceFiles:
+            base = splitext(basename(sourceFile))[0]
+            print >>s, "$O/%s.o: constants.h %s" % (base, sourceFile)
+            print >>s, "\t${FCCOMPILE_CHECK} -c -o $O/%s.o ${FCFLAGS_f90} %s" % (base, sourceFile)
+            print >>s
+        for sourceFile in serialCSourceFiles:
+            base = splitext(basename(sourceFile))[0]
+            print >>s, "$O/%s.o: config.h %s" % (base, sourceFile)
+            print >>s, "\t$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $O/%s.o %s" % (base, sourceFile)
+            print >>s
         for sourceFile in fortranSourceFiles:
             base = splitext(basename(sourceFile))[0]
             print >>s, "$O/%s.o: constants.h %s" % (base, sourceFile)



More information about the CIG-COMMITS mailing list