[cig-commits] [commit] devel, master: got rid of MAXIMUM_HEIGHT_TOPO and MAXIMUM_DEPTH_BATHY, which had become useless (412b039)

[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 412b03982d9bf9596bd019e2f08f7f8162332313
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Mon May 19 03:43:50 2014 +0200

    got rid of MAXIMUM_HEIGHT_TOPO and MAXIMUM_DEPTH_BATHY, which had become useless


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

412b03982d9bf9596bd019e2f08f7f8162332313
 setup/constants.h.in            |  9 +--------
 src/shared/model_topo_bathy.f90 | 21 ---------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/setup/constants.h.in b/setup/constants.h.in
index 887920a..4e08472 100644
--- a/setup/constants.h.in
+++ b/setup/constants.h.in
@@ -166,15 +166,8 @@
   integer, parameter :: TOPO_MINIMUM = - 11200 ! (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
-  logical, parameter :: USE_MAXIMUM_HEIGHT_TOPO = .false.
-  integer, parameter :: MAXIMUM_HEIGHT_TOPO = +20000
-  logical, parameter :: USE_MAXIMUM_DEPTH_OCEANS = .false.
-  integer, parameter :: MAXIMUM_DEPTH_OCEANS = -20000
-
 ! minimum thickness in meters to include the effect of the oceans and topo
-  double precision, parameter :: MINIMUM_THICKNESS_3D_OCEANS = 100.d0
+  double precision, parameter :: MINIMUM_THICKNESS_3D_OCEANS = 50.d0
 
 
 !!-----------------------------------------------------------
diff --git a/src/shared/model_topo_bathy.f90 b/src/shared/model_topo_bathy.f90
index 873f720..991fab8 100644
--- a/src/shared/model_topo_bathy.f90
+++ b/src/shared/model_topo_bathy.f90
@@ -123,27 +123,6 @@
   enddo
   close(13)
 
-  ! note: we check the limits after reading in the data. this seems to perform slightly faster
-  !          however, reading ETOPO1.xyz will take ~ 2m 1.2s for a single process
-
-  ! imposes limits
-  if( USE_MAXIMUM_HEIGHT_TOPO .or. USE_MAXIMUM_DEPTH_OCEANS ) then
-    do itopo_y=1,NY_BATHY
-      do itopo_x=1,NX_BATHY
-
-        ! impose maximum height of mountains, to suppress oscillations in Himalaya etc.
-        if(USE_MAXIMUM_HEIGHT_TOPO .and. ibathy_topo(itopo_x,itopo_y) > MAXIMUM_HEIGHT_TOPO) &
-          ibathy_topo(itopo_x,itopo_y) = MAXIMUM_HEIGHT_TOPO
-
-        ! impose maximum depth of oceans, to suppress oscillations near deep trenches
-        if(USE_MAXIMUM_DEPTH_OCEANS .and. ibathy_topo(itopo_x,itopo_y) < MAXIMUM_DEPTH_OCEANS) &
-          ibathy_topo(itopo_x,itopo_y) = MAXIMUM_DEPTH_OCEANS
-
-      enddo
-    enddo
-
-  endif
-
   ! user output
   write(IMAIN,*) "  topography/bathymetry: min/max = ",minval(ibathy_topo),maxval(ibathy_topo)