add soil ksat dataset

CliMA · Dec 8, 2021 · b53db4e · b53db4e
1 parent e454113
commit b53db4e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/Artifacts.toml b/Artifacts.toml
@@ -2158,6 +2158,14 @@ lazy = true
     sha256 = "4fa15068c6d10d5ec423ea4d99e288856e99876175e10b356ea32b773ea83134"
     url = "ftp://fluo.gps.caltech.edu/XYZT_GRIDDING_MACHINE/artifacts/SLA_2X_1Y_V2.tar.gz"
 
+[SOIL_KSAT_100X_1Y_V2]
+git-tree-sha1 = "b5ced69cd1849f1b001302ff23f1f8dbf1dabf43"
+lazy = true
+
+    [[SOIL_KSAT_100X_1Y_V2.download]]
+    sha256 = "c1bc995a37f86afdbeddfb26d8619ee7b9b6bdf2dd3b95157a3c93eb1a9197a0"
+    url = "ftp://fluo.gps.caltech.edu/XYZT_GRIDDING_MACHINE/artifacts/SOIL_KSAT_100X_1Y_V2.tar.gz"
+
 [SOIL_SWCR_120X_1Y_V1]
 git-tree-sha1 = "356d26e5780e425dc9d83e7ae2abd7ba8b273edb"
 lazy = true

diff --git a/docs/Manifest.toml b/docs/Manifest.toml
@@ -37,9 +37,9 @@ version = "0.8.5"
 
 [[deps.ChainRulesCore]]
 deps = ["Compat", "LinearAlgebra", "SparseArrays"]
-git-tree-sha1 = "f885e7e7c124f8c92650d61b9477b9ac2ee607dd"
+git-tree-sha1 = "4c26b4e9e91ca528ea212927326ece5918a04b47"
 uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
-version = "1.11.1"
+version = "1.11.2"
 
 [[deps.ChangesOfVariables]]
 deps = ["LinearAlgebra", "Test"]

diff --git a/src/Collector.jl b/src/Collector.jl
@@ -594,8 +594,8 @@ soil_color_collection() = GriddedCollection("SC", ["2X_1Y_V1"], "2X_1Y_V1");
 
 <details>
 <summary>
-Method to create a general dataset collection for soil hydraulic parameters (residual soil water content - SWCR, saturated soil water content - SWCS, van Genuchten α - VGA, van Genuchten n - VGN).
-    Supported datasets are (click to view bibtex items)
+Method to create a general dataset collection for soil hydraulic parameters (saturated hydraulic conductance - KSAT, residual soil water content - SWCR, saturated soil water content - SWCS, van
+    Genuchten α - VGA, van Genuchten n - VGN). Supported datasets are (click to view bibtex items)
 - `SWCR_120X_1Y_V1` [(Dai et al., 2019)](https://doi.org/10.1029/2019MS001784)
 - `SWCR_12X_1Y_V1` [(regridded; Dai et al., 2019)](https://doi.org/10.1029/2019MS001784)
 - `SWCS_120X_1Y_V1` [(Dai et al., 2019)](https://doi.org/10.1029/2019MS001784)
@@ -604,6 +604,7 @@ Method to create a general dataset collection for soil hydraulic parameters (res
 - `VGA_12X_1Y_V1` [(regridded; Dai et al., 2019)](https://doi.org/10.1029/2019MS001784)
 - `VGN_120X_1Y_V1` [(Dai et al., 2019)](https://doi.org/10.1029/2019MS001784)
 - `VGN_12X_1Y_V1` [(regridded; Dai et al., 2019)](https://doi.org/10.1029/2019MS001784)
+- `KSAT_100X_1Y_V2` [(Gupta et al., 2021)](https://doi.org/10.1029/2020MS002242)
 </summary>
 
 ```
@@ -616,11 +617,20 @@ Method to create a general dataset collection for soil hydraulic parameters (res
 	number = {9},
 	pages = {2996--3023}
 }
+@article{gupta2021global,
+	author = {Gupta, Surya and Lehmann, Peter and Bonetti, Sara and Papritz, Andreas and Or, Dani},
+	year = {2021},
+	title = {Global Prediction of Soil Saturated Hydraulic Conductivity Using Random Forest in a Covariate-Based GeoTransfer Function (CoGTF) Framework},
+	journal = {Journal of Advances in Modeling Earth Systems},
+	volume = {13},
+	number = {4},
+	pages = {e2020MS002242}
+}
 ```
 </details>
 """
 soil_hydraulics_collection() = (
-    _supported = ["SWCR_120X_1Y_V1", "SWCR_12X_1Y_V1", "SWCS_120X_1Y_V1", "SWCS_12X_1Y_V1", "VGA_120X_1Y_V1", "VGA_12X_1Y_V1", "VGN_120X_1Y_V1", "VGN_12X_1Y_V1"];
+    _supported = ["SWCR_120X_1Y_V1", "SWCR_12X_1Y_V1", "SWCS_120X_1Y_V1", "SWCS_12X_1Y_V1", "VGA_120X_1Y_V1", "VGA_12X_1Y_V1", "VGN_120X_1Y_V1", "VGN_12X_1Y_V1", "KSAT_100X_1Y_V2"];
 
     return GriddedCollection("SOIL", _supported, "SWCS_12X_1Y_V1")
 );

diff --git a/src/Requestor.jl b/src/Requestor.jl
@@ -18,7 +18,7 @@ function request_LUT end;
 
 
 """
-    request_LUT(artname::String, lat::Number, lon::Number, cyc::Int = 0; user::String="Anonymous", interpolation::Bool = false, server::String = "tofu.gps.caltech.edu", port::Int = 5055)
+    request_LUT(artname::String, lat::Number, lon::Number, cyc::Int = 0; user::String="Anonymous", interpolation::Bool = false, server::String = "griddingmachine.myftp.org", port::Int = 5055)
 
 Request data from the server, given
 - `artname` Artifact full name such as `LAI_MODIS_2X_8D_2017_V1`
@@ -39,7 +39,7 @@ request_LUT("LAI_MODIS_2X_8D_2017_V1", 30.5, 115.5, 8);
 request_LUT("LAI_MODIS_2X_8D_2017_V1", 30.5, 115.5, 8; interpolation=true);
 ```
 """
-request_LUT(artname::String, lat::Number, lon::Number, cyc::Int = 0; user::String="Anonymous", interpolation::Bool = false, server::String = "131.215.103.172", port::Int = 5055) = (
+request_LUT(artname::String, lat::Number, lon::Number, cyc::Int = 0; user::String="Anonymous", interpolation::Bool = false, server::String = "griddingmachine.myftp.org", port::Int = 5055) = (
     # make sure the artifact is within our collection
     _metas = load_artifacts_toml(joinpath(@__DIR__, "../Artifacts.toml"));
     _artns = [_name for (_name,_) in _metas];

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -129,6 +129,7 @@ println();
         query_collection(soil_hydraulics_collection(), "VGA_12X_1Y_V1"  ); @test true;
         query_collection(soil_hydraulics_collection(), "VGN_120X_1Y_V1" ); @test true;
         query_collection(soil_hydraulics_collection(), "VGN_12X_1Y_V1"  ); @test true;
+        query_collection(soil_hydraulics_collection(), "KSAT_100X_1Y_V2"); @test true;
 
         query_collection(surface_area_collection(), "2X_1Y_V1"); @test true;
         query_collection(surface_area_collection(), "1X_1Y_V1"); @test true;