Skip to content

Commit

Permalink
Add support for ClimaCore 0.14
Browse files Browse the repository at this point in the history
  • Loading branch information
Sbozzolo committed May 6, 2024
1 parent afea217 commit 3119b07
Show file tree
Hide file tree
Showing 6 changed files with 306 additions and 263 deletions.
6 changes: 6 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ ClimaLand.jl Release Notes
main
--------

v0.11.3
--------

- Updated to ClimaComms 0.6 and ClimaCore 0.14. Now, `CUDA` and `MPI` are no
longer automatically installed.

v0.11.2
--------
- Add profiling of soil/canopy model to buildkite pipeline. This was the
Expand Down
34 changes: 21 additions & 13 deletions experiments/standalone/Bucket/global_bucket_function.jl
Original file line number Diff line number Diff line change
Expand Up @@ -174,30 +174,38 @@ hcoords = [Geometry.LatLongPoint(lat, long) for long in longpts, lat in latpts]
remapper = Remapping.Remapper(space, hcoords)

W = [
Remapping.interpolate(remapper, sol.u[k].bucket.W) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.W)) for
k in 1:length(sol.t)
];
Ws = [
Remapping.interpolate(remapper, sol.u[k].bucket.Ws) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.Ws)) for
k in 1:length(sol.t)
];
σS = [
Remapping.interpolate(remapper, sol.u[k].bucket.σS) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.σS)) for
k in 1:length(sol.t)
];
T_sfc = [
Remapping.interpolate(remapper, saved_values.saveval[k].bucket.T_sfc)
for k in 1:length(sol.t)
Array(
Remapping.interpolate(remapper, saved_values.saveval[k].bucket.T_sfc),
) for k in 1:length(sol.t)
];
evaporation = [
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.turbulent_fluxes.vapor_flux,
Array(
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.turbulent_fluxes.vapor_flux,
),
) for k in 1:length(sol.t)
];
F_sfc = [
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.R_n .+
saved_values.saveval[k].bucket.turbulent_fluxes.lhf .+
saved_values.saveval[k].bucket.turbulent_fluxes.shf,
Array(
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.R_n .+
saved_values.saveval[k].bucket.turbulent_fluxes.lhf .+
saved_values.saveval[k].bucket.turbulent_fluxes.shf,
),
) for k in 1:length(sol.t)
];

Expand Down
34 changes: 21 additions & 13 deletions experiments/standalone/Bucket/global_bucket_staticmap.jl
Original file line number Diff line number Diff line change
Expand Up @@ -258,30 +258,38 @@ hcoords = [Geometry.LatLongPoint(lat, long) for long in longpts, lat in latpts]
remapper = Remapping.Remapper(space, hcoords)

W = [
Remapping.interpolate(remapper, sol.u[k].bucket.W) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.W)) for
k in 1:length(sol.t)
];
Ws = [
Remapping.interpolate(remapper, sol.u[k].bucket.Ws) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.Ws)) for
k in 1:length(sol.t)
];
σS = [
Remapping.interpolate(remapper, sol.u[k].bucket.σS) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.σS)) for
k in 1:length(sol.t)
];
T_sfc = [
Remapping.interpolate(remapper, saved_values.saveval[k].bucket.T_sfc)
for k in 1:length(sol.t)
Array(
Remapping.interpolate(remapper, saved_values.saveval[k].bucket.T_sfc),
) for k in 1:length(sol.t)
];
evaporation = [
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.turbulent_fluxes.vapor_flux,
Array(
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.turbulent_fluxes.vapor_flux,
),
) for k in 1:length(sol.t)
];
F_sfc = [
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.R_n .+
saved_values.saveval[k].bucket.turbulent_fluxes.lhf .+
saved_values.saveval[k].bucket.turbulent_fluxes.shf,
Array(
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.R_n .+
saved_values.saveval[k].bucket.turbulent_fluxes.lhf .+
saved_values.saveval[k].bucket.turbulent_fluxes.shf,
),
) for k in 1:length(sol.t)
];

Expand Down
34 changes: 21 additions & 13 deletions experiments/standalone/Bucket/global_bucket_temporalmap.jl
Original file line number Diff line number Diff line change
Expand Up @@ -240,30 +240,38 @@ hcoords = [Geometry.LatLongPoint(lat, long) for long in longpts, lat in latpts]
remapper = Remapping.Remapper(space, hcoords)

W = [
Remapping.interpolate(remapper, sol.u[k].bucket.W) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.W)) for
k in 1:length(sol.t)
];
Ws = [
Remapping.interpolate(remapper, sol.u[k].bucket.Ws) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.Ws)) for
k in 1:length(sol.t)
];
σS = [
Remapping.interpolate(remapper, sol.u[k].bucket.σS) for k in 1:length(sol.t)
Array(Remapping.interpolate(remapper, sol.u[k].bucket.σS)) for
k in 1:length(sol.t)
];
T_sfc = [
Remapping.interpolate(remapper, saved_values.saveval[k].bucket.T_sfc)
for k in 1:length(sol.t)
Array(
Remapping.interpolate(remapper, saved_values.saveval[k].bucket.T_sfc),
) for k in 1:length(sol.t)
];
evaporation = [
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.turbulent_fluxes.vapor_flux,
Array(
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.turbulent_fluxes.vapor_flux,
),
) for k in 1:length(sol.t)
];
F_sfc = [
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.R_n .+
saved_values.saveval[k].bucket.turbulent_fluxes.lhf .+
saved_values.saveval[k].bucket.turbulent_fluxes.shf,
Array(
Remapping.interpolate(
remapper,
saved_values.saveval[k].bucket.R_n .+
saved_values.saveval[k].bucket.turbulent_fluxes.lhf .+
saved_values.saveval[k].bucket.turbulent_fluxes.shf,
),
) for k in 1:length(sol.t)
];

Expand Down
1 change: 0 additions & 1 deletion test/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"

[compat]
Aqua = "0.8"
Expand Down
Loading

0 comments on commit 3119b07

Please sign in to comment.