Merge pull request #54 from euroargodev/v0p1p18b

better handle MITPROFclim_download
euroargodev · Mar 31, 2024 · 656f95d · 656f95d
2 parents 60f66e6 + a0d3945
commit 656f95d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ArgoData"
 uuid = "9eb831cf-c491-48dc-bed4-6aca718df73c"
 authors = ["gaelforget <[email protected]>"]
-version = "0.1.18"
+version = "0.1.19"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

diff --git a/docs/Project.toml b/docs/Project.toml
@@ -3,4 +3,5 @@ Dataverse = "9c0b9be8-e31e-490f-90fe-77697562404d"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 MITgcm = "dce5fa8e-68ce-4431-a242-9469c69627a0"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
+OceanStateEstimation = "891f6deb-a4f5-4bc5-a2e3-1e8f649cdd2c"
 PlutoSliderServer = "2fc8631c-6f24-4c5b-bca7-cbb509c42db4"
diff --git a/docs/make.jl b/docs/make.jl
@@ -1,6 +1,6 @@
 using Documenter, ArgoData, PlutoSliderServer
 
-using MITgcm; gridded_fields=GriddedFields.load()
+using OceanStateEstimation, MITgcm; OceanStateEstimation.MITPROFclim_download()
 
 #python dependencies
 if false

diff --git a/src/tools.jl b/src/tools.jl
@@ -641,7 +641,6 @@ module GriddedFields
 
 using MeshArrays, Statistics
 
-import OceanStateEstimation.MITPROFclim_download
 import OceanStateEstimation.ScratchSpaces
 import ArgoData.MITprofStandard
 import ArgoData.ArgoTools
@@ -688,15 +687,18 @@ Originally this function returned `Γ,msk,T,S,σT,σS,array`.
     
 The embeded `array()` function returns a 2D array initialized to `missing`. 
 And `array(1)`, `array(3,2)`, etc add dimensions to the resulting array.
+
+```
+using OceanStateEstimation, MITgcm; OceanStateEstimation.MITPROFclim_download()
+using ArgoData; gridded_fields=GriddedFields.load()
+```
 """
 function load()
     γ=GridSpec("LatLonCap",MeshArrays.GRID_LLC90)
     Γ=GridLoad(γ,option="full")
 
     msk=NaN_mask(Γ)
 
-    MITPROFclim_download()
-
     pth=joinpath(ScratchSpaces.MITprof,"gcmfaces_climatologies")
     T=MonthlyClimatology(joinpath(pth,"T_OWPv1_M_eccollc_90x50.bin"),msk)
     S=MonthlyClimatology(joinpath(pth,"S_OWPv1_M_eccollc_90x50.bin"),msk)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,4 +1,6 @@
-using ArgoData, MeshArrays, MITgcm, Test
+using ArgoData, MeshArrays, Test
+
+using OceanStateEstimation, MITgcm; OceanStateEstimation.MITPROFclim_download()
 
 @testset "ArgoData.jl" begin