Skip to content

Commit e52f826

Browse files
committed
Use CommonGrids instead of domains
1 parent eeb7a8b commit e52f826

File tree

6 files changed

+453
-348
lines changed

6 files changed

+453
-348
lines changed

src/ClimaAtmos.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ include(joinpath("callbacks", "default_model_callbacks.jl"))
146146

147147
include(joinpath("parameters", "create_parameters.jl"))
148148

149-
include(joinpath("simulation", "domains.jl"))
149+
include(joinpath("simulation", "grids.jl"))
150150
include(joinpath("simulation", "AtmosSimulations.jl"))
151151

152152
include(joinpath("solver", "model_getters.jl")) # high-level (using parsed_args) model getters

src/simulation/AtmosSimulations.jl

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include("steady_state_velocity.jl")
1+
import ClimaCore: Grids
22

33
struct AtmosSimulation{TT, S1 <: AbstractString, S2 <: AbstractString, OW, OD}
44
job_id::S1
@@ -53,10 +53,10 @@ future work:
5353

5454
function AtmosSimulation{FT}(;
5555
model = AtmosModel(),
56-
domain::AtmosDomain = SphereDomain{FT}(),
5756
params::Parameters.ClimaAtmosParameters = ClimaAtmosParameters(FT),
58-
initial_condition::ICs.InitialCondition = InitialConditions.DecayingProfile(),
5957
comms_ctx::ClimaComms.AbstractCommsContext = ClimaComms.context(),
58+
grid::Grids.AbstractGrid = SphereGrid(FT, params, comms_ctx),
59+
initial_condition::ICs.InitialCondition = InitialConditions.DecayingProfile(),
6060
dt = 600,
6161
start_date = DateTime(2010, 1, 1),
6262
t_start = 0,
@@ -119,7 +119,7 @@ function AtmosSimulation{FT}(;
119119
)
120120
spaces = get_spaces_restart(Y)
121121
else
122-
spaces = get_spaces(domain, params, comms_ctx)
122+
spaces = get_spaces(grid, params, comms_ctx)
123123
Y = ICs.atmos_state(
124124
initial_condition(params), model,
125125
spaces.center_space,
@@ -130,9 +130,11 @@ function AtmosSimulation{FT}(;
130130
)
131131
end
132132

133-
steady_state_velocity = get_steady_state_velocity(
134-
domain, initial_condition, params, Y; check_steady_state,
135-
)
133+
# TODO: Deal with not having topography
134+
steady_state_velocity = nothing
135+
# get_steady_state_velocity(
136+
# params, Y, topography, initial_condition, mesh_warp_type,
137+
# )
136138

137139
p = build_cache(
138140
Y, model, params, surface_setup, dt, start_date, tracers,

src/simulation/domains.jl

Lines changed: 0 additions & 226 deletions
This file was deleted.

0 commit comments

Comments
 (0)