Merge pull request #4109 from CliMA/as/up-sfcompat

Update SurfaceFluxes compat entry (support v0.14.1)

Author: szy21

.buildkite/Manifest-v1.11.toml

@@ -2571,10 +2571,10 @@ uuid = "bea87d4a-7f5b-5778-9afe-8cc45184846c"
 version = "7.7.0+0"
 
 [[deps.SurfaceFluxes]]
-deps = ["DocStringExtensions", "RootSolvers", "Thermodynamics"]
-git-tree-sha1 = "4a28939fa34ce9b45f693f33bbe956d1b2903ba2"
+deps = ["RootSolvers", "Thermodynamics"]
+git-tree-sha1 = "eef0657172ea2da3c7a476d8c4e5655fd77fbaf0"
 uuid = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
-version = "0.13.1"
+version = "0.14.1"
 weakdeps = ["ClimaParams"]
 
     [deps.SurfaceFluxes.extensions]

Project.toml

@@ -68,7 +68,7 @@ SciMLBase = "~2.108, ~2.109, ~2.110, ~2.111, ~2.112"
 SparseMatrixColorings = "0.4.20"
 StaticArrays = "1.9"
 Statistics = "1"
-SurfaceFluxes = "0.12.3, 0.13"
+SurfaceFluxes = "0.12.3, 0.13, 0.14.1"
 Thermodynamics = "0.14.1, 0.15"
 UnrolledUtilities = "0.1.9"
 YAML = "0.4"

reproducibility_tests/ref_counter.jl

@@ -1,4 +1,4 @@
-276
+277
 
 # **README**
 #
@@ -20,6 +20,9 @@
 
 
 #=
+277
+- Update to use [email protected]. Supports Charnock-parameterization for aerodynamic roughness (default is still user-prescribed ScalarRoughness). SurfaceFluxes catch for neutrally-stable boundary layers (ζ ≈ 0) removed. 
+
 276
 - Update prognostic EDMF boundary conditions: apply equal surface fluxes to the
   updraft and grid mean, and enable entrainment of buoyant air in the first cell.

src/surface_conditions/surface_conditions.jl

@@ -259,7 +259,7 @@ function surface_state_to_conditions(
             interior_values,
             surface_values,
             parameterization.Cd,
-            parameterization.Ch,
+            parameterization.Ch;
             gustiness,
             beta,
         )
@@ -274,7 +274,7 @@ function surface_state_to_conditions(
                 interior_values,
                 surface_values,
                 parameterization.z0m,
-                parameterization.z0b,
+                parameterization.z0b;
                 gustiness,
                 beta,
             )
@@ -327,7 +327,7 @@ function surface_state_to_conditions(
                     shf,
                     lhf,
                     parameterization.z0m,
-                    parameterization.z0b,
+                    parameterization.z0b;
                     gustiness,
                 )
             else
@@ -338,7 +338,7 @@ function surface_state_to_conditions(
                     lhf,
                     parameterization.ustar,
                     parameterization.z0m,
-                    parameterization.z0m,
+                    parameterization.z0m;
                     gustiness,
                 )
             end

test/coupler_compatibility.jl

@@ -188,9 +188,9 @@ end
             interior_values,
             surface_values,
             FT(z0m),
-            FT(z0b),
-            FT(gustiness),
-            FT(beta),
+            FT(z0b);
+            gustiness = FT(gustiness),
+            beta = FT(beta),
         )
         return SF.surface_conditions(surface_params, surface_inputs)
     end