Reordering some function arguments

Author: natgeo-wong

src/landsea/landsea.jl

@@ -196,22 +196,22 @@ function saveLandSea(
 end
 
 function getLandSea(
-    efol :: AbstractString,
-    ereg :: ERA5Region = ERA5Region(GeoRegion("GLB"));
+    ereg  :: ERA5Region = ERA5Region(GeoRegion("GLB"));
+    eroot :: AbstractString = homedir(),
     returnlsd = true,
     FT = Float32
 )
 
-    lsmfnc = joinpath(efol,"emask-$(ereg.gstr).nc")
+    lsmfnc = joinpath(eroot,"emask-$(ereg.gstr).nc")
 
     if !isfile(lsmfnc)
 
         @info "$(modulelog()) - The ERA5 Land-Sea mask dataset for the \"$(ereg.geoID)\" ERA5Region is not available, extracting from Global ERA5 Land-Sea mask dataset ..."
 
-        glbfnc = joinpath(efol,"emask-GLBx$(@sprintf("%.2f",ereg.gres)).nc")
+        glbfnc = joinpath(eroot,"emask-GLBx$(@sprintf("%.2f",ereg.gres)).nc")
         if !isfile(glbfnc)
             @info "$(modulelog()) - The Global ERA5 Land-Sea mask dataset for the \"$(ereg.geoID)\" ERA5Region is not available, downloading from the Climate Data Store ..."
-            downloadLandSea(efol,ereg)
+            downloadLandSea(eroot,ereg)
         end
 
         gds  = NCDataset(glbfnc)
@@ -244,7 +244,7 @@ function getLandSea(
             end
         end
 
-        saveLandSea(efol,ereg,rinfo.glon,rinfo.glat,rlsm,roro,Int16.(mask))
+        saveLandSea(eroot,ereg,rinfo.glon,rinfo.glat,rlsm,roro,Int16.(mask))
 
     end
 
@@ -271,11 +271,11 @@ function getLandSea(
 end
 
 function downloadLandSea(
-    efol :: AbstractString,
-    ereg :: ERA5Region
+    eroot :: AbstractString,
+    ereg  :: ERA5Region
 )
 
-    tmpfnc = joinpath(efol,"tmp.nc")
+    tmpfnc = joinpath(eroot,"tmp.nc")
     retrieve(
         "reanalysis-era5-single-levels-monthly-means", Dict(
             "product_type" => "monthly_averaged_reanalysis",
@@ -297,7 +297,7 @@ function downloadLandSea(
     close(tds)
 
     saveLandSea(
-        efol,ERA5Region(GeoRegion("GLB"),gres=ereg.gres),
+        eroot,ERA5Region(GeoRegion("GLB"),gres=ereg.gres),
         lon,lat,lsm,oro,msk
     )
 
@@ -306,16 +306,16 @@ function downloadLandSea(
 end
 
 function saveLandSea(
-    efol :: AbstractString,
-    ereg :: ERA5Region,
-    lon  :: Vector{<:Real},
-    lat  :: Vector{<:Real},
-    lsm  :: Array{<:Real,2},
-    oro  :: Array{<:Real,2},
-    mask :: Array{Int16,2},
+    eroot :: AbstractString,
+    ereg  :: ERA5Region,
+    lon   :: Vector{<:Real},
+    lat   :: Vector{<:Real},
+    lsm   :: Array{<:Real,2},
+    oro   :: Array{<:Real,2},
+    mask  :: Array{Int16,2},
 )
 
-    fnc = joinpath(efol,"emask-$(ereg.gstr).nc")
+    fnc = joinpath(eroot,"emask-$(ereg.gstr).nc")
     if isfile(fnc)
         rm(fnc,force=true)
     end