[cig-commits] [commit] devel, master: better TOPO_MINIMUM and TOPO_MAXIMUM (5997858)

[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 5997858a6f6bcc1dd2886d9a75ca653b8481aad9
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Wed May 7 17:23:29 2014 +0200

    better TOPO_MINIMUM and TOPO_MAXIMUM


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

5997858a6f6bcc1dd2886d9a75ca653b8481aad9
 setup/constants.h.in            | 8 +++++++-
 src/shared/model_topo_bathy.f90 | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/setup/constants.h.in b/setup/constants.h.in
index 164fe1b..84affc8 100644
--- a/setup/constants.h.in
+++ b/setup/constants.h.in
@@ -159,7 +159,13 @@
   double precision, parameter :: ONE_MINUS_F_SQUARED = (1.d0 - FLATTENING_F)**2
 
 ! Use GLL points to capture TOPOGRAPHY and ELLIPTICITY (experimental feature, currently does not work, DO NOT USE)
-  logical,parameter :: USE_GLL = .false.
+  logical, parameter :: USE_GLL = .false.
+
+! the code will print an error message and stop if it finds that the topography input file
+! contains values outside this range.
+! we take a safety margin just in case of a smoothed or modified model, which can locally create slightly different values
+  integer, parameter :: TOPO_MINIMUM = - 11500 ! (max depth in m, Mariana trench)
+  integer, parameter :: TOPO_MAXIMUM = + 9000 ! (height in m, Mount Everest)
 
 ! maximum depth of the oceans in trenches and height of topo in mountains
 ! to avoid taking into account spurious oscillations in global model ETOPO
diff --git a/src/shared/model_topo_bathy.f90 b/src/shared/model_topo_bathy.f90
index d13ec54..873f720 100644
--- a/src/shared/model_topo_bathy.f90
+++ b/src/shared/model_topo_bathy.f90
@@ -84,8 +84,6 @@
   integer :: ival
   integer :: itopo_x,itopo_y,ier
   character(len=150) :: topo_bathy_file
-  integer,parameter :: TOPO_MINIMUM = - 10000 ! (depth in m )
-  integer,parameter :: TOPO_MAXIMUM = + 10000 ! (height in m )
 
   call get_value_string(topo_bathy_file, 'model.topoBathy.PATHNAME_TOPO_FILE', PATHNAME_TOPO_FILE)