Merge pull request #1279 from CliMA/js/spatial-data-pt

Enable reading spatial data to a point/column

Author: juliasloan25

.buildkite/Manifest-v1.11.toml

@@ -481,9 +481,10 @@ deps = ["ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTime
 path = ".."
 uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
 version = "0.17.2"
-weakdeps = ["BSON", "CSV", "CairoMakie", "ClimaAnalysis", "DataFrames", "Flux", "GeoMakie", "HTTP", "Poppler_jll", "Printf", "StatsBase"]
+weakdeps = ["BSON", "CSV", "CairoMakie", "ClimaAnalysis", "DataFrames", "DelimitedFiles", "Flux", "GeoMakie", "HTTP", "Poppler_jll", "Printf", "StatsBase"]
 
     [deps.ClimaLand.extensions]
+    FluxnetSimulationsExt = ["DelimitedFiles"]
     LandSimulationVisualizationExt = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
     NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
 
@@ -505,9 +506,9 @@ weakdeps = ["BenchmarkTools", "CUDA", "OrderedCollections", "PrettyTables", "Sta
 
 [[deps.ClimaUtilities]]
 deps = ["Artifacts", "ClimaComms", "Dates"]
-git-tree-sha1 = "420fe76968208ac2eb2837e9e0f0974456ebec78"
+git-tree-sha1 = "4402148693a5096c28cb09e544ce92b049b33e41"
 uuid = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
-version = "0.1.24"
+version = "0.1.25"
 
     [deps.ClimaUtilities.extensions]
     ClimaUtilitiesClimaCoreExt = "ClimaCore"

.buildkite/Manifest.toml

@@ -478,9 +478,10 @@ deps = ["ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTime
 path = ".."
 uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
 version = "0.17.2"
-weakdeps = ["BSON", "CSV", "CairoMakie", "ClimaAnalysis", "DataFrames", "Flux", "GeoMakie", "HTTP", "Poppler_jll", "Printf", "StatsBase"]
+weakdeps = ["BSON", "CSV", "CairoMakie", "ClimaAnalysis", "DataFrames", "DelimitedFiles", "Flux", "GeoMakie", "HTTP", "Poppler_jll", "Printf", "StatsBase"]
 
     [deps.ClimaLand.extensions]
+    FluxnetSimulationsExt = ["DelimitedFiles"]
     LandSimulationVisualizationExt = ["CairoMakie", "ClimaAnalysis", "GeoMakie", "Poppler_jll", "Printf", "StatsBase"]
     NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "BSON"]
 
@@ -502,9 +503,9 @@ weakdeps = ["BenchmarkTools", "CUDA", "OrderedCollections", "PrettyTables", "Sta
 
 [[deps.ClimaUtilities]]
 deps = ["Artifacts", "ClimaComms", "Dates"]
-git-tree-sha1 = "420fe76968208ac2eb2837e9e0f0974456ebec78"
+git-tree-sha1 = "4402148693a5096c28cb09e544ce92b049b33e41"
 uuid = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513"
-version = "0.1.24"
+version = "0.1.25"
 
     [deps.ClimaUtilities.extensions]
     ClimaUtilitiesClimaCoreExt = "ClimaCore"

NEWS.md

@@ -3,6 +3,7 @@ ClimaLand.jl Release Notes
 
 main
 -------
+- Use ClimaUtilities v0.1.25 to read in spatial data to a point using lat/lon PR[#1279](https://github.com/CliMA/ClimaLand.jl/pull/1279)
 - Add data handling tools to FluxnetSimulationsExt and use throughout docs and experiments PR[#1238](https://github.com/CliMA/ClimaLand.jl/pull/1238)
 - Add convenience constructors for CanopyModel and integrated models PR[#1255](https://github.com/CliMA/ClimaLand.jl/pull/1255)
 - Rename LandSimulationVisualization to LandSimulationVisualizationExt; add template for FluxnetSimulationsExt PR[#1259](https://github.com/CliMA/ClimaLand.jl/pull/1259)

Project.toml

@@ -52,7 +52,7 @@ ClimaCore = "0.14.23"
 ClimaDiagnostics = "0.2.10"
 ClimaParams = "0.10.2"
 ClimaTimeSteppers = "0.8"
-ClimaUtilities = "0.1.24"
+ClimaUtilities = "0.1.25"
 DataFrames = "1.4"
 Dates = "1"
 DelimitedFiles = "1.9"

src/shared_utilities/Domains.jl

@@ -1304,6 +1304,8 @@ If the simulation space is closer to the low resolution CLM data,
 that data will be used, and vice versa. The high resolution data
 takes longer to process and so using lower resolution data when it
 suffices is desirable.
+
+If the surface space is a point, `use_lowres_clm` always returns true.
 """
 function use_lowres_clm(
     surface_space::ClimaCore.Spaces.AbstractSpectralElementSpace,
@@ -1328,6 +1330,7 @@ function use_lowres_clm(
     return abs(lowres_scale - node_scale) < abs(highres_scale - node_scale)
 end
 
+use_lowres_clm(surface_space::ClimaCore.Spaces.PointSpace) = true
 
 
 export AbstractDomain

test/shared_utilities/domains.jl

@@ -1,7 +1,9 @@
 import ClimaComms
 ClimaComms.@import_required_backends
 using ClimaCore
+using NCDatasets
 using Test
+import ClimaUtilities.SpaceVaryingInputs: SpaceVaryingInput
 using ClimaLand
 using ClimaLand: Domains
 using ClimaLand.Domains:
@@ -584,5 +586,73 @@ end
     )
     surface_space = domain.space.surface
     @test !ClimaLand.Domains.use_lowres_clm(surface_space)
+end
+
+@testset "read in spatial data at a point" begin
+    # Manually access the rooting depth from the CLM data to compare with
+    context = ClimaComms.context()
+    clm_artifact_path =
+        ClimaLand.Artifacts.clm_data_folder_path(; context, lowres = true)
+    filepath = joinpath(clm_artifact_path, "vegetation_properties_map.nc")
+
+    NCDataset(filepath) do ncd
+        lats = ncd["lat"][:]
+        longs = ncd["lon"][:]
+        lat_ind = 2
+        long_ind = 10
+        lat = FT(lats[lat_ind])
+        long = FT(longs[long_ind])
+
+        rooting_depth_nc = ncd["rooting_depth"][long_ind, lat_ind]
+
+        # Construct a Point domain at a longlat that appears in the dataset (not testing interpolation)
+        zmin = FT(0)
+        nelements = 10
+        longlat = (long, lat)
+        zlim = FT.((-1, 0))
+        column = ClimaLand.Domains.Column(; zlim, nelements, longlat)
+        surface_space = column.space.surface
+
+        # Get the rooting depth at this lat/lon using ClimaUtilities
+        rooting_depth_pt = ClimaLand.Canopy.clm_rooting_depth(surface_space)
+
+        @test all(Array(parent(rooting_depth_pt)) .== FT(rooting_depth_nc))
+    end
+end
 
+@testset "read in spatial data at a column" begin
+    # Manually access 3D soil parameter data to compare with
+    context = ClimaComms.context()
+
+    soil_params_artifact_path =
+        ClimaLand.Artifacts.soil_params_artifact_folder_path(; context)
+    filepath = joinpath(
+        soil_params_artifact_path,
+        "residual_map_gupta_etal2020_1.0x1.0x4.nc",
+    )
+
+    NCDataset(filepath) do ncd
+        lats = ncd["lat"][:]
+        longs = ncd["lon"][:]
+        zs = ncd["z"][:]
+        lat_ind = 90
+        long_ind = 100
+        lat = FT(lats[lat_ind])
+        long = FT(longs[long_ind])
+
+        θ_r_nc = ncd["θ_r"][long_ind, lat_ind, :]
+
+        # Construct a Column domain at a longlat that appears in the dataset (not testing interpolation)
+        nelements = length(zs)
+        longlat = (long, lat)
+        zlim = FT.((-1, 0))
+        column = ClimaLand.Domains.Column(; zlim, nelements, longlat)
+        subsurface_space = column.space.subsurface
+
+        # Get the residual water content at this lat/lon using ClimaUtilities
+        (; θ_r) =
+            ClimaLand.Soil.soil_vangenuchten_parameters(subsurface_space, FT)
+
+        @test all(Array(parent(θ_r)) .== FT.(θ_r_nc[:]))
+    end
 end