Merge pull request #3728 from CliMA/zs/rm_zero_tendency

remove zero_tendency config

Author: szy21

.buildkite/longruns_gpu/pipeline.yml

@@ -149,7 +149,7 @@ steps:
           slurm_time: 24:00:00
         env:
           CLIMACOMMS_DEVICE: "CUDA"
-          JOB_NAME: "longrun_aquaplanet_allsky_progedmf_diffonly_0M"
+          JOB_NAME: "longrun_aquaplanet_allsky_progedmf_0M"
 
       - label: ":computer: aquaplanet equilmoist allsky radiation + 0M microphysics + earth topography"
         command:

config/default_configs/default_config.yml

@@ -315,9 +315,6 @@ turbconv:
 advection_test:
   help: "Switches off all grid-scale and subgrid-scale momentum tendencies [`false` (default), `true`]"
   value: false
-zero_tendency:
-  help: "Turns off tendencies [`nothing` (default), `grid_scale`, `subgrid_scale`]"
-  value: ~
 implicit_sgs_advection:
   help: "Whether to treat the subgrid-scale vertical advection tendency implicitly [`false` (default), `true`]"
   value: false

config/longrun_configs/longrun_aquaplanet_allsky_progedmf_diffonly_0M.yml renamed to config/longrun_configs/longrun_aquaplanet_allsky_progedmf_0M.yml

@@ -6,25 +6,27 @@ deep_atmosphere: false
 rayleigh_sponge: true
 viscous_sponge: true
 implicit_diffusion: true
+implicit_sgs_advection: true
+implicit_sgs_mass_flux: true
 approximate_linear_solve_iters: 2
 max_newton_iters_ode: 3
-dt: "120secs"
-t_end: "240days"
+dt: "20secs"
+t_end: "60days"
 dt_save_state_to_disk: "30days"
 moist: "equil"
 rad: "allskywithclear"
 dt_rad: "1hours"
 dt_cloud_fraction: "1hours"
 surface_setup: "DefaultMoninObukhov"
 turbconv: "prognostic_edmfx"
-zero_tendency: "subgrid_scale"
 prognostic_tke: true
 edmfx_upwinding: "first_order"
 edmfx_entr_model: "Generalized"
 edmfx_detr_model: "Generalized"
-edmfx_nh_pressure: false
+edmfx_nh_pressure: true
 edmfx_filter: true
-edmfx_sgs_mass_flux: false
+prognostic_tke: true
+edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 precip_model: "0M"
 toml: [toml/longrun_aquaplanet_progedmf.toml]

docs/src/longruns.md

@@ -50,10 +50,9 @@ Aquaplanet with idealized insolation, all-sky radiation, diagnostic edmf
 and 0-moment microphysics.
 ```
 ```
-longrun_aquaplanet_allsky_progedmf_diffonly_0M
+longrun_aquaplanet_allsky_progedmf_0M
 
-Aquaplanet with idealized insolation, all-sky radiation, prognostic edmf with diffusion only
-and 0-moment microphysics.
+Aquaplanet with idealized insolation, all-sky radiation, prognostic edmf with 0-moment microphysics.
 ```
 ```
 longrun_aquaplanet_allsky_tvinsol_0M_slabocean

post_processing/ci_plots.jl

@@ -1133,7 +1133,7 @@ AquaplanetPlots = Union{
     Val{:rcemipii_sphere_diagnostic_edmfx},
     Val{:longrun_aquaplanet_allsky_0M},
     Val{:longrun_aquaplanet_allsky_diagedmf_0M},
-    Val{:longrun_aquaplanet_allsky_progedmf_diffonly_0M},
+    Val{:longrun_aquaplanet_allsky_progedmf_0M},
     Val{:longrun_aquaplanet_allsky_0M_earth},
     Val{:longrun_aquaplanet_dyamond},
     Val{:longrun_aquaplanet_allsky_tvinsol_0M_slabocean},

src/ClimaAtmos.jl

@@ -52,7 +52,6 @@ include(joinpath("utils", "discrete_hydrostatic_balance.jl"))
 
 include(joinpath("prognostic_equations", "pressure_work.jl"))
 include(joinpath("prognostic_equations", "zero_velocity.jl"))
-include(joinpath("prognostic_equations", "zero_tendency.jl"))
 
 include(joinpath("prognostic_equations", "implicit", "implicit_tendency.jl"))
 include(joinpath("prognostic_equations", "implicit", "implicit_solver.jl"))

src/prognostic_equations/implicit/implicit_tendency.jl

@@ -50,9 +50,6 @@ NVTX.@annotate function implicit_tendency!(Yₜ, Y, p, t)
     # please DO NOT add additional velocity tendencies after this function
     zero_velocity_tendency!(Yₜ, Y, p, t)
 
-    # NOTE: This will zero out all tendencies
-    # please DO NOT add additional tendencies after this function
-    zero_tendency!(Yₜ, Y, p, t, p.atmos.tendency_model, p.atmos.turbconv_model)
     return nothing
 end
 

src/prognostic_equations/remaining_tendency.jl

@@ -179,7 +179,4 @@ NVTX.@annotate function additional_tendency!(Yₜ, Y, p, t)
         t,
         p.atmos.orographic_gravity_wave,
     )
-    # NOTE: This will zero out all tendencies
-    # please DO NOT add additional tendencies after this function
-    zero_tendency!(Yₜ, Y, p, t, p.atmos.tendency_model, p.atmos.turbconv_model)
 end

src/prognostic_equations/zero_tendency.jl

@@ -525,18 +525,6 @@ function get_tracers(parsed_args)
     return (; aerosol_names)
 end
 
-function get_tendency_model(parsed_args)
-    zero_tendency_name = parsed_args["zero_tendency"]
-    @assert zero_tendency_name in (nothing, "grid_scale", "subgrid_scale")
-    return if zero_tendency_name == "grid_scale"
-        NoGridScaleTendency()
-    elseif zero_tendency_name == "subgrid_scale"
-        NoSubgridScaleTendency()
-    elseif isnothing(zero_tendency_name)
-        UseAllTendency()
-    end
-end
-
 function check_case_consistency(parsed_args)
     # if any flags is ISDAC, check that all are ISDAC
     ic = parsed_args["initial_condition"]