Merge pull request #53 from euroargodev/v0p1p18a

V0p1p18a

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.7' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
+          - '1.9' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
           - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
         os:
           - ubuntu-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "ArgoData"
 uuid = "9eb831cf-c491-48dc-bed4-6aca718df73c"
 authors = ["gaelforget <[email protected]>"]
-version = "0.1.17"
+version = "0.1.18"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
@@ -12,7 +12,6 @@ FTPClient = "01fcc997-4f28-56b8-8a06-30002c134abb"
 Glob = "c27321d9-0574-5035-807b-f59d2c89b15c"
 Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
-MITgcmTools = "62725fbc-3a66-4df3-9000-e33e85b3a198"
 MeshArrays = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
 OceanStateEstimation = "891f6deb-a4f5-4bc5-a2e3-1e8f649cdd2c"
@@ -23,18 +22,17 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
 
 [compat]
-CSV = "0.6, 0.7, 0.8, 0.9, 0.10"
-DataFrames = "0.20, 0.21, 0.22, 1"
+CSV = "0.10"
+DataFrames = "1"
 Downloads = "1"
 FTPClient = "1"
 Glob = "1"
 Interpolations = "0.13, 0.14, 0.15"
 JLD2 = "0.4"
-MITgcmTools = "0.2"
-MeshArrays = "0.2, 0.3"
-NCDatasets = "0.10, 0.11, 0.12, 0.13, 0.14"
-OceanStateEstimation = "0.3, 0.4"
+MeshArrays = "0.3"
+NCDatasets = "0.12, 0.13, 0.14"
+OceanStateEstimation = "0.4"
 OrderedCollections = "1"
 Statistics = "1"
 YAML = "0.4"
-julia = "1.7"
+julia = "1.9"

docs/Project.toml

@@ -1,5 +1,6 @@
 [deps]
 Dataverse = "9c0b9be8-e31e-490f-90fe-77697562404d"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+MITgcm = "dce5fa8e-68ce-4431-a242-9469c69627a0"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
 PlutoSliderServer = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4"

docs/make.jl

@@ -1,5 +1,7 @@
 using Documenter, ArgoData, PlutoSliderServer
 
+using MITgcm; gridded_fields=GriddedFields.load()
+
 #python dependencies
 if false
 import Pkg, PyCall, Conda

src/MITprofAnalysis.jl

@@ -397,6 +397,8 @@ df1=MITprofAnalysis.trim(df)
 trim(df) = df[
     (!ismissing).(df.T) .& (!ismissing).(df.Te) .& (df.Tw.>0) .&
     (!ismissing).(df.S) .& (!ismissing).(df.Se) .& (df.Sw.>0) .&
+    (!isnan).(df.T) .& (!isnan).(df.Te) .&
+    (!isnan).(df.S) .& (!isnan).(df.Se) .&
     (df.date .> date_min) .& (df.date .< date_max)
     ,:]
 

src/tools.jl

@@ -639,8 +639,10 @@ end #module ArgoTools
 
 module GriddedFields
 
-using MeshArrays, OceanStateEstimation, MITgcmTools, Statistics
+using MeshArrays, Statistics
 
+import OceanStateEstimation.MITPROFclim_download
+import OceanStateEstimation.ScratchSpaces
 import ArgoData.MITprofStandard
 import ArgoData.ArgoTools
 
@@ -693,7 +695,7 @@ function load()
 
     msk=NaN_mask(Γ)
 
-    OceanStateEstimation.MITPROFclim_download()
+    MITPROFclim_download()
 
     pth=joinpath(ScratchSpaces.MITprof,"gcmfaces_climatologies")
     T=MonthlyClimatology(joinpath(pth,"T_OWPv1_M_eccollc_90x50.bin"),msk)
@@ -819,4 +821,4 @@ function interp_backend!(mp::MITprofStandard,📚::NamedTuple,z_in,T_in,z_out,T_
     end
 end
 
-end #module GriddedFields
+end #module GriddedFields

test/Project.toml

@@ -1,4 +1,5 @@
 [deps]
+MITgcm = "dce5fa8e-68ce-4431-a242-9469c69627a0"
 MeshArrays = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
 OceanStateEstimation = "891f6deb-a4f5-4bc5-a2e3-1e8f649cdd2c"

test/runtests.jl

@@ -1,4 +1,4 @@
-using ArgoData, MeshArrays, Test
+using ArgoData, MeshArrays, MITgcm, Test
 
 @testset "ArgoData.jl" begin