[cig-commits] r12657 - seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src

[dkomati1 at geodynamics.org]

Author: dkomati1
Date: 2008-08-16 16:40:16 -0700 (Sat, 16 Aug 2008)
New Revision: 12657

Modified:
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90
   seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/topo_bathy.f90
Log:
moved the definition of a maximum of topography and bathymetry to DATA/topo_bathy


Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90	2008-08-16 21:44:53 UTC (rev 12656)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/compute_forces_crust_mantle.f90	2008-08-16 23:40:16 UTC (rev 12657)
@@ -83,7 +83,7 @@
   real(kind=CUSTOM_REAL) one_minus_sum_beta_use,minus_sum_beta
   real(kind=CUSTOM_REAL), dimension(vx, vy, vz, vnspec) :: one_minus_sum_beta
 
-  integer iregion_selected,iregion
+  integer iregion_selected
 
 ! for attenuation
   real(kind=CUSTOM_REAL) R_xx_val,R_yy_val

Modified: seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/topo_bathy.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/topo_bathy.f90	2008-08-16 21:44:53 UTC (rev 12656)
+++ seismo/3D/SPECFEM3D_GLOBE/trunk/version41_beta/src/topo_bathy.f90	2008-08-16 23:40:16 UTC (rev 12657)
@@ -83,23 +83,11 @@
   call get_value_string(topo_bathy_file, 'model.topoBathy.PATHNAME_TOPO_FILE', PATHNAME_TOPO_FILE)
 
   open(unit=13,file=topo_bathy_file,status='old',action='read')
-
   do itopo_y=1,NY_BATHY
     do itopo_x=1,NX_BATHY
-
       read(13,*) ibathy_topo(itopo_x,itopo_y)
-
-! 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
-
   close(13)
 
   end subroutine read_topo_bathy_file