remove TotalEnergy

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

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/src/cache/precomputed_quantities.jl b/src/cache/precomputed_quantities.jl
@@ -307,7 +307,7 @@ NVTX.@annotate function set_precomputed_quantities!(Y, p, t)
         # quantities of the form ᶜρaχ⁰ / ᶜρ and ᶜρaχʲ / ᶜρ. However, we cannot
         # compute ᶜρ⁰ and ᶜρʲ without first computing ᶜts⁰ and ᶜtsʲ, both of
         # which depend on the value of ᶜp, which in turn depends on ᶜts. Since
-        # ᶜts depends on ᶜK (at least when the energy_form is TotalEnergy), this
+        # ᶜts depends on ᶜK, this
         # means that the amount by which ᶜK needs to be incremented is a
         # function of ᶜK itself. So, unless we run a nonlinear solver here, this
         # circular dependency will prevent us from computing the exact value of

diff --git a/src/diagnostics/default_diagnostics.jl b/src/diagnostics/default_diagnostics.jl
@@ -193,7 +193,7 @@ hourly_average(short_names; output_writer = HDF5Writer()) =
 ########
 function core_default_diagnostics()
     core_diagnostics =
-        ["ts", "ta", "thetaa", "ha", "pfull", "rhoa", "ua", "va", "wa"]
+        ["ts", "ta", "thetaa", "ha", "pfull", "rhoa", "ua", "va", "wa", "hfes"]
 
     return [
         daily_averages(core_diagnostics...)...,
@@ -202,16 +202,6 @@ function core_default_diagnostics()
     ]
 end
 
-###############
-# Energy form #
-###############
-function default_diagnostics(::TotalEnergy)
-    total_energy_diagnostics = ["hfes"]
-
-    return [daily_averages(total_energy_diagnostics...)...]
-end
-
-
 ##################
 # Moisture model #
 ##################

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

diff --git a/src/solver/types.jl b/src/solver/types.jl
@@ -8,7 +8,6 @@ struct NonEquilMoistModel <: AbstractMoistureModel end
 
 abstract type AbstractEnergyFormulation end
 struct PotentialTemperature <: AbstractEnergyFormulation end
-struct TotalEnergy <: AbstractEnergyFormulation end
 
 abstract type AbstractPrecipitationModel end
 struct NoPrecipitation <: AbstractPrecipitationModel end

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