Skip to content

Commit 4970b80

Browse files
costachriscostachris
committed
Dennis comments
1 parent 08dad6f commit 4970b80

File tree

12 files changed

+118
-132
lines changed

12 files changed

+118
-132
lines changed

‎.buildkite/Manifest-v1.11.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is machine-generated - editing it directly is not advised
22

3-
julia_version = "1.11.5"
3+
julia_version = "1.11.4"
44
manifest_format = "2.0"
55
project_hash = "04945e2a7116cfacb2d57340f477dbe23e208227"
66

@@ -381,9 +381,9 @@ weakdeps = ["CUDA", "MPI"]
381381

382382
[[deps.ClimaCore]]
383383
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LazyBroadcast", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "UnrolledUtilities"]
384-
git-tree-sha1 = "c6ab151ea66f3756566abc039c76ae767e490446"
384+
git-tree-sha1 = "14d3d5810ce1e3c990450a2ce7abc6a1e162855f"
385385
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
386-
version = "0.14.34"
386+
version = "0.14.35"
387387
weakdeps = ["CUDA", "Krylov"]
388388

389389
[deps.ClimaCore.extensions]
@@ -946,9 +946,9 @@ version = "0.2.0"
946946

947947
[[deps.GPUCompiler]]
948948
deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "PrecompileTools", "Preferences", "Scratch", "Serialization", "TOML", "Tracy", "UUIDs"]
949-
git-tree-sha1 = "71a747c7c0137222dceb799b5643440e8eb6bfce"
949+
git-tree-sha1 = "eb1e212e12cc058fa16712082d44be499d23638c"
950950
uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
951-
version = "1.6.0"
951+
version = "1.6.1"
952952

953953
[[deps.GPUToolbox]]
954954
git-tree-sha1 = "15d8b0f5a6dca9bf8c02eeaf6687660dafa638d0"
@@ -1808,7 +1808,7 @@ version = "2.5.4+0"
18081808
[[deps.OpenLibm_jll]]
18091809
deps = ["Artifacts", "Libdl"]
18101810
uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
1811-
version = "0.8.5+0"
1811+
version = "0.8.1+4"
18121812

18131813
[[deps.OpenMPI_jll]]
18141814
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"]
@@ -1818,9 +1818,9 @@ version = "5.0.8+0"
18181818

18191819
[[deps.OpenSSL_jll]]
18201820
deps = ["Artifacts", "JLLWrappers", "Libdl"]
1821-
git-tree-sha1 = "9216a80ff3682833ac4b733caa8c00390620ba5d"
1821+
git-tree-sha1 = "87510f7292a2b21aeff97912b0898f9553cc5c2c"
18221822
uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
1823-
version = "3.5.0+0"
1823+
version = "3.5.1+0"
18241824

18251825
[[deps.OpenSpecFun_jll]]
18261826
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"]
@@ -2514,9 +2514,9 @@ version = "1.0.2"
25142514

25152515
[[deps.Thermodynamics]]
25162516
deps = ["DocStringExtensions", "KernelAbstractions", "Random", "RootSolvers"]
2517-
git-tree-sha1 = "405b993c408f425ab1ec1343eebcc06f9c713c11"
2517+
git-tree-sha1 = "94f0e8e3135840568082e62fb69d31669539e627"
25182518
uuid = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
2519-
version = "0.12.13"
2519+
version = "0.12.14"
25202520
weakdeps = ["ClimaParams"]
25212521

25222522
[deps.Thermodynamics.extensions]

‎.buildkite/pipeline.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ steps:
2929
- echo "--- Instantiate .buildkite"
3030
- "julia --project=.buildkite -e 'using Pkg; Pkg.instantiate(;verbose=true); Pkg.precompile(;strict=true); using CUDA; CUDA.precompile_runtime(); Pkg.status()'"
3131

32+
33+
3234
agents:
3335
slurm_cpus_per_task: 8
3436
slurm_gpus: 1

