Merge branch 'JuliaGeodynamics:main' into main

Author: NicolasRiel

ext/GMT_utils.jl

@@ -18,9 +18,10 @@ println("Loading GMT routines within GMG")
 
 
 """
-    Topo = ImportTopo(limits; file::String="@earth_relief_01m.grd") 
+    Topo = ImportTopo(limits; file::String="@earth_relief_01m.grd", maxattempts=5) 
     
-Uses `GMT` to download the topography of a certain region, specified with limits=[lon_min, lon_max, lat_min, lat_max] 
+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.
 
 Note: 
 ====
@@ -64,7 +65,7 @@ julia> Write_Paraview(Topo,"Topo_Alps")
  "Topo_Alps.vts"
 ```
 """
-function ImportTopo(limits; file::String="@earth_relief_01m.grd")
+function ImportTopo(limits; file::String="@earth_relief_01m.grd", maxattempts=5)
 
     # Correct if negative values are given (longitude coordinates that are west)
     ind = findall(limits[1:2] .< 0); 
@@ -74,8 +75,22 @@ function ImportTopo(limits; file::String="@earth_relief_01m.grd")
       limits[1:2] = sort(limits[1:2])   
     end
 
-    # Download topo file  
-    G               =   gmtread(file, limits=limits, grid=true);
+    # 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")
+    end
 
     # Transfer to GeoData
     nx,ny           =   size(G.z,2), size(G.z,1)
@@ -88,7 +103,7 @@ function ImportTopo(limits; file::String="@earth_relief_01m.grd")
 end
 
 """
-  ImportTopo(; lat::Vector{2}, lon::Vector{2}, file::String="@earth_relief_01m.grd")
+  ImportTopo(; lat::Vector{2}, lon::Vector{2}, file::String="@earth_relief_01m.grd", maxattempts=5)
 
 Imports topography (using GMT), by specifying keywords for latitude and longitude ranges
 
@@ -103,7 +118,7 @@ julia> Topo = ImportTopo(lon=(-50, -40), lat=(-10,-5), file="@earth_relief_30s.g
 ```
 
 """
-ImportTopo(; lat=[37,49], lon=[4,20], file::String="@earth_relief_01m.grd") = ImportTopo([lon[1],lon[2], lat[1], lat[2]], file=file)
+ImportTopo(; lat=[37,49], lon=[4,20], file::String="@earth_relief_01m.grd", maxattempts=5) = ImportTopo([lon[1],lon[2], lat[1], lat[2]], file=file, maxattempts=maxattempts)
 
 
 """

src/IO.jl

@@ -23,10 +23,11 @@ function save_GMG(filename::String, data::Union{GeoData, CartData, UTMData}; dir
 end 
 
 """
-    load_GMG(filename::String, dir=pwd())
+    load_GMG(filename::String, dir=pwd(); maxattempts=5)
 
 Loads a `GeoData`/`CartData`/`UTMData` data set from jld2 file `filename`
-Note: the `filename` can also be a remote `url`, in which case we first download that file to a temporary directory before opening it
+Note: the `filename` can also be a remote `url`, in which case we first download that file to a temporary directory before opening it.
+We make `maxattempts` attempts to download it before giving up.
 
 Example 1 - Load local file
 ====
@@ -56,11 +57,11 @@ GeoData
 ```
 
 """
-function load_GMG(filename::String, dir=pwd())
+function load_GMG(filename::String, dir=pwd(); maxattempts=5)
 
+    local_filename = "download_GMG_temp.jld2"
     if contains(filename,"http")
-        #download remote file to a local temporary directory
-        file_ext = Downloads.download(filename, joinpath(pwd(),"download_GMG_temp.jld2"))
+        file_ext = download_data(filename, local_filename, dir=dir, maxattempts=maxattempts)
     else
         # local file
         file_ext = joinpath(dir,filename*".jld2")
@@ -69,16 +70,22 @@ function load_GMG(filename::String, dir=pwd())
     # load data:
     data =  load_object(file_ext)
 
+    # remove local temporary file
+    if contains(filename,"http")
+        rm(local_filename)
+    end
+
     return data
 end 
 
 
 
 
 """
-    download_data(url::String, local_filename="temp.dat"; dir=pwd() )
+    download_data(url::String, local_filename="temp.dat"; dir=pwd(), maxattempts=5 )
 
-Downloads a remote dataset with name `url` from a remote location and saves it to the current directory
+Downloads a remote dataset with name `url` from a remote location and saves it to the current directory.
+If download fails, we make `maxattempts` attempts before giving up.
 
 Example
 ====
@@ -89,14 +96,28 @@ julia> download_data(url)
 ```
 
 """
-function download_data(url::String, local_filename="temp.dat"; dir=pwd() )
+function download_data(url::String, local_filename="temp.dat"; dir=pwd(), maxattempts=5)
 
     if !contains(url,"http")
         @warn "the url does not contain http; please double check that it worked"
     end
 
-    # download remote file to a local temporary directory
-    file_ext = Downloads.download(url, joinpath(dir,local_filename))
+    #download remote file to a local temporary directory
+    file_ext = [];
+    attempt = 0
+    while attempt<maxattempts
+      try
+        file_ext = Downloads.download(url, joinpath(dir,local_filename))
+        break
+      catch
+        @warn "Failed downloading data on attempt $attempt/$maxattempts"
+        sleep(5)  # wait a few sec
+      end
+      attempt += 1
+    end
+    if isempty(file_ext)
+      error("Could not download GMT topography data")
+    end
 
     return file_ext
 end