[cig-commits] [commit] devel, master: replaced the old version of ETOPO with the latest one (etopo2v2c), which fixes several issues, and also added ETOPO1 (etopo1_ice_c) (69b16e7)

[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 69b16e79b6f510bf20a89997a7d9435866c8426a
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Fri May 9 17:19:22 2014 +0200

    replaced the old version of ETOPO with the latest one (etopo2v2c), which fixes several issues, and also added ETOPO1 (etopo1_ice_c)


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

69b16e79b6f510bf20a89997a7d9435866c8426a
 topo_bathy/convert_etopo2_to_specfem_topo_format.csh           |  2 +-
 ...ce_c.grd_is_the_original_unmodified_data_file_from_the_Web} |  0
 ...2v2c.grd_is_the_original_unmodified_data_file_from_the_Web} |  0
 topo_bathy/readme_etopo1.txt                                   | 10 ++++++++++
 topo_bathy/readme_etopo2.txt                                   |  9 +++++----
 topo_bathy/smooth_topo_bathy_PPM_image.f90                     |  4 ++--
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/topo_bathy/convert_etopo2_to_specfem_topo_format.csh b/topo_bathy/convert_etopo2_to_specfem_topo_format.csh
index 51e3b39..a59b466 100755
--- a/topo_bathy/convert_etopo2_to_specfem_topo_format.csh
+++ b/topo_bathy/convert_etopo2_to_specfem_topo_format.csh
@@ -2,5 +2,5 @@
 
 ### Dimitri Komatitsch, CNRS Marseille, France, May 2014
 
-grd2xyz -Rg etopo2.grd | awk '{ print $3 }' > topo_bathy_etopo2_original_unmodified_unsmoothed.dat
+grd2xyz -Rg etopo2v2c.grd | awk '{ print $3 }' > topo_bathy_etopo2v2c_original_unmodified_unsmoothed.dat
 
diff --git a/topo_bathy/note_etopo2.grd_is_the_original_unmodified_data_file_from_the_Web b/topo_bathy/note_etopo1_ice_c.grd_is_the_original_unmodified_data_file_from_the_Web
similarity index 100%
copy from topo_bathy/note_etopo2.grd_is_the_original_unmodified_data_file_from_the_Web
copy to topo_bathy/note_etopo1_ice_c.grd_is_the_original_unmodified_data_file_from_the_Web
diff --git a/topo_bathy/note_etopo2.grd_is_the_original_unmodified_data_file_from_the_Web b/topo_bathy/note_etopo2v2c.grd_is_the_original_unmodified_data_file_from_the_Web
similarity index 100%
rename from topo_bathy/note_etopo2.grd_is_the_original_unmodified_data_file_from_the_Web
rename to topo_bathy/note_etopo2v2c.grd_is_the_original_unmodified_data_file_from_the_Web
diff --git a/topo_bathy/readme_etopo1.txt b/topo_bathy/readme_etopo1.txt
index fdeb560..cfd6faa 100644
--- a/topo_bathy/readme_etopo1.txt
+++ b/topo_bathy/readme_etopo1.txt
@@ -2,6 +2,16 @@
 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/
+    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
+
+
+Second, older option (now obsolete):
 
 1. download the whole world gridfile, ETOPO1 Ice Surface, in (georeferenced) tiff format 
    from this website:
diff --git a/topo_bathy/readme_etopo2.txt b/topo_bathy/readme_etopo2.txt
index 3bc49f0..ad6a240 100644
--- a/topo_bathy/readme_etopo2.txt
+++ b/topo_bathy/readme_etopo2.txt
@@ -8,16 +8,17 @@ GMT:
       This data set is included in the grdraster dataset for ease of plotting
 
 File Format:
-     The raw data is in etopo2.raw
+     The raw data is in ETOPO2v2c_i2_LSB.bin
      The file is a raw header-less binary stored as
      2-byte (16 bit) signed integers
      10800 columns and 5400 rows
 
 
 Raw to Gridded Data:
-    xyz2grd etopo2.raw -R-180/-90/-90/90 -I2m -Getopo2.grd -F -ZTLh -V
-    grd2xyz etopo2.grd -bo > etopo2.xyz
-
+    get file ETOPO2v2c_i2_LSB.zip from http://www.ngdc.noaa.gov/mgg/global/relief/ETOPO2/ETOPO2v2-2006/ETOPO2v2c/raw_binary/
+    unzip ETOPO2v2c_i2_LSB.zip
+    xyz2grd ETOPO2v2c_i2_LSB.bin -Rd -I2m -Getopo2v2c.grd -F -ZTLh -V
+    grd2xyz -Rg etopo2v2c.grd | awk '{ print $3 }' > topo_bathy_etopo2v2c_original_unmodified_unsmoothed.dat
 
 Data Sources:
      For information about where the data originated check out
diff --git a/topo_bathy/smooth_topo_bathy_PPM_image.f90 b/topo_bathy/smooth_topo_bathy_PPM_image.f90
index f0cc700..18777ce 100644
--- a/topo_bathy/smooth_topo_bathy_PPM_image.f90
+++ b/topo_bathy/smooth_topo_bathy_PPM_image.f90
@@ -62,7 +62,7 @@
   print *
   print *,'reading topo file'
 
-  open(unit=13,file='topo_bathy_etopo2_original_unmodified_unsmoothed.dat',status='old')
+  open(unit=13,file='topo_bathy_etopo2v2c_original_unmodified_unsmoothed.dat',status='old')
   do iy=1,NY_BATHY
     do ix=1,NX_BATHY
       read(13,*) ibathy_topo_ori(ix,iy)
@@ -148,7 +148,7 @@
   if(SMOOTH_THE_MODEL) then
     print *
     print *,'saving the smoothed model'
-    open(unit=13,file='topo_bathy_etopo2_smoothed_window_3.dat',status='unknown')
+    open(unit=13,file='topo_bathy_etopo2v2c_smoothed_window_3.dat',status='unknown')
     do iy=1,NY_BATHY
       do ix=1,NX_BATHY
         write(13,*) ibathy_topo(ix,iy)