Merge pull request #3692 from CliMA/aj/precip_cleanup

Move precipitation cache to precomputed quantities

Author: szy21

.buildkite/Manifest-v1.11.toml

@@ -350,7 +350,7 @@ version = "0.5.13"
 deps = ["Adapt", "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.6"
+version = "0.29.0"
 
 [[deps.ClimaComms]]
 deps = ["Adapt", "Logging", "LoggingExtras"]

NEWS.md

@@ -4,6 +4,11 @@ ClimaAtmos.jl Release Notes
 main
 -------
 
+v0.29.0
+-------
+
+### Remove precipitation from cache
+And move all the fields into precomputed
 
 v0.28.6
 -------

Project.toml

@@ -1,7 +1,7 @@
 name = "ClimaAtmos"
 uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717"
 authors = ["Climate Modeling Alliance"]
-version = "0.28.6"
+version = "0.29.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/cache/cache.jl

@@ -9,7 +9,6 @@ struct AtmosCache{
     PREC,
     SCRA,
     HYPE,
-    PR,
     EXTFORCING,
     NONGW,
     ORGW,
@@ -52,7 +51,6 @@ struct AtmosCache{
     hyperdiff::HYPE
 
     """Additional parameters used by the various tendencies"""
-    precipitation::PR
     external_forcing::EXTFORCING
     non_orographic_gravity_wave::NONGW
     orographic_gravity_wave::ORGW
@@ -147,8 +145,16 @@ function build_cache(
     scratch = temporary_quantities(Y, atmos)
 
     precomputed = precomputed_quantities(Y, atmos)
-    precomputing_arguments =
-        (; atmos, core, params, sfc_setup, precomputed, scratch, dt)
+    precomputing_arguments = (;
+        atmos,
+        core,
+        params,
+        sfc_setup,
+        precomputed,
+        scratch,
+        dt,
+        conservation_check,
+    )
 
     # Coupler compatibility
     isnothing(precomputing_arguments.sfc_setup) &&
@@ -168,7 +174,6 @@ function build_cache(
         ) : ()
 
     hyperdiff = hyperdiffusion_cache(Y, atmos)
-    precipitation = precipitation_cache(Y, atmos)
     external_forcing = external_forcing_cache(Y, atmos, params)
     non_orographic_gravity_wave = non_orographic_gravity_wave_cache(Y, atmos)
     orographic_gravity_wave = orographic_gravity_wave_cache(Y, atmos)
@@ -186,7 +191,6 @@ function build_cache(
         precomputed,
         scratch,
         hyperdiff,
-        precipitation,
         external_forcing,
         non_orographic_gravity_wave,
         orographic_gravity_wave,