[cig-commits] [commit] pluggable: Updated the code to use downloaded 3D earth models. Added symlinks to 1D ref models. Wrote a makefile which creates the predefined models. (3524a85)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d_globe

On branch  : pluggable
Link       : https://github.com/geodynamics/specfem3d_globe/compare/64e1b38f0c5ebb4056cce0b15d41c0b9f94ab6e5...099a4d330d5b173b21e51ad441f9f429e5d37842

>---------------------------------------------------------------

commit 3524a85c60a9d93d8efe0f8c305a8840350fd228
Author: Leif Strand <leif at geodynamics.org>
Date:   Wed Nov 19 01:37:01 2008 +0000

    Updated the code to use downloaded 3D earth models.  Added symlinks to
    1D ref models.  Wrote a makefile which creates the predefined models.


>---------------------------------------------------------------

3524a85c60a9d93d8efe0f8c305a8840350fd228
 Makefile.in | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 44f5f2e..b1c6df7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,8 +51,6 @@ RANLIB = ranlib
 O = obj
 S = @srcdir@
 
-model_OBJECTS = $(crustal_model_OBJECTS) $(mantle_model_OBJECTS) $(reference_1d_model_OBJECTS)
-
 libspecfem_a_OBJECTS = \
 	$O/add_missing_nodes.o \
 	$O/add_topography.o \
@@ -183,15 +181,21 @@ bak: backup
 
 include $S/MODELS/crustal/crust2.0/build.mk
 
-include $S/MODELS/3D_mantle/s20rts/build.mk
-#include $S/MODELS/3D_mantle/s362ani/build.mk
-#include $S/MODELS/3D_mantle/s29ea/build.mk
-#include $S/MODELS/3D_mantle/s362ani_prem/build.mk
-#include $S/MODELS/3D_mantle/s362iso/build.mk
-#include $S/MODELS/3D_mantle/s362wmani/build.mk
-#include $S/MODELS/3D_mantle/transversely_isotropic_prem_plus_3D_crust_2.0/build.mk
-#include $S/MODELS/3D_mantle/Montagner/build.mk
-#include $S/MODELS/3D_mantle/none/build.mk
+# This file is generated by 'specfem3D.py'.
+include model.mk
+
+model_OBJECTS += $(crustal_model_OBJECTS)
+
+
+#include $S/MODELS/3D/s20rts/build.mk
+#include $S/MODELS/3D/s362ani/build.mk
+#include $S/MODELS/3D/s29ea/build.mk
+#include $S/MODELS/3D/s362ani_prem/build.mk
+#include $S/MODELS/3D/s362iso/build.mk
+#include $S/MODELS/3D/s362wmani/build.mk
+#include $S/MODELS/3D/transversely_isotropic_prem_plus_3D_crust_2.0/build.mk
+#include $S/MODELS/3D/Montagner/build.mk
+#include $S/MODELS/3D/none/build.mk
 
 # This is determined by the 3D mantle model.
 #include $S/MODELS/1D_ref/prem/build.mk