[cig-commits] [commit] devel, master: Added a preprocessor directive to get_model_parameters to fail out if a CEM model is specified, but configure was run witout CEM (73fec64)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d_globe

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/bc58e579b3b0838a0968725a076f5904845437ca...be63f20cbb6f462104e949894dbe205d2398cd7f

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

commit 73fec645fd8ccdc6c81e2b71c9d9c18ee6e437b1
Author: Michael Afanasiev <michael.afanasiev at erdw.ethz.ch>
Date:   Thu Sep 4 10:36:53 2014 +0200

    Added a preprocessor directive to get_model_parameters to fail out if a CEM model is specified, but configure was run witout CEM


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

73fec645fd8ccdc6c81e2b71c9d9c18ee6e437b1
 src/shared/{get_model_parameters.f90 => get_model_parameters.F90} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/get_model_parameters.f90 b/src/shared/get_model_parameters.F90
similarity index 99%
rename from src/shared/get_model_parameters.f90
rename to src/shared/get_model_parameters.F90
index 987e0e9..52ecbe9 100644
--- a/src/shared/get_model_parameters.f90
+++ b/src/shared/get_model_parameters.F90
@@ -381,6 +381,7 @@
     THREE_D_MODEL = THREE_D_MODEL_S362ANI
     TRANSVERSE_ISOTROPY = .true.
 
+#if defined (CEM)
   else if (MODEL_ROOT == 'CEM_REQUEST') then
     CEM_REQUEST         = .true.
     TRANSVERSE_ISOTROPY = .true.
@@ -388,6 +389,7 @@
   else if (MODEL_ROOT == 'CEM_ACCEPT') then
     CEM_ACCEPT          = .true.
     TRANSVERSE_ISOTROPY = .true.
+#endif
 
   else if (MODEL_ROOT == 'PPM') then
     ! superimposed based on isotropic-prem
@@ -428,7 +430,7 @@
   else
     print*
     print*,'Error model: ',trim(MODEL)
-    stop 'model not implemented yet, edit get_model_parameters.f90 and recompile'
+    stop 'model not implemented yet, edit get_model_parameters.f90, or ensure you have run ./configure correctly, and recompile'
   endif
 
   ! suppress the crustal layers