Merge pull request #3598 from CliMA/ck/NullBroadcasts

Use NullBroadcasts.jl

Author: charleskawczynski

.buildkite/Manifest-v1.11.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.11.3"
 manifest_format = "2.0"
-project_hash = "5a5d186c94863f5141fa0e695cac42b7f4ce95b2"
+project_hash = "d40c502ec857ceeea871b38bdda2ee519ea70240"
 
 [[deps.ADTypes]]
 git-tree-sha1 = "e1ce448a0d7f88168ffe2eeac4549c32d45a42d1"
@@ -347,7 +347,7 @@ version = "0.5.12"
     Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 
 [[deps.ClimaAtmos]]
-deps = ["ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
+deps = ["ArgParse", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LazyBroadcast", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "NullBroadcasts", "RRTMGP", "Random", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "UnrolledUtilities", "YAML"]
 path = ".."
 uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
 version = "0.28.4"
@@ -1702,6 +1702,11 @@ version = "1.1.1"
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 version = "1.2.0"
 
+[[deps.NullBroadcasts]]
+git-tree-sha1 = "343c7bb67d0a29ea5d7d2b3e945afe81e2862337"
+uuid = "0d71be07-595a-4f89-9529-4065a4ab43a6"
+version = "0.1.0"
+
 [[deps.Observables]]
 git-tree-sha1 = "7438a59546cf62428fc9d1bc94729146d37a7225"
 uuid = "510215fc-4207-5dde-b226-833fc4488ee2"

.buildkite/Project.toml

@@ -23,6 +23,7 @@ JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
 MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
+NullBroadcasts = "0d71be07-595a-4f89-9529-4065a4ab43a6"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Poppler_jll = "9c32591e-4766-534b-9725-b71a8799265b"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"

Project.toml

@@ -25,6 +25,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
 NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f"
+NullBroadcasts = "0d71be07-595a-4f89-9529-4065a4ab43a6"
 RRTMGP = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
@@ -51,11 +52,12 @@ DiffEqBase = "6.145"
 FastGaussQuadrature = "0.5, 1"
 Insolation = "0.9.2"
 Interpolations = "0.15.1"
-LazyBroadcast = "1"
 LazyArtifacts = "1"
+LazyBroadcast = "1"
 LinearAlgebra = "1"
 Logging = "1"
 NCDatasets = "0.14.2"
+NullBroadcasts = "0.1"
 NVTX = "0.3"
 RRTMGP = "0.19, 0.20"
 Random = "1"

src/ClimaAtmos.jl

@@ -1,13 +1,12 @@
 module ClimaAtmos
 
 using NVTX
-import LazyBroadcast: @lazy
+import NullBroadcasts: NullBroadcasted
 import LazyBroadcast
 import LazyBroadcast: @lazy
 import Thermodynamics as TD
 import Thermodynamics
 
-include("null_broadcasted.jl")
 include("compat.jl")
 include(joinpath("parameters", "Parameters.jl"))
 import .Parameters as CAP

src/null_broadcasted.jl

@@ -27,6 +27,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
 NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f"
+NullBroadcasts = "0d71be07-595a-4f89-9529-4065a4ab43a6"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"

test/Project.toml

@@ -46,11 +46,12 @@ known_dependencies = Set([
     "FastGaussQuadrature",
     "Insolation",
     "Interpolations",
-    "LazyBroadcast",
+    "LazyBroadcast", # for https://github.com/CliMA/ClimaAtmos.jl/issues/3594
     "LazyArtifacts",
     "LinearAlgebra",
     "Logging",
     # NCDatasets is used to read Earth topography, GCM driven initial conditions, orographic gravity wave data
+    "NullBroadcasts", # works with LazyBroadcast
     "NCDatasets",
     "NVTX",
     "RRTMGP",

test/dependencies.jl

@@ -5,6 +5,7 @@ using Revise; include("test/parameterized_tendencies/sponge/rayleigh_sponge.jl")
 using ClimaComms
 ClimaComms.@import_required_backends
 import ClimaAtmos as CA
+using NullBroadcasts: NullBroadcasted
 using ClimaCore.CommonSpaces
 using ClimaCore: Spaces, Fields, Geometry, ClimaCore
 using Test
@@ -42,6 +43,6 @@ using ClimaCore.CommonSpaces
 
     # Test when not using a Rayleigh sponge.
     computed = CA.rayleigh_sponge_tendency_uₕ(ᶜuₕ, nothing)
-    @test computed isa CA.NullBroadcasted
+    @test computed isa NullBroadcasted
     @. ᶜuₕ += computed # test that it can broadcast
 end