fix and format

CliMA · Nov 13, 2023 · af6fad0 · af6fad0
1 parent d22ca86
commit af6fad0
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 24 deletions.
diff --git a/config/default_configs/default_config.yml b/config/default_configs/default_config.yml
@@ -138,9 +138,6 @@ forcing:
 test_dycore_consistency:
   help: "Test dycore consistency [`false` (default), `true`]"
   value: false
-energy_name:
-  help: "Energy variable name [`rhoe` (default), `rhotheta`]"
-  value: "rhoe"
 dt_save_to_disk:
   help: "Time between saving to disk. Examples: [`10secs`, `1hours`, `Inf` (do not save)]"
   value: "Inf"

diff --git a/post_processing/post_processing_funcs.jl b/post_processing/post_processing_funcs.jl
@@ -7,12 +7,7 @@ import ClimaCoreTempestRemap: def_space_coord
 import ClimaCoreSpectra: power_spectrum_1d, power_spectrum_2d
 import ClimaCore: Geometry, Fields, Spaces
 using LinearAlgebra: norm
-import ClimaAtmos:
-    DryModel,
-    EquilMoistModel,
-    NonEquilMoistModel,
-    PotentialTemperature,
-    TotalEnergy
+import ClimaAtmos: DryModel, EquilMoistModel, NonEquilMoistModel
 
 function process_name(s::AbstractString)
     # "c_ρ", "c_ρe", "c_uₕ_1", "c_uₕ_2", "f_w_1"

diff --git a/src/initial_conditions/InitialConditions.jl b/src/initial_conditions/InitialConditions.jl
@@ -1,7 +1,6 @@
 module InitialConditions
 
 import ..AtmosModel
-import ..PotentialTemperature
 import ..DryModel
 import ..EquilMoistModel
 import ..NonEquilMoistModel

diff --git a/src/prognostic_equations/hyperdiffusion.jl b/src/prognostic_equations/hyperdiffusion.jl
@@ -84,11 +84,8 @@ NVTX.@annotate function hyperdiffusion_tendency!(Yₜ, Y, p, t)
         C123(wgradₕ(divₕ(p.precomputed.ᶜu))) -
         C123(wcurlₕ(C123(curlₕ(p.precomputed.ᶜu))))
 
-    if :θ in propertynames(ᶜspecific)
-        @. ᶜ∇²specific_energy = wdivₕ(gradₕ(ᶜspecific.θ))
-    elseif :e_tot in propertynames(ᶜspecific)
-        @. ᶜ∇²specific_energy = wdivₕ(gradₕ(ᶜspecific.e_tot + ᶜp / Y.c.ρ))
-    end
+    @. ᶜ∇²specific_energy = wdivₕ(gradₕ(ᶜspecific.e_tot + ᶜp / Y.c.ρ))
+
     if diffuse_tke
         @. ᶜ∇²tke⁰ = wdivₕ(gradₕ(ᶜtke⁰))
     end

diff --git a/src/prognostic_equations/implicit/implicit_solver.jl b/src/prognostic_equations/implicit/implicit_solver.jl
@@ -112,7 +112,7 @@ function ImplicitEquationJacobian(
 
     is_in_Y(name) = MatrixFields.has_field(Y, name)
 
-    energy_name = (@name(c.ρe_tot),)
+    energy_name = @name(c.ρe_tot)
     tracer_names = (
         @name(c.ρq_tot),
         @name(c.ρq_liq),

diff --git a/src/prognostic_equations/implicit/implicit_tendency.jl b/src/prognostic_equations/implicit/implicit_tendency.jl
@@ -98,7 +98,7 @@ function implicit_vertical_advection_tendency!(Yₜ, Y, p, t, colidx)
             ᶠu³[colidx],
             ᶜχ[colidx],
             dt,
-            χ_name == :θ ? energy_upwinding : tracer_upwinding,
+            tracer_upwinding,
         )
     end
 

diff --git a/src/prognostic_equations/vertical_diffusion_boundary_layer.jl b/src/prognostic_equations/vertical_diffusion_boundary_layer.jl
@@ -120,8 +120,6 @@ function vertical_diffusion_boundary_layer_tendency!(
         χ_name == :e_tot && continue
         if χ_name == :q_tot
             @. ρ_flux_χ[colidx] = sfc_conditions.ρ_flux_q_tot[colidx]
-        elseif χ_name == :θ
-            @. ρ_flux_χ[colidx] = sfc_conditions.ρ_flux_θ[colidx]
         else
             @. ρ_flux_χ[colidx] = C3(FT(0))
         end

diff --git a/src/solver/types.jl b/src/solver/types.jl
@@ -6,9 +6,6 @@ struct DryModel <: AbstractMoistureModel end
 struct EquilMoistModel <: AbstractMoistureModel end
 struct NonEquilMoistModel <: AbstractMoistureModel end
 
-abstract type AbstractEnergyFormulation end
-struct PotentialTemperature <: AbstractEnergyFormulation end
-
 abstract type AbstractPrecipitationModel end
 struct NoPrecipitation <: AbstractPrecipitationModel end
 struct Microphysics0Moment <: AbstractPrecipitationModel end
@@ -229,7 +226,6 @@ struct GCMSurfaceThermoState <: AbstractSurfaceThermoState end
 # Define broadcasting for types
 Base.broadcastable(x::AbstractSurfaceThermoState) = tuple(x)
 Base.broadcastable(x::AbstractMoistureModel) = tuple(x)
-Base.broadcastable(x::AbstractEnergyFormulation) = tuple(x)
 Base.broadcastable(x::AbstractPrecipitationModel) = tuple(x)
 Base.broadcastable(x::AbstractForcing) = tuple(x)
 Base.broadcastable(x::PrognosticEDMFX) = tuple(x)

diff --git a/src/surface_conditions/SurfaceConditions.jl b/src/surface_conditions/SurfaceConditions.jl
@@ -2,7 +2,6 @@ module SurfaceConditions
 
 import ..InitialConditions as ICs
 import ..Parameters as CAP
-import ..PotentialTemperature
 import ..DryModel
 import ..ZonallyAsymmetricSST
 import ..ZonallySymmetricSST