‎Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ArgParse = "1"
4242
Artifacts = "1"
4343
AtmosphericProfilesLibrary = "0.1.7"
4444
ClimaComms = "0.6.8"
45-
ClimaCore = "0.14.34"
45+
ClimaCore = "0.14.35"
4646
ClimaDiagnostics = "0.2.12"
4747
ClimaParams = "0.10.35"
4848
ClimaTimeSteppers = "0.8.2"

‎src/cache/cloud_fraction.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@ NVTX.@annotate function set_cloud_fraction!(
144144
# environment
145145
diagnostic_covariance_coeff = CAP.diagnostic_covariance_coeff(params)
146146

147-
ᶜmixing_length = p.scratch.ᶜtemp_scalar
148-
ᶜmixing_length .= mixing_length(Y, p)
147+
ᶜmixing_length_field = p.scratch.ᶜtemp_scalar
148+
ᶜmixing_length_field .= ᶜmixing_length(Y, p)
149149

150150
@. cloud_diagnostics_tuple = quad_loop(
151151
SG_quad,
152152
ᶜts,
153153
Geometry.WVector(p.precomputed.ᶜgradᵥ_q_tot),
154154
Geometry.WVector(p.precomputed.ᶜgradᵥ_θ_liq_ice),
155155
diagnostic_covariance_coeff,
156-
ᶜmixing_length,
156+
ᶜmixing_length_field,
157157
thermo_params,
158158
)
159159

@@ -201,16 +201,16 @@ NVTX.@annotate function set_cloud_fraction!(
201201
# environment
202202
diagnostic_covariance_coeff = CAP.diagnostic_covariance_coeff(params)
203203

204-
ᶜmixing_length = p.scratch.ᶜtemp_scalar
205-
ᶜmixing_length .= mixing_length(Y, p)
204+
ᶜmixing_length_field = p.scratch.ᶜtemp_scalar
205+
ᶜmixing_length_field .= ᶜmixing_length(Y, p)
206206

207207
@. cloud_diagnostics_tuple = quad_loop(
208208
SG_quad,
209209
ᶜts⁰,
210210
Geometry.WVector(p.precomputed.ᶜgradᵥ_q_tot⁰),
211211
Geometry.WVector(p.precomputed.ᶜgradᵥ_θ_liq_ice⁰),
212212
diagnostic_covariance_coeff,
213-
ᶜmixing_length,
213+
ᶜmixing_length_field,
214214
thermo_params,
215215
)
216216

‎src/diagnostics/Diagnostics.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ import ..PrognosticSurfaceTemperature
5858
import ..draft_area
5959
import ..compute_gm_mixing_length
6060
import ..horizontal_integral_at_boundary
61-
import ..mixing_length
62-
import ..eddy_diffusivity
63-
import ..eddy_viscosity
61+
import ..ᶜmixing_length
62+
import ..ᶜeddy_diffusivity
63+
import ..ᶜeddy_viscosity
6464
import ..turbulent_prandtl_number
6565
import ..smagorinsky_lilly_length
6666
import ..compute_eddy_diffusivity_coefficient

‎src/diagnostics/core_diagnostics.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ add_diagnostic_variable!(
279279
if isa(turbconv_model, PrognosticEDMFX) ||
280280
isa(turbconv_model, DiagnosticEDMFX) ||
281281
isa(turbconv_model, EDOnlyEDMFX)
282-
ᶜmixing_length = mixing_length(state, cache)
282+
ᶜmixing_length_field = ᶜmixing_length(state, cache)
283283
else
284284
(; params) = cache
285285
(; ᶜlinear_buoygrad, ᶜstrain_rate_norm) = cache.precomputed
@@ -291,7 +291,7 @@ add_diagnostic_variable!(
291291
ᶜstrain_rate_norm,
292292
),
293293
)
294-
ᶜmixing_length = @. lazy(
294+
ᶜmixing_length_field = @. lazy(
295295
smagorinsky_lilly_length(
296296
CAP.c_smag(params),
297297
sqrt(max(ᶜlinear_buoygrad, 0)), # N_eff
@@ -304,9 +304,9 @@ add_diagnostic_variable!(
304304

305305

306306
if isnothing(out)
307-
return copy(ᶜmixing_length)
307+
return Base.materialize(ᶜmixing_length_field)
308308
else
309-
out .= ᶜmixing_length
309+
out .= ᶜmixing_length_field
310310
end
311311
end,
312312
)

‎src/diagnostics/edmfx_diagnostics.jl

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,10 +1176,12 @@ function compute_lmixw!(
11761176
time,
11771177
turbconv_model::Union{PrognosticEDMFX, DiagnosticEDMFX},
11781178
)
1179+
ᶜwall_mixing_length = ᶜmixing_length(state, cache, Val(:wall))
1180+
11791181
if isnothing(out)
1180-
return copy(mixing_length(state, cache, :wall))
1182+
return Base.materialize(ᶜwall_mixing_length)
11811183
else
1182-
out .= mixing_length(state, cache, :wall)
1184+
out .= ᶜwall_mixing_length
11831185
end
11841186
end
11851187

@@ -1205,10 +1207,13 @@ function compute_lmixtke!(
12051207
time,
12061208
turbconv_model::Union{PrognosticEDMFX, DiagnosticEDMFX},
12071209
)
1210+
1211+
ᶜtke_mixing_length = ᶜmixing_length(state, cache, Val(:tke))
1212+
12081213
if isnothing(out)
1209-
return copy(mixing_length(state, cache, :tke))
1214+
return Base.materialize(ᶜtke_mixing_length)
12101215
else
1211-
out .= mixing_length(state, cache, :tke)
1216+
out .= ᶜtke_mixing_length
12121217
end
12131218
end
12141219

@@ -1234,10 +1239,12 @@ function compute_lmixb!(
12341239
time,
12351240
turbconv_model::Union{PrognosticEDMFX, DiagnosticEDMFX},
12361241
)
1242+
ᶜbuoy_mixing_length = ᶜmixing_length(state, cache, Val(:buoy))
1243+
12371244
if isnothing(out)
1238-
return copy(mixing_length(state, cache, :buoy))
1245+
return Base.materialize(ᶜbuoy_mixing_length)
12391246
else
1240-
out .= mixing_length(state, cache, :buoy)
1247+
out .= ᶜbuoy_mixing_length
12411248
end
12421249
end
12431250

@@ -1298,11 +1305,11 @@ function compute_edt!(
12981305
turbconv_params = CAP.turbconv_params(cache.params)
12991306
(; ᶜtke⁰) = cache.precomputed
13001307

1301-
ᶜmixing_length = mixing_length(state, cache)
1302-
ᶜK_u = eddy_viscosity(turbconv_params, ᶜtke⁰, ᶜmixing_length)
1303-
ᶜK_h = eddy_diffusivity(cache, ᶜK_u)
1308+
ᶜmixing_length_field = ᶜmixing_length(state, cache)
1309+
ᶜK_u = ᶜeddy_viscosity(turbconv_params, ᶜtke⁰, ᶜmixing_length_field)
1310+
ᶜK_h = ᶜeddy_diffusivity(cache, ᶜK_u)
13041311
if isnothing(out)
1305-
return copy(ᶜK_h)
1312+
return Base.materialize(ᶜK_h)
13061313
else
13071314
out .= ᶜK_h
13081315
end
@@ -1367,11 +1374,11 @@ function compute_evu!(
13671374
)
13681375
turbconv_params = CAP.turbconv_params(cache.params)
13691376
(; ᶜtke⁰) = cache.precomputed
1370-
ᶜmixing_length = mixing_length(state, cache)
1371-
ᶜK_u = eddy_viscosity(turbconv_params, ᶜtke⁰, ᶜmixing_length)
1377+
ᶜmixing_length_field = ᶜmixing_length(state, cache)
1378+
ᶜK_u = ᶜeddy_viscosity(turbconv_params, ᶜtke⁰, ᶜmixing_length_field)
13721379

13731380
if isnothing(out)
1374-
return copy(ᶜK_u)
1381+
return Base.materialize(ᶜK_u)
13751382
else
13761383
out .= ᶜK_u
13771384
end

0 commit comments

Comments
 (0)