fix GMT import_topo

Author: albert-de-montserrat

ext/GMT_utils.jl

@@ -18,7 +18,7 @@ println("Loading GMT routines within GMG")
 
 
 """
-    Topo = import_topo(limits; file::String="@earth_relief_01m.grd", maxattempts=5) 
+    Topo = import_topo(limits; file::String="@earth_relief_01m", maxattempts=5) 
     
 Uses `GMT` to download the topography of a certain region, specified with limits=[lon_min, lon_max, lat_min, lat_max].
 Sometimes download fails because of the internet connection. We do `maxattempts` to download it.
@@ -65,45 +65,44 @@ julia> write_paraview(Topo,"Topo_Alps")
  "Topo_Alps.vts"
 ```
 """
-function import_topo(limits; file::String="@earth_relief_01m.grd", maxattempts=5)
+function import_topo(limits; file::String="@earth_relief_01m", maxattempts=5)
 
-    # Correct if negative values are given (longitude coordinates that are west)
-    ind = findall(limits[1:2] .< 0); 
+  # Correct if negative values are given (longitude coordinates that are west)
+  ind = limits[1:2] .< 0
 
-    if (limits[1] < 0) && (limits[2] < 0)
-      limits[ind] .= 360 .+ limits[ind]; 
-      limits[1:2] = sort(limits[1:2])   
-    end
+  if (limits[1] < 0) && (limits[2] < 0)
+      limits[ind] .= 360 .+ limits[ind]
+      limits[1:2]  = sort(limits[1:2])   
+  end
 
-    # Download topo file  - add a few attempts to do so
-    G = [];
-    attempt = 0
-    while attempt<maxattempts
-      try
-        G       =   gmtread(file, limits=limits, grid=true);
-        break
-      catch
-        @warn "Failed downloading GMT topography on attempt $attempt/$maxattempts"
-        sleep(5)  # wait a few sec
-      end
-      attempt += 1
-    end
-    if isempty(G)
-      error("Could not download GMT topography data")
+  # Download topo file  - add a few attempts to do so
+  local G
+  attempt = 0
+  while attempt < maxattempts
+    try
+      G = gmtread(file, limits=limits, grid=true);
+      break
+    catch
+      @warn "Failed downloading GMT topography on attempt $attempt/$maxattempts"
+      sleep(5)  # wait a few sec
     end
+    attempt += 1
+  end
+  if isempty(G)
+    error("Could not download GMT topography data")
+  end
 
-    # Transfer to GeoData
-    nx,ny           =   size(G.z,2), size(G.z,1)
-    Lon,Lat,Depth   =   lonlatdepth_grid(G.x[1:nx],G.y[1:ny],0);
-    Depth[:,:,1]    =   1e-3*G.z';
-    Topo            =   GeoData(Lon, Lat, Depth, (Topography=Depth*km,))
+  # Transfer to GeoData
+  nx, ny              = size(G.z,2), size(G.z,1)
+  Lon,Lat,Depth       = lonlatdepth_grid(G.x[1:nx],G.y[1:ny],0);
+  @views Depth[:,:,1] = 1e-3*G.z';
+  Topo                = GeoData(Lon, Lat, Depth, (Topography=Depth*km,))
 
-    return Topo
-
+  return Topo
 end
 
 """
-  import_topo(; lat::Vector{2}, lon::Vector{2}, file::String="@earth_relief_01m.grd", maxattempts=5)
+  import_topo(; lat::Vector{2}, lon::Vector{2}, file::String="@earth_relief_01m", maxattempts=5)
 
 Imports topography (using GMT), by specifying keywords for latitude and longitude ranges
 
@@ -114,11 +113,11 @@ julia> Topo = import_topo(lat=[30,40], lon=[30, 50] )
 ```
 The values can also be defined as tuples:
 ```julia
-julia> Topo = import_topo(lon=(-50, -40), lat=(-10,-5), file="@earth_relief_30s.grd")
+julia> Topo = import_topo(lon=(-50, -40), lat=(-10,-5), file="@earth_relief_30s")
 ```
 
 """
-import_topo(; lat=[37,49], lon=[4,20], file::String="@earth_relief_01m.grd", maxattempts=5) = import_topo([lon[1],lon[2], lat[1], lat[2]], file=file, maxattempts=maxattempts)
+import_topo(; lat=[37,49], lon=[4,20], file::String="@earth_relief_01m", maxattempts=5) = import_topo([lon[1],lon[2], lat[1], lat[2]], file=file, maxattempts=maxattempts)
 
 
 """