From 486b195455a7c83c8bd2ba605e09c88bf8cb77e5 Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Wed, 27 Oct 2021 10:38:58 -0700 Subject: [PATCH] Prep some things for using OrdinaryDiffEq.jl --- integration_tests/utils/initial_conditions.jl | 2 ++ integration_tests/utils/main.jl | 5 +++++ src/TurbulenceConvection.jl | 1 + 3 files changed, 8 insertions(+) diff --git a/integration_tests/utils/initial_conditions.jl b/integration_tests/utils/initial_conditions.jl index 3f8658b768..0f848e1d13 100644 --- a/integration_tests/utils/initial_conditions.jl +++ b/integration_tests/utils/initial_conditions.jl @@ -40,6 +40,7 @@ function initialize_updrafts(edmf, grid, state, up::TC.UpdraftVariables, gm::TC. aux_gm = TC.center_aux_grid_mean(state) prog_up = TC.center_prog_updrafts(state) prog_up_f = TC.face_prog_updrafts(state) + ρ0_c = TC.center_ref_state(state).ρ0 @inbounds for i in 1:(up.n_updrafts) @inbounds for k in TC.real_face_indices(grid) aux_up_f[i].w[k] = 0 @@ -62,6 +63,7 @@ function initialize_updrafts(edmf, grid, state, up::TC.UpdraftVariables, gm::TC. end aux_up[i].area[kc_surf] = up.updraft_fraction / up.n_updrafts + prog_up[i].ρarea[kc_surf] = ρ0_c[kc_surf] * aux_up[i].area[kc_surf] end return end diff --git a/integration_tests/utils/main.jl b/integration_tests/utils/main.jl index 8af951974f..7f0ddae7b1 100644 --- a/integration_tests/utils/main.jl +++ b/integration_tests/utils/main.jl @@ -2,12 +2,17 @@ import Logging import TerminalLoggers Logging.global_logger(TerminalLoggers.TerminalLogger()) +import UnPack import JSON import ArgParse import TurbulenceConvection + import ClimaCore const CC = ClimaCore +import OrdinaryDiffEq +const ODE = OrdinaryDiffEq + include("initial_conditions.jl") include("parameter_set.jl") include("Cases.jl") diff --git a/src/TurbulenceConvection.jl b/src/TurbulenceConvection.jl index 9ecccdae20..6117acfcb6 100644 --- a/src/TurbulenceConvection.jl +++ b/src/TurbulenceConvection.jl @@ -18,6 +18,7 @@ import CLIMAParameters import OrdinaryDiffEq import CloudMicrophysics import SurfaceFluxes +import UnPack const ODE = OrdinaryDiffEq const CC = ClimaCore