From bb8c0504ff809329a3a89f9ad40ee5a9ee26eeb1 Mon Sep 17 00:00:00 2001 From: Gabriele Bozzola Date: Wed, 13 Sep 2023 14:33:18 -0700 Subject: [PATCH] Remove explicit reference to ClimaAtmos in imports https://github.com/CliMA/policies/wiki/Software-Design-Patterns-(SDPs)#avoid-using-somepkg--import-somepkg-in-src --- src/cache/cache.jl | 2 +- src/cache/temporary_quantities.jl | 2 +- src/callbacks/callbacks.jl | 4 ++-- src/prognostic_equations/dss.jl | 2 +- src/prognostic_equations/limited_tendencies.jl | 2 +- src/utils/discrete_hydrostatic_balance.jl | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cache/cache.jl b/src/cache/cache.jl index 9dd02af896..afc0dd8364 100644 --- a/src/cache/cache.jl +++ b/src/cache/cache.jl @@ -1,6 +1,6 @@ using LinearAlgebra: ×, norm, dot -import ClimaAtmos.Parameters as CAP +import .Parameters as CAP using ClimaCore: Operators, Fields, Limiters, Geometry, Spaces import ClimaComms diff --git a/src/cache/temporary_quantities.jl b/src/cache/temporary_quantities.jl index 38f34ca221..c666866b90 100644 --- a/src/cache/temporary_quantities.jl +++ b/src/cache/temporary_quantities.jl @@ -1,6 +1,6 @@ using LinearAlgebra: ×, norm, dot -import ClimaAtmos.Parameters as CAP +import .Parameters as CAP using ClimaCore: Operators, Fields, Limiters, Geometry, Spaces import ClimaComms diff --git a/src/callbacks/callbacks.jl b/src/callbacks/callbacks.jl index 1a851275d5..dc2c483ff1 100644 --- a/src/callbacks/callbacks.jl +++ b/src/callbacks/callbacks.jl @@ -1,5 +1,5 @@ import ClimaCore.DataLayouts as DL -import ClimaAtmos.RRTMGPInterface as RRTMGPI +import .RRTMGPInterface as RRTMGPI import Thermodynamics as TD import LinearAlgebra import ClimaCore.Fields @@ -7,7 +7,7 @@ import ClimaComms import ClimaCore as CC import ClimaCore.Spaces import SciMLBase -import ClimaAtmos.Parameters as CAP +import .Parameters as CAP import DiffEqCallbacks as DECB import ClimaCore: InputOutput import Dates diff --git a/src/prognostic_equations/dss.jl b/src/prognostic_equations/dss.jl index e865eedc5e..1d7c08a423 100644 --- a/src/prognostic_equations/dss.jl +++ b/src/prognostic_equations/dss.jl @@ -1,6 +1,6 @@ using LinearAlgebra: ×, norm, dot -import ClimaAtmos.Parameters as CAP +import .Parameters as CAP using ClimaCore: Operators, Fields, Limiters, Geometry, Spaces import ClimaComms diff --git a/src/prognostic_equations/limited_tendencies.jl b/src/prognostic_equations/limited_tendencies.jl index f9ec8c735a..811c153c7d 100644 --- a/src/prognostic_equations/limited_tendencies.jl +++ b/src/prognostic_equations/limited_tendencies.jl @@ -1,6 +1,6 @@ using LinearAlgebra: ×, norm, dot -import ClimaAtmos.Parameters as CAP +import .Parameters as CAP using ClimaCore: Operators, Fields, Limiters, Geometry, Spaces import ClimaComms diff --git a/src/utils/discrete_hydrostatic_balance.jl b/src/utils/discrete_hydrostatic_balance.jl index 1ab427d2b6..57a45f47d1 100644 --- a/src/utils/discrete_hydrostatic_balance.jl +++ b/src/utils/discrete_hydrostatic_balance.jl @@ -2,7 +2,7 @@ import Thermodynamics as TD import ClimaCore.Geometry as Geometry import ClimaCore.Fields as Fields import ClimaCore.Spaces as Spaces -import ClimaAtmos.InitialConditions as ICs +import .InitialConditions as ICs """ set_discrete_hydrostatic_balanced_state!(Y, p)