[cig-commits] [commit] devel, master: done cleaning and adding all the topography files, in particular adding ETOPO1 (2614dd9)

[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 2614dd90f902f8562aa191498782879c16989272
Author: Dimitri Komatitsch <see_my_GitHub_web_page>
Date:   Sat May 10 03:50:55 2014 +0200

    done cleaning and adding all the topography files, in particular adding ETOPO1


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

2614dd90f902f8562aa191498782879c16989272
 DATA                 |  2 +-
 setup/constants.h.in | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/DATA b/DATA
index 79f6749..9c90892 160000
--- a/DATA
+++ b/DATA
@@ -1 +1 @@
-Subproject commit 79f67499b8fb5708a38606cddcc0868a8a2a0e1e
+Subproject commit 9c9089262155dbdaf837c83d10e5d531f58e7da9
diff --git a/setup/constants.h.in b/setup/constants.h.in
index 5deff49..b6dd72a 100644
--- a/setup/constants.h.in
+++ b/setup/constants.h.in
@@ -101,30 +101,37 @@
 !!-----------------------------------------------------------
 !! (uncomment desired resolution)
 
-!! DK DK for Roland_Sylvain this below could be changed if needed (i.e. using a non-smoothed version for instance)
-!---  ETOPO4 4-minute model created by subsampling and smoothing etopo-2
+!---  ETOPO4 4-minute model
 ! size of topography and bathymetry file
   integer, parameter :: NX_BATHY = 5400,NY_BATHY = 2700
 ! resolution of topography file in minutes
   integer, parameter :: RESOLUTION_TOPO_FILE = 4
 ! pathname of the topography file
+! character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/topo_bathy_etopo4_from_etopo2_subsampled.dat'
   character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/topo_bathy_etopo4_smoothed_window_7.dat'
 
-!!--- ETOPO2 2-minute model, not implemented yet
-!! size of topography and bathymetry file
-!  integer, parameter :: NX_BATHY = 10800,NY_BATHY = 5400
-!! resolution of topography file in minutes
-!  integer, parameter :: RESOLUTION_TOPO_FILE = 2
-!! pathname of the topography file
-!  character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/topo_bathy_etopo2_smoothed_window7.dat'
-
-!!--- ETOPO1 1-minute model, implemented now, but data file must be created first
-!! size of topography and bathymetry file
-!  integer, parameter :: NX_BATHY = 21600,NY_BATHY = 10800
-!! resolution of topography file in minutes
-!  integer, parameter :: RESOLUTION_TOPO_FILE = 1
-!! pathname of the topography file (un-smoothed)
-!  character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/ETOPO1.xyz'
+!--- ETOPO2 2-minute model
+! size of topography and bathymetry file
+! integer, parameter :: NX_BATHY = 10800,NY_BATHY = 5400
+! resolution of topography file in minutes
+! integer, parameter :: RESOLUTION_TOPO_FILE = 2
+! pathname of the topography file
+! character (len=*), parameter :: PATHNAME_TOPO_FILE = &
+!                      'DATA/topo_bathy/topo_bathy_etopo1_ice_c_resampled_at_2minutes_original_unmodified_unsmoothed.dat'
+! character (len=*), parameter :: PATHNAME_TOPO_FILE = &
+!                      'DATA/topo_bathy/topo_bathy_etopo1_ice_c_resampled_at_2minutes_smoothed_window_3.dat'
+! character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/topo_bathy_etopo2v2c_original_unmodified_unsmoothed.dat'
+! character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/topo_bathy_etopo2v2c_smoothed_window_3.dat'
+
+!--- ETOPO1 1-minute model
+! size of topography and bathymetry file
+! integer, parameter :: NX_BATHY = 21600,NY_BATHY = 10800
+! resolution of topography file in minutes
+! integer, parameter :: RESOLUTION_TOPO_FILE = 1
+! pathname of the topography file
+! character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/topo_bathy_etopo1_ice_c_original_unmodified_unsmoothed.dat'
+! character (len=*), parameter :: PATHNAME_TOPO_FILE = 'DATA/topo_bathy/topo_bathy_etopo1_ice_c_smoothed_window_3.dat'
+
 
 ! For the reference ellipsoid to convert geographic latitudes to geocentric:
 !