Fix names + Add °C + Add kwargs

briochemc · Apr 16, 2021 · 1041c25 · 1041c25 · briochemc · Apr 16, 2021
1 parent 52bf254
commit 1041c25
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "WorldOceanAtlasTools"
 uuid = "04f20302-f1b9-11e8-29d9-7d841cb0a64a"
 authors = ["Benoit Pasquier <briochemc@gmail.com>"]
-version = "0.4.3"
+version = "0.4.4"
 
 [deps]
 DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"

diff --git a/src/convert_to_Unitful.jl b/src/convert_to_Unitful.jl
@@ -10,6 +10,7 @@ convert_to_Unitful(v::String) = @match v begin
     "meters"                           => u"m"
     "degrees_north"                    => u"°"
     "degrees_east"                     => u"°"
+    "degrees_celsius"                  => u"°C"
     _ => nothing
 end
 

diff --git a/src/functions.jl b/src/functions.jl
@@ -39,6 +39,11 @@ function get_gridded_3D_field(ds, tracer, field)
     field3D .= field3D[:, lon_reordering, :]
     return field3D, lat, lon, depth
 end
+function get_gridded_3D_field(tracer, field; kwargs...)
+    return Dataset(WOAfile(tracer=tracer; kwargs...), "r") do ds
+        get_gridded_3D_field(ds, tracer, field)
+    end
+end
 
 """
     mean_std_and_number_obs(ds, tracer)
@@ -195,8 +200,8 @@ Returns observations of `tracer` with its metadata.
 obs = observations("po4")
 ```
 """
-function observations(tracer::String; metadatakeys=("lat", "lon", "depth"))
-    return Dataset(WOAfile(tracer=tracer), "r") do ds
+function observations(tracer::String; metadatakeys=("lat", "lon", "depth"), kwargs...)
+    return Dataset(WOAfile(tracer=tracer; kwargs...), "r") do ds
         observations(ds, tracer, metadatakeys=metadatakeys)
     end
 end

diff --git a/src/names.jl b/src/names.jl
@@ -233,8 +233,8 @@ WOA_decade(tracer) = @match my_varname(tracer) begin
 end
 
 WOA_v2(tracer) = @match my_varname(tracer) begin
-    "Salt" || "Temp" => "v2"
-    "Dens" || "Cond" || "O2" || "O2sat" || "AOU" || "DSi" || "DIP" || "DIN" => ""
+    "Salt" => "v2"
+    "Dens" || "Temp" || "Cond" || "O2" || "O2sat" || "AOU" || "DSi" || "DIP" || "DIN" => ""
     _ => error(incorrect_varname(tracer))
 end