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

[cig_noreply at geodynamics.org]

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

On branches: devel,master
Link       : https://github.com/geodynamics/specfem3d_globe/compare/85a8aa3a48b2cf0d9164893edb252f3fe0f28585...1bc4138645fec5dc69d2dcc94a048c7330439566

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

commit 2a11397c11ebfc2efe9c201997078ba3cd75d4b0
Author: Dimitri Komatitsch <see_my_GitHub_web_page>
Date:   Sat May 10 03:16:43 2014 +0200

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


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

2a11397c11ebfc2efe9c201997078ba3cd75d4b0
 topo_bathy/convert_etopo2_to_specfem_topo_format.csh        |  6 ------
 topo_bathy/convert_etopo_files_to_specfem_topo_format.csh   | 10 ++++++++++
 ...note_use_bunzip2_to_decompress_the_data_files_if_needed} |  0
 topo_bathy/readme_etopo1.txt                                |  2 +-
 topo_bathy/resample_etopo1_ice_c_at_2minutes.csh            |  7 +++++++
 topo_bathy/smooth_topo_bathy_PPM_image.f90                  | 13 +++++++++++--
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/topo_bathy/convert_etopo2_to_specfem_topo_format.csh b/topo_bathy/convert_etopo2_to_specfem_topo_format.csh
deleted file mode 100755
index a59b466..0000000
--- a/topo_bathy/convert_etopo2_to_specfem_topo_format.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/csh
-
-### Dimitri Komatitsch, CNRS Marseille, France, May 2014
-
-grd2xyz -Rg etopo2v2c.grd | awk '{ print $3 }' > topo_bathy_etopo2v2c_original_unmodified_unsmoothed.dat
-
diff --git a/topo_bathy/convert_etopo_files_to_specfem_topo_format.csh b/topo_bathy/convert_etopo_files_to_specfem_topo_format.csh
new file mode 100755
index 0000000..d985fb1
--- /dev/null
+++ b/topo_bathy/convert_etopo_files_to_specfem_topo_format.csh
@@ -0,0 +1,10 @@
+#!/bin/csh
+
+### Dimitri Komatitsch, CNRS Marseille, France, May 2014
+
+grd2xyz -Rg etopo1_ice_c.grd | awk '{ print $3 }' > topo_bathy_etopo1_ice_c_original_unmodified_unsmoothed.dat
+
+grd2xyz -Rg etopo1_ice_c_resampled_at_2minutes.grd | awk '{ print $3 }' > topo_bathy_etopo1_ice_c_resampled_at_2minutes_original_unmodified_unsmoothed.dat
+
+grd2xyz -Rg etopo2v2c.grd | awk '{ print $3 }' > topo_bathy_etopo2v2c_original_unmodified_unsmoothed.dat
+
diff --git a/topo_bathy/note_etopo1_ice_c.grd_is_the_original_unmodified_data_file_from_the_Web b/topo_bathy/note_use_bunzip2_to_decompress_the_data_files_if_needed
similarity index 100%
copy from topo_bathy/note_etopo1_ice_c.grd_is_the_original_unmodified_data_file_from_the_Web
copy to topo_bathy/note_use_bunzip2_to_decompress_the_data_files_if_needed
diff --git a/topo_bathy/readme_etopo1.txt b/topo_bathy/readme_etopo1.txt
index cfd6faa..06327c2 100644
--- a/topo_bathy/readme_etopo1.txt
+++ b/topo_bathy/readme_etopo1.txt
@@ -5,7 +5,7 @@ ETOPO1
 First option:
 
 Raw to Gridded Data:
-    get file etopo1_ice_c_i2.zip from http://www.ngdc.noaa.gov/mgg/global/relief/ETOPO2/ETOPO2v2-2006/ETOPO2v2c/raw_binary/
+    get file etopo1_ice_c_i2.zip from http://www.ngdc.noaa.gov/mgg/global/relief/ETOPO1/data/ice_surface/cell_registered/binary/
     unzip etopo1_ice_c_i2.zip
     xyz2grd etopo1_ice_c_i2.bin -Rd -I1m -Getopo1_ice_c.grd -F -ZTLh -V
     grd2xyz -Rg etopo1_ice_c.grd | awk '{ print $3 }' > topo_bathy_etopo1_ice_c_original_unmodified_unsmoothed.dat
diff --git a/topo_bathy/resample_etopo1_ice_c_at_2minutes.csh b/topo_bathy/resample_etopo1_ice_c_at_2minutes.csh
new file mode 100755
index 0000000..d0ab067
--- /dev/null
+++ b/topo_bathy/resample_etopo1_ice_c_at_2minutes.csh
@@ -0,0 +1,7 @@
+#!/bin/csh
+
+### Dimitri Komatitsch, CNRS Marseille, France, May 2014
+
+# =ns means that we store the output in integer format
+grdsample etopo1_ice_c.grd -Getopo1_ice_c_resampled_at_2minutes.grd=ns -Rd -I2m
+
diff --git a/topo_bathy/smooth_topo_bathy_PPM_image.f90 b/topo_bathy/smooth_topo_bathy_PPM_image.f90
index 18777ce..a3adbe3 100644
--- a/topo_bathy/smooth_topo_bathy_PPM_image.f90
+++ b/topo_bathy/smooth_topo_bathy_PPM_image.f90
@@ -38,7 +38,17 @@
 
   implicit none
 
-  include "../../setup/constants.h"
+!---  ETOPO4 4-minute model created by subsampling and smoothing etopo-2
+! size of topography and bathymetry file
+! integer, parameter :: NX_BATHY = 5400,NY_BATHY = 2700
+
+!--- ETOPO2 2-minute model, not implemented yet
+! size of topography and bathymetry file
+  integer, parameter :: NX_BATHY = 10800,NY_BATHY = 5400
+
+!--- 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
 
 ! filter final surface using box filter
   logical, parameter :: SMOOTH_THE_MODEL = .true.
@@ -57,7 +67,6 @@
 
 ! read the topography file
   print *,'NX_BATHY,NY_BATHY = ',NX_BATHY,NY_BATHY
-  print *,'file used has a resolution of ',RESOLUTION_TOPO_FILE,' minutes'
 
   print *
   print *,'reading topo file'