diff --git a/Artifacts.toml b/Artifacts.toml index cec3103d71..27b701eb09 100644 --- a/Artifacts.toml +++ b/Artifacts.toml @@ -58,3 +58,10 @@ git-tree-sha1 = "10855ff977cc948a92c7a83915895d27650649a1" [[topmodel.download]] sha256 = "03de8f42fedf3836c6792571f04b55fbaca321919ecd761b846286dc56bfa2e8" url = "https://caltech.box.com/shared/static/bfjxp72vre6b5ncm7jqf9w8hyj4ab4yr.gz" + +[lehmann2008_evaporation] +git-tree-sha1 = "49386718eda19d2fa00ae6981d83948c6664057a" + + [[lehmann2008_evaporation.download]] + sha256 = "e9603add174709a8eb7f70487bdc0f519843c03d83cb40cf07acd428f0d9d881" + url = "https://caltech.box.com/shared/static/khhop0nvuumrtzdakemaab8hsq8emh8e.gz" diff --git a/docs/tutorials/standalone/Soil/evaporation.jl b/docs/tutorials/standalone/Soil/evaporation.jl index 745b26d2aa..18da5dec6d 100644 --- a/docs/tutorials/standalone/Soil/evaporation.jl +++ b/docs/tutorials/standalone/Soil/evaporation.jl @@ -226,8 +226,7 @@ evap = [ parent(sv.saveval[k].soil.turbulent_fluxes.vapor_flux_liq)[1] for k in 1:length(sol.t) ] -evaporation_data = - ClimaLand.Artifacts.lehmann_assouline_or2008_evaporation_data(); +evaporation_data = ClimaLand.Artifacts.lehmann2008_evaporation_data(); ref_soln_E = readdlm(evaporation_data, ',') ref_soln_E_350mm = ref_soln_E[2:end, 1:2] data_dates = ref_soln_E_350mm[:, 1] diff --git a/src/Artifacts.jl b/src/Artifacts.jl index 201bb9d1ec..b3cdc05622 100644 --- a/src/Artifacts.jl +++ b/src/Artifacts.jl @@ -179,9 +179,9 @@ function topmodel_data_path(; context = nothing) end """ - lehmann_assouline_or2008_evaporation_data(; context=nothing) + lehmann2008_evaporation_data(; context=nothing) -Local path to file containing measured evaporation rate as a function of time +Returns the path to file containing measured evaporation rate as a function of time for bare soil. Data was originally collected by Lehmann, Peter, Shmuel Assouline, @@ -191,18 +191,11 @@ in Figure 8 of that work. https://doi.org/10.1103/PhysRevE.77.056309 """ -function lehmann_assouline_or2008_evaporation_data(; context = nothing) - dir = joinpath(@__DIR__, "../") - evap_dataset = ArtifactWrapper( - dir, - "lehmann2008_fig8_evaporation", - ArtifactFile[ArtifactFile( - url = "https://caltech.box.com/shared/static/cgppw3tx6zdz7h02yt28ri44g1j088ju.csv", - filename = "lehmann2008_fig8_evaporation.csv", - ),], +function lehmann2008_evaporation_data(; context = nothing) + return joinpath( + @clima_artifact("lehmann2008_evaporation", context), + "lehmann2008_fig8_evaporation.csv", ) - evap_datapath = get_data_folder(evap_dataset) - return joinpath(evap_datapath, "lehmann2008_fig8_evaporation.csv") end """