Merge pull request #738 from CliMA/js/atmosv023

up Atmos, Land

Author: juliasloan25

experiments/AMIP/Manifest.toml

@@ -16,6 +16,7 @@ ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
 ClimaTimeSteppers = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
 CloudMicrophysics = "6a9e3e04-43cd-43ba-94b9-e8782df3c71b"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
+CommonDataModel = "1fbeeb36-5f17-413c-809b-666fb144f157"
 Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -52,12 +53,13 @@ ArgParse = "1.1"
 ArtifactWrappers = "0.2"
 AtmosphericProfilesLibrary = "0.1"
 ClimaAnalysis = "0.5"
-ClimaAtmos = "0.22"
+ClimaAtmos = "0.23"
 ClimaCorePlots = "0.2"
 ClimaLand = "0.11"
 ClimaParams = "0.10"
 ClimaTimeSteppers = "0.7"
 Colors = "0.12"
+CommonDataModel = "=0.3.5"
 Dierckx = "0.5"
 ForwardDiff = "0.10"
 Glob = "1"

experiments/AMIP/Project.toml

@@ -72,10 +72,10 @@ function bucket_init(
     α_snow = FT(0.8) # snow albedo
     if albedo_type == "map_static" # Read in albedo from static data file (default type)
         # By default, this uses a file containing bareground albedo without a time component. Snow albedo is specified separately.
-        albedo = CL.Bucket.PrescribedBaregroundAlbedo{FT}(α_snow, regrid_dirpath, space)
+        albedo = CL.Bucket.PrescribedBaregroundAlbedo{FT}(α_snow, space)
     elseif albedo_type == "map_temporal" # Read in albedo from data file containing data over time
         # By default, this uses a file containing linearly-interpolated monthly data of total albedo, generated by CESM2's land model (CLM).
-        albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(regrid_dirpath, date_ref, t_start, space)
+        albedo = CL.Bucket.PrescribedSurfaceAlbedo{FT}(date_ref, t_start, space)
     elseif albedo_type == "function" # Use prescribed function of lat/lon for surface albedo
         function α_bareground(coordinate_point)
             (; lat, long) = coordinate_point

experiments/AMIP/components/land/climaland_bucket.jl

@@ -943,7 +943,7 @@ if ClimaComms.iamroot(comms_ctx)
     if config_dict["ci_plots"]
         @info "Generating CI plots"
         include("user_io/ci_plots.jl")
-        make_plots(Val(:general_ci_plots), [joinpath(dir_paths.output, "clima_atmos")], dir_paths.artifacts)
+        make_plots(Val(:general_ci_plots), [atmos_sim.integrator.p.output_dir], dir_paths.artifacts)
     end
 
     ## plot all model states and coupler fields (useful for debugging) TODO: make MPI & GPU compatible