[cig-commits] [commit] devel, master: deleted topo_bathy/convert_etopo2_bin2ascii_Sun.f90 and topo_bathy/swap_topo_bathy_Sun.f90 and updated the header file of topo_bathy/smooth_topo_bathy_PPM_image.f90 (a2e0657)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Jun 18 16:19:41 PDT 2014


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

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

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

commit a2e0657d3014f9dd62c70a87f1d68c1055ffdd4a
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Fri May 9 00:12:57 2014 +0200

    deleted topo_bathy/convert_etopo2_bin2ascii_Sun.f90 and topo_bathy/swap_topo_bathy_Sun.f90 and updated the header file of topo_bathy/smooth_topo_bathy_PPM_image.f90


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

a2e0657d3014f9dd62c70a87f1d68c1055ffdd4a
 topo_bathy/convert_etopo2_bin2ascii_Sun.f90 | 96 -----------------------------
 topo_bathy/smooth_topo_bathy_PPM_image.f90  | 10 +--
 topo_bathy/swap_topo_bathy_Sun.f90          | 40 ------------
 3 files changed, 6 insertions(+), 140 deletions(-)

diff --git a/topo_bathy/convert_etopo2_bin2ascii_Sun.f90 b/topo_bathy/convert_etopo2_bin2ascii_Sun.f90
deleted file mode 100644
index 6266bb4..0000000
--- a/topo_bathy/convert_etopo2_bin2ascii_Sun.f90
+++ /dev/null
@@ -1,96 +0,0 @@
-!=====================================================================
-!
-!          S p e c f e m 3 D  G l o b e  V e r s i o n  3 . 4
-!          --------------------------------------------------
-!
-!                 Dimitri Komatitsch and Jeroen Tromp
-!    Seismological Laboratory - California Institute of Technology
-!        (c) California Institute of Technology August 2003
-!
-! This program is free software; you can redistribute it and/or modify
-! it under the terms of the GNU General Public License as published by
-! the Free Software Foundation; either version 2 of the License, or
-! (at your option) any later version.
-!
-! This program is distributed in the hope that it will be useful,
-! but WITHOUT ANY WARRANTY; without even the implied warranty of
-! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-! GNU General Public License for more details.
-!
-! You should have received a copy of the GNU General Public License along
-! with this program; if not, write to the Free Software Foundation, Inc.,
-! 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-!
-!=====================================================================
-
-  program convert_etopo2_bin2ascii
-!
-!---- convert etopo-2 raw binary Sun file to ASCII - use on Sun GPS machines at Caltech
-!
-  implicit none
-
-!--- ETOPO2 2-minute model
-! size of topography and bathymetry file
-  integer, parameter :: NX_BATHY = 10800,NY_BATHY = 5400
-
-! use integer array to store values
-  integer(kind=2) ibathy_topo(NX_BATHY,NY_BATHY)
-
-  integer itopo_x,itopo_y
-
-! read the topography file
-  print *,'reading topo file in Sun-Sparc binary format'
-  call read_topo_bathy_bin_etopo2(ibathy_topo)
-
-  print *,'min and max of original topography = ',minval(ibathy_topo),maxval(ibathy_topo)
-
-! save the ASCII file
-!! DK DK beware, longitude blocks MUST be swapped
-  stop 'beware, longitude blocks MUST be swapped, see file swap_topo_bathy_Sun.f90 for details'
-  open(unit=13,file='topo_bathy_etopo2.dat',status='unknown')
-  do itopo_y=1,NY_BATHY
-    do itopo_x=1,NX_BATHY
-      write(13,*) ibathy_topo(itopo_x,itopo_y)
-    enddo
-  enddo
-  close(13)
-
-  print *
-  print *,'can filter white spaces from topo_bathy_etopo2.dat to save space'
-  print *
-
-  end program convert_etopo2_bin2ascii
-
-! -------------------------------------------
-
-  subroutine read_topo_bathy_bin_etopo2(ibathy_topo)
-!
-!---- read topography and bathymetry file once and for all
-!
-  implicit none
-
-!--- ETOPO2 2-minute model
-! size of topography and bathymetry file
-  integer, parameter :: NX_BATHY = 10800,NY_BATHY = 5400
-
-! use integer array to store values
-  integer(kind=2) ibathy_topo(NX_BATHY,NY_BATHY)
-
-  integer iadd1,iel1,icurrent_rec
-
-! this is the path on the Caltech GPS Sun network
-  open(unit=13,file='/home/datalib/Topography/ETOPO-02/etopo2.raw',status='old',access='direct',recl=2)
-
-  icurrent_rec = 1
-
-  do iadd1=1,NY_BATHY
-    do iel1=1,NX_BATHY
-      read(13,rec=icurrent_rec) ibathy_topo(iel1,iadd1)
-      icurrent_rec = icurrent_rec + 1
-    enddo
-  enddo
-
-  close(13)
-
-  end subroutine read_topo_bathy_bin_etopo2
-
diff --git a/topo_bathy/smooth_topo_bathy_PPM_image.f90 b/topo_bathy/smooth_topo_bathy_PPM_image.f90
index 1536afd..6e1ee04 100644
--- a/topo_bathy/smooth_topo_bathy_PPM_image.f90
+++ b/topo_bathy/smooth_topo_bathy_PPM_image.f90
@@ -1,11 +1,13 @@
 !=====================================================================
 !
-!          S p e c f e m 3 D  G l o b e  V e r s i o n  3 . 4
+!          S p e c f e m 3 D  G l o b e  V e r s i o n  6 . 0
 !          --------------------------------------------------
 !
-!                 Dimitri Komatitsch and Jeroen Tromp
-!    Seismological Laboratory - California Institute of Technology
-!        (c) California Institute of Technology August 2003
+!     Main historical authors: Dimitri Komatitsch and Jeroen Tromp
+!                        Princeton University, USA
+!                and CNRS / University of Marseille, France
+!                 (there are currently many more authors!)
+! (c) Princeton University and CNRS / University of Marseille, April 2014
 !
 ! This program is free software; you can redistribute it and/or modify
 ! it under the terms of the GNU General Public License as published by
diff --git a/topo_bathy/swap_topo_bathy_Sun.f90 b/topo_bathy/swap_topo_bathy_Sun.f90
deleted file mode 100644
index d04d386..0000000
--- a/topo_bathy/swap_topo_bathy_Sun.f90
+++ /dev/null
@@ -1,40 +0,0 @@
-
-!---- swap longitude blocks in topography and bathymetry file once and for all
-!---- to switch from the convention used in the original file on the Sun
-!---- to the convention used in SPECFEM3D
-
-  program swap_topo_bathy_Sun
-
-  implicit none
-
-  include "../../constants.h"
-
-! use integer array to store values
-  integer ibathy_topo(NX_BATHY,NY_BATHY)
-
-  integer itopo_x,itopo_y
-
-  open(unit=13,file='topo_bathy_etopo4_from_etopo2_subsampled.dat',status='old')
-  do itopo_y=1,NY_BATHY
-    do itopo_x=1,NX_BATHY
-      read(13,*) ibathy_topo(itopo_x,itopo_y)
-    enddo
-  enddo
-  close(13)
-
-! blocks of longitude in [0,180[ and [180,360[ must be swapped
-! in the final file, itopo_x = 1 should correspond to longitude = 0
-! therefore one should see Africa on the left of the JPEG image of topography
-  open(unit=13,file='topo_bathy_etopo4_from_etopo2_subsampled_2.dat',status='unknown')
-  do itopo_y=1,NY_BATHY
-    do itopo_x=NX_BATHY/2+1,NX_BATHY
-      write(13,*) ibathy_topo(itopo_x,itopo_y)
-    enddo
-    do itopo_x=1,NX_BATHY/2
-      write(13,*) ibathy_topo(itopo_x,itopo_y)
-    enddo
-  enddo
-  close(13)
-
-  end program swap_topo_bathy_Sun
-



More information about the CIG-COMMITS mailing list