Merge pull request #69 from ggebbie/update-1.10

Update 1.10

.github/workflows/CI.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.9'
+          - '1.10'
           #- 'nightly'
         os:
           - ubuntu-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "ECCOtour"
 uuid = "414fb998-b5a0-4a85-b76f-da39d21445ca"
 authors = ["G Jake Gebbie"]
-version = "0.1.17"
+version = "0.1.18"
 
 [deps]
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"

src/download_google_drive.sh

@@ -4,4 +4,5 @@
 
 wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1Sst5Y9AUbef1-Vk2ocBgOOiI2kudYRPx' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1Sst5Y9AUbef1-Vk2ocBgOOiI2kudYRPx" -O state_3d_set1.0000000732.tar.gz && rm -rf /tmp/cookies.txt
 
-wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1KKk8d_1nQFbM9xQjTelCmWTMfK3SA7U5' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1KKk8d_1nQFbM9xQjTelCmWTMfK3SA7U5" -O trsp_3d_set1.0000000732.tar.gz && rm -rf /tmp/cookies.txt
+# Google Drive now failing
+#wget --load-cookies /tmp/cookies.txt "https://docs.google.com/uc?export=download&confirm=$(wget --quiet --save-cookies /tmp/cookies.txt --keep-session-cookies --no-check-certificate 'https://docs.google.com/uc?export=download&id=1KKk8d_1nQFbM9xQjTelCmWTMfK3SA7U5' -O- | sed -rn 's/.*confirm=([0-9A-Za-z_]+).*/\1\n/p')&id=1KKk8d_1nQFbM9xQjTelCmWTMfK3SA7U5" -O trsp_3d_set1.0000000732.tar.gz && rm -rf /tmp/cookies.txt

test/runtests.jl

@@ -32,9 +32,14 @@ using NetCDF
     # workaround: use a shell script
     #run(`sh $srcdir/download_google_drive.sh`)
     run(`sh download_google_drive.sh`)
+
+    # transport > 40 MB, hits virus scanner, move to WHOI website
+    url = "https://www2.whoi.edu/staff/ggebbie/wp-content/uploads/sites/146/2024/03/trsp_3d_set1.0000000732.tar_.gz"
+    download(url,"trsp_3d_set1.0000000732.tar.gz")
+
     run(`tar xvzf state_3d_set1.0000000732.tar.gz`)
     run(`tar xvzf trsp_3d_set1.0000000732.tar.gz`)
-
+    
     mv("state_3d_set1.0000000732.data",datadir("state_3d_set1.0000000732.data"),force=true)
     mv("trsp_3d_set1.0000000732.data",datadir("trsp_3d_set1.0000000732.data"),force=true)
     mv("state_3d_set1.0000000732.meta",datadir("state_3d_set1.0000000732.meta"),force=true)
@@ -75,7 +80,7 @@ using NetCDF
         eos_mitgcm = "JMD95"
 
         @testset "spline_interpolation" begin
-            varsσ = mdsio2sigma1(datadir(),datadir(),fileroots,γ,pstdz,sig1grid,splorder=3,eos=eos_mitgcm)
+            @time varsσ = mdsio2sigma1(datadir(),datadir(),fileroots,γ,pstdz,sig1grid,splorder=3,eos=eos_mitgcm)
             for ss in eachindex(sig1grid)
                 @test maximum(MeshArrays.mask(varsσ["SALT"][:,ss],-Inf)) < 45.0
                 @test minimum(MeshArrays.mask(varsσ["SALT"][:,ss],Inf)) ≥ 0.0