Skip to content

Commit 6bbde8a

Browse files
committed
up Atmos, Land
1 parent c5dfb63 commit 6bbde8a

File tree

8 files changed

+603
-1155
lines changed

8 files changed

+603
-1155
lines changed

experiments/AMIP/Manifest.toml

Lines changed: 290 additions & 585 deletions
Large diffs are not rendered by default.

experiments/AMIP/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ ArgParse = "1.1"
5252
ArtifactWrappers = "0.2"
5353
AtmosphericProfilesLibrary = "0.1"
5454
ClimaAnalysis = "0.5"
55-
ClimaAtmos = "0.22"
55+
ClimaAtmos = "0.23"
5656
ClimaCorePlots = "0.2"
5757
ClimaLand = "0.11"
5858
ClimaParams = "0.10"

experiments/AMIP/components/land/climaland_bucket.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ function bucket_init(
7272
α_snow = FT(0.8) # snow albedo
7373
if albedo_type == "map_static" # Read in albedo from static data file (default type)
7474
# By default, this uses a file containing bareground albedo without a time component. Snow albedo is specified separately.
75-
albedo = CL.Bucket.PrescribedBaregroundAlbedo{FT}(α_snow, regrid_dirpath, space)
75+
albedo = CL.Bucket.PrescribedBaregroundAlbedo{FT}(α_snow, space)
7676
elseif albedo_type == "map_temporal" # Read in albedo from data file containing data over time
7777
# By default, this uses a file containing linearly-interpolated monthly data of total albedo, generated by CESM2's land model (CLM).
78-
albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(regrid_dirpath, date_ref, t_start, space)
78+
albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(date_ref, t_start, space)
7979
elseif albedo_type == "function" # Use prescribed function of lat/lon for surface albedo
8080
function α_bareground(coordinate_point)
8181
(; lat, long) = coordinate_point

experiments/AMIP/coupler_driver.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ if ClimaComms.iamroot(comms_ctx)
943943
if config_dict["ci_plots"]
944944
@info "Generating CI plots"
945945
include("user_io/ci_plots.jl")
946-
make_plots(Val(:general_ci_plots), [joinpath(dir_paths.output, "clima_atmos")], dir_paths.artifacts)
946+
make_plots(Val(:general_ci_plots), [atmos_sim.integrator.p.output_dir], dir_paths.artifacts)
947947
end
948948

949949
## plot all model states and coupler fields (useful for debugging) TODO: make MPI & GPU compatible

experiments/ClimaCore/sea_breeze/Manifest.toml

Lines changed: 152 additions & 174 deletions
Large diffs are not rendered by default.

perf/Manifest.toml

Lines changed: 155 additions & 390 deletions
Large diffs are not rendered by default.

perf/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
4646
ArgParse = "1.1"
4747
ArtifactWrappers = "0.2"
4848
AtmosphericProfilesLibrary = "0.1"
49-
ClimaAtmos = "0.22"
49+
ClimaAtmos = "0.23"
5050
ClimaCorePlots = "0.2"
5151
ClimaLand = "0.11"
5252
ClimaParams = "0.10"

test/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
4040
[compat]
4141
Aqua = "0.8"
4242
ArtifactWrappers = "0.2"
43-
ClimaAtmos = "0.22"
43+
ClimaAtmos = "0.23"
4444
ClimaLand = "0.11"
4545
ClimaParams = "0.10"
4646
CommonDataModel = "=0.3.5"

0 commit comments

Comments
 (0)