Merge branch 'main' into glw/density-example

CliMA · Jan 24, 2024 · 5d1ab4e · 5d1ab4e
2 parents 29b219d + 1701c9a
commit 5d1ab4e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Thermodynamics"
 uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 authors = ["Climate Modeling Alliance"]
-version = "0.11.4"
+version = "0.11.5"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"

diff --git a/src/relations.jl b/src/relations.jl
@@ -2954,7 +2954,7 @@ Virtual dry static energy, given
     T_0::FT = TP.T_0(param_set)
     cp_d::FT = TP.cp_d(param_set)
     T_virt = virtual_temperature(param_set, ts)
-    return cp_d * (T_virt - T_0) + e_pot
+    return cp_d * T_virt + e_pot
 end
 
 """

diff --git a/test/relations.jl b/test/relations.jl
@@ -647,7 +647,6 @@ end
 
         e_tot = total_energy.(param_set, ts, e_kin, e_pot)
         _cp_d = FT(TP.cp_d(param_set))
-        _T_0 = FT(TP.T_0(param_set))
         @test all(
             specific_enthalpy.(param_set, ts) .≈
             e_int .+
@@ -667,7 +666,7 @@ end
         )
         @test all(
             virtual_dry_static_energy.(param_set, ts, e_pot) .≈
-            _cp_d .* (virtual_temperature.(param_set, ts) .- _T_0) .+ e_pot,
+            _cp_d .* virtual_temperature.(param_set, ts) .+ e_pot,
         )
 
         # PhaseEquil