Skip to content

Commit fce2dff

Browse files
committed
Remove ClimaLand pkgversion checks
This commit removes two if statements that checked the version of ClimaLand being used. These were used to ensure backwards compaibily with previous ClimaLand versions. This is no longer needed because the lower compat bound is changed in commit 37a7e2c
1 parent cf58549 commit fce2dff

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

experiments/ClimaEarth/components/land/climaland_bucket.jl

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,12 @@ function BucketSimulation(
100100
albedo = CL.Bucket.PrescribedBaregroundAlbedo{FT}(α_snow, surface_space)
101101
elseif albedo_type == "map_temporal" # Read in albedo from data file containing data over time
102102
# By default, this uses a file containing linearly-interpolated monthly data of clear-sky albedo, generated from CERES.
103-
if pkgversion(CL) < v"0.15"
104-
albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(start_date, tspan[1], surface_space)
105-
else
106-
albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(
107-
start_date,
108-
surface_space;
109-
albedo_file_path = CL.Artifacts.ceres_albedo_dataset_path(),
110-
varname = "sw_alb_clr",
111-
)
112-
end
103+
albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(
104+
start_date,
105+
surface_space;
106+
albedo_file_path = CL.Artifacts.ceres_albedo_dataset_path(),
107+
varname = "sw_alb_clr",
108+
)
113109
elseif albedo_type == "function" # Use prescribed function of lat/lon for surface albedo
114110
function α_bareground(coordinate_point)
115111
(; lat, long) = coordinate_point

experiments/ClimaEarth/components/land/climaland_helpers.jl

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,13 @@ function make_land_domain(
7272

7373
fields = CL.Domains.get_additional_coordinate_field_data(subsurface_space)
7474

75-
if pkgversion(CL) < v"0.16.0"
76-
return CL.Domains.SphericalShell{FT}(radius, depth, dz_tuple, nelements, npolynomial, space, fields)
77-
else
78-
return CL.Domains.SphericalShell{FT, typeof(space), typeof(fields)}(
79-
radius,
80-
depth,
81-
dz_tuple,
82-
nelements,
83-
npolynomial,
84-
space,
85-
fields,
86-
)
87-
end
75+
return CL.Domains.SphericalShell{FT, typeof(space), typeof(fields)}(
76+
radius,
77+
depth,
78+
dz_tuple,
79+
nelements,
80+
npolynomial,
81+
space,
82+
fields,
83+
)
8884
end

0 commit comments

Comments
 (0)