Skip to content

Commit

Permalink
Handle views in comparing restarts
Browse files Browse the repository at this point in the history
  • Loading branch information
Sbozzolo committed Oct 2, 2024
1 parent 7b8d32d commit a8426cf
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions test/restart.jl
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ ClimaComms.init(comms_ctx)
# different.
#
# For this reason, we don't use Test but just print to screen the differences.
# However, we still have to return an exit code with failure in case of the
# comparison fails.

"""
_error(arr1::AbstractArray, arr2::AbstractArray; ABS_TOL = 100eps(eltype(arr1)))
Expand Down Expand Up @@ -153,6 +151,17 @@ function _compare(pass, v1::T, v2::T; name, ignore) where {T <: AbstractData}
return pass && _compare(parent(v1), parent(v2); name, ignore)
end

# Handle views
function _compare(
pass,
v1::SubArray{FT},
v2::SubArray{FT};
name,
ignore,
) where {FT <: AbstractFloat}
return pass && _compare(collect(v1), collect(v2); name, ignore)
end

function _compare(
v1::AbstractArray{FT},
v2::AbstractArray{FT};
Expand Down Expand Up @@ -302,13 +311,13 @@ for configuration in configurations
topography = "Earth"
turbconv_models = [nothing, "diagnostic_edmfx"]
# turbconv_models = ["prognostic_edmfx"]
radiations = [nothing]
radiations = [nothing, "gray"]
else
moistures = ["equil"]
precips = ["1M"]
topography = "NoWarp"
turbconv_models = ["diagnostic_edmfx"]
radiations = [nothing]
radiations = ["gray"]
end

for turbconv_mode in turbconv_models
Expand Down

0 comments on commit a8426cf

Please sign in to comment.