Merge #438

438: update dependencies r=juliasloan25 a=juliasloan25 Co-authored-by: Julia Sloan <jsloan@caltech.edu>
CliMA · Sep 28, 2023 · 8128fa2 · 8128fa2
2 parents a6a1aeb + e60df99
commit 8128fa2
Show file tree

Hide file tree

Showing 13 changed files with 189 additions and 180 deletions.
diff --git a/Project.toml b/Project.toml
@@ -33,7 +33,7 @@ ClimaAtmos = "0.16"
 ClimaComms = "0.5"
 ClimaCore = "0.10"
 ClimaCoreTempestRemap = "0.3"
-ClimaLSM = "0.3.2"
+ClimaLSM = "0.3"
 DocStringExtensions = "0.8, 0.9"
 Insolation = "0.6"
 JLD2 = "0.4"
@@ -43,9 +43,9 @@ Plots = "1"
 PrettyTables = "1, 2"
 SciMLBase = "1"
 StaticArrays = "1"
-SurfaceFluxes = "0.6"
+SurfaceFluxes = "0.7"
 TempestRemap_jll = "2"
 TerminalLoggers = "0.1"
-Thermodynamics = "0.10"
+Thermodynamics = "0.11"
 UnPack = "1"
 julia = "1.8"
diff --git a/experiments/AMIP/modular/Manifest.toml b/experiments/AMIP/modular/Manifest.toml
diff --git a/experiments/AMIP/modular/Project.toml b/experiments/AMIP/modular/Project.toml
@@ -52,11 +52,9 @@ ArgParse = "1.1"
 ArtifactWrappers = "0.2"
 AtmosphericProfilesLibrary = "0.1"
 CLIMAParameters = "0.4, 0.5, 0.6, 0.7"
-ClimaAtmos = "0.16"
 ClimaCorePlots = "0.2"
 ClimaCoupler = "0.1"
 ClimaTimeSteppers = "0.7"
-CloudMicrophysics = "0.10"
 Colors = "0.12"
 Dierckx = "0.5"
 DiffEqBase = "6"

diff --git a/experiments/AMIP/modular/components/land/bucket_init.jl b/experiments/AMIP/modular/components/land/bucket_init.jl
@@ -81,7 +81,7 @@ function ClimaLSM.Bucket.surface_fluxes(
     p,
     _...,
 ) where {FT <: AbstractFloat}
-    space = model.domain.surface.space
+    space = model.domain.space.surface
     return (
         lhf = ClimaCore.Fields.zeros(space),
         shf = p.bucket.turbulent_energy_flux,

diff --git a/experiments/AMIP/modular/components/land/bucket_utils.jl b/experiments/AMIP/modular/components/land/bucket_utils.jl
@@ -13,7 +13,7 @@ function make_lsm_domain(
     nelements_vert::Int,
 ) where {FT}
     @assert zlim[1] < zlim[2]
-    height = zlim[2] - zlim[1]
+    depth = zlim[2] - zlim[1]
     radius = atmos_boundary_space.topology.mesh.domain.radius
     npolynomial = ClimaCore.Spaces.Quadratures.polynomial_degree(atmos_boundary_space.quadrature_style)
     nelements_horz = atmos_boundary_space.topology.mesh.ne
@@ -28,24 +28,9 @@ function make_lsm_domain(
     verttopology = ClimaCore.Topologies.IntervalTopology(vertmesh)
     vert_center_space = ClimaCore.Spaces.CenterFiniteDifferenceSpace(verttopology)
     subsurface_space = ClimaCore.Spaces.ExtrudedFiniteDifferenceSpace(atmos_boundary_space, vert_center_space)
+    space = (; surface = atmos_boundary_space, subsurface = subsurface_space)
 
-    surface_domain = ClimaLSM.Domains.SphericalSurface{FT, typeof(atmos_boundary_space)}(
-        radius,
-        nelements[1],
-        npolynomial,
-        atmos_boundary_space,
-    )
-    subsurface_domain = ClimaLSM.Domains.SphericalShell{FT, typeof(subsurface_space)}(
-        radius,
-        height,
-        nelements,
-        npolynomial,
-        subsurface_space,
-    )
-    return ClimaLSM.Domains.LSMSphericalShellDomain{FT, typeof(subsurface_space), typeof(atmos_boundary_space)}(
-        subsurface_domain,
-        surface_domain,
-    )
+    return ClimaLSM.Domains.SphericalShell{FT}(radius, depth, nothing, nelements, npolynomial, space)
 end
 
 # extensions required by Interfacer

diff --git a/experiments/AMIP/modular/coupler_driver_modular.jl b/experiments/AMIP/modular/coupler_driver_modular.jl
@@ -122,9 +122,10 @@ parsed_args = parse_commandline(argparse_settings())
 
 ## setup coupler and model configurations
 # modify parsed args for fast testing from REPL #hide
+pkg_dir = pkgdir(ClimaCoupler)
 if isinteractive()
     parsed_args["config_file"] =
-        isnothing(parsed_args["config_file"]) ? "../../../config/model_configs/interactive_debug.yml" :
+        isnothing(parsed_args["config_file"]) ? joinpath(pkg_dir, "config/model_configs/interactive_debug.yml") :
         parsed_args["config_file"]
 end
 
@@ -156,7 +157,6 @@ restart_dir = config_dict["restart_dir"]
 restart_t = Int(config_dict["restart_t"])
 
 ## I/O directory setup
-pkg_dir = pkgdir(ClimaCoupler)
 if isinteractive()
     COUPLER_OUTPUT_DIR = joinpath("output", joinpath(mode_name, run_name)) # TempestRemap fails if interactive and paths are too long
 else

diff --git a/experiments/AMIP/moist_mpi_earth_dynamical_sea_ice/Project.toml b/experiments/AMIP/moist_mpi_earth_dynamical_sea_ice/Project.toml
@@ -20,7 +20,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 
 [compat]
-ClimaCore = "0.10"
 
 [extras]
 CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"
diff --git a/experiments/ClimaCore/Project.toml b/experiments/ClimaCore/Project.toml
@@ -18,7 +18,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 
 [compat]
-ClimaCore = "0.10"
 DiffEqCallbacks = "2.23"
 IntervalSets = "0.6"
 OrdinaryDiffEq = "6.15"

diff --git a/experiments/ClimaCore/sea-ice/Project.toml b/experiments/ClimaCore/sea-ice/Project.toml
@@ -14,6 +14,3 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
-
-[compat]
-ClimaCore = "0.10"
diff --git a/experiments/ClimaCore/tc1_heat-diffusion-with-slab/Project.toml b/experiments/ClimaCore/tc1_heat-diffusion-with-slab/Project.toml
@@ -14,6 +14,3 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
-
-[compat]
-ClimaCore = "0.10"