Skip to content

Commit

Permalink
Merge pull request #903 from CliMA/as/up-ca-patch
Browse files Browse the repository at this point in the history 
Release Coupler v0.1.1 + update compat following ClimaAtmos 0.27.2 patch release
  • Loading branch information
@AlexisRenchon
AlexisRenchon authored Aug 1, 2024
2 parents 9de314e + 92cc860 commit ecccb94
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 50 deletions.
2 changes: 1 addition & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ClimaCoupler"
uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
authors = ["CliMA Contributors <clima-software@caltech.edu>"]
version = "0.1.0"
version = "0.1.1"

[deps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Expand Down
52 changes: 35 additions & 17 deletions experiments/ClimaEarth/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.10.4"
manifest_format = "2.0"
project_hash = "81777e8e74b7c019cb52af8f085df74a2aaaefbe"
project_hash = "26bc87e2a5206094ca53b64409eb5da90aa13fe5"

[[deps.ADTypes]]
git-tree-sha1 = "aa4d425271a914d8c4af6ad9fccb6eb3aec662c7"
Expand Down Expand Up @@ -32,9 +32,9 @@ version = "0.4.5"

[[deps.Accessors]]
deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Markdown", "Test"]
git-tree-sha1 = "c0d491ef0b135fd7d63cbc6404286bc633329425"
git-tree-sha1 = "f61b15be1d76846c0ce31d3fcfac5380ae53db6a"
uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
version = "0.1.36"
version = "0.1.37"

[deps.Accessors.extensions]
AccessorsAxisKeysExt = "AxisKeys"
Expand Down Expand Up @@ -374,7 +374,7 @@ version = "0.3.15"
deps = ["CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "DocStringExtensions", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"]
path = "../.."
uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
version = "0.1.0"
version = "0.1.1"

[[deps.ClimaDiagnostics]]
deps = ["Accessors", "ClimaComms", "ClimaCore", "Dates", "NCDatasets", "SciMLBase"]
Expand Down Expand Up @@ -472,9 +472,9 @@ version = "0.4.0"

[[deps.ColorSchemes]]
deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"]
git-tree-sha1 = "4b270d6465eb21ae89b732182c20dc165f8bf9f2"
git-tree-sha1 = "b5278586822443594ff615963b0c09755771b3e0"
uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
version = "3.25.0"
version = "3.26.0"

[[deps.ColorTypes]]
deps = ["FixedPointNumbers", "Random"]
Expand Down Expand Up @@ -562,9 +562,9 @@ version = "2.4.2"

[[deps.ConstructionBase]]
deps = ["LinearAlgebra"]
git-tree-sha1 = "260fd2400ed2dab602a7c15cf10c1933c59930a2"
git-tree-sha1 = "d8a9c0b6ac2d9081bf76324b39c78ca3ce4f0c98"
uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
version = "1.5.5"
version = "1.5.6"
weakdeps = ["IntervalSets", "StaticArrays"]

[deps.ConstructionBase.extensions]
Expand Down Expand Up @@ -1050,16 +1050,16 @@ uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
version = "0.26.7"

[[deps.GR]]
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
git-tree-sha1 = "3e527447a45901ea392fe12120783ad6ec222803"
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Qt6Wayland_jll", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
git-tree-sha1 = "629693584cef594c3f6f99e76e7a7ad17e60e8d5"
uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
version = "0.73.6"
version = "0.73.7"

[[deps.GR_jll]]
deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"]
git-tree-sha1 = "182c478a179b267dd7a741b6f8f4c3e0803795d6"
git-tree-sha1 = "a8863b69c2a0859f2c2c87ebdc4c6712e88bdf0d"
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
version = "0.73.6+0"
version = "0.73.7+0"

[[deps.GaussQuadrature]]
deps = ["SpecialFunctions"]
Expand Down Expand Up @@ -2297,6 +2297,24 @@ git-tree-sha1 = "492601870742dcd38f233b23c3ec629628c1d724"
uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56"
version = "6.7.1+1"

[[deps.Qt6Declarative_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6ShaderTools_jll"]
git-tree-sha1 = "e5dd466bf2569fe08c91a2cc29c1003f4797ac3b"
uuid = "629bc702-f1f5-5709-abd5-49b8460ea067"
version = "6.7.1+2"

[[deps.Qt6ShaderTools_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll"]
git-tree-sha1 = "1a180aeced866700d4bebc3120ea1451201f16bc"
uuid = "ce943373-25bb-56aa-8eca-768745ed7b5a"
version = "6.7.1+1"

[[deps.Qt6Wayland_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6Declarative_jll"]
git-tree-sha1 = "729927532d48cf79f49070341e1d918a65aba6b0"
uuid = "e99dba38-086e-5de3-a5b1-6e4c66e897c3"
version = "6.7.1+1"

[[deps.QuadGK]]
deps = ["DataStructures", "LinearAlgebra"]
git-tree-sha1 = "9b23c31e76e333e6fb4c1595ae6afa74966a729e"
Expand Down Expand Up @@ -2466,9 +2484,9 @@ version = "3.45.3+0"

[[deps.SciMLBase]]
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
git-tree-sha1 = "7a38aa94aaf425ab68b96f373cd036a204eaf04b"
git-tree-sha1 = "4345907b161ed71358fd343f8d9d178b68bb185a"
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
version = "2.43.0"
version = "2.43.1"

[deps.SciMLBase.extensions]
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
Expand Down Expand Up @@ -2857,9 +2875,9 @@ uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
version = "0.5.24"

[[deps.TranscodingStreams]]
git-tree-sha1 = "60df3f8126263c0d6b357b9a1017bb94f53e3582"
git-tree-sha1 = "96612ac5365777520c3c5396314c8cf7408f436a"
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
version = "0.11.0"
version = "0.11.1"
weakdeps = ["Random", "Test"]

[deps.TranscodingStreams.extensions]
Expand Down
17 changes: 4 additions & 13 deletions experiments/ClimaEarth/run_amip.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,15 +489,6 @@ Note, this will be replaced by the diagnostics framework currently in ClimaAtmos
into a more general package, so we can use it to save fields from surface models.
=#
if use_coupler_diagnostics
monthly_3d_diags = Diagnostics.init_diagnostics(
(:T, :u, :q_tot, :q_liq_ice),
atmos_sim.domain.center_space;
save = TimeManager.Monthly(),
operations = (; accumulate = Diagnostics.TimeMean([Int(0)])),
output_dir = COUPLER_OUTPUT_DIR,
name_tag = "monthly_mean_3d_",
)

monthly_3d_diags = Diagnostics.init_diagnostics(
(:T, :u, :q_tot, :q_liq_ice),
atmos_sim.domain.center_space;
Expand All @@ -508,7 +499,7 @@ if use_coupler_diagnostics
)

monthly_2d_diags = Diagnostics.init_diagnostics(
(:precipitation_rate, :toa_fluxes, :T_sfc, :tubulent_energy_fluxes),
(:precipitation_rate, :toa_fluxes, :T_sfc, :turbulent_energy_fluxes),
boundary_space;
save = TimeManager.Monthly(),
operations = (; accumulate = Diagnostics.TimeMean([Int(0)])),
Expand Down Expand Up @@ -915,7 +906,7 @@ if ClimaComms.iamroot(comms_ctx)
toa_fluxes = (:regrid, :horizontal_slice),
precipitation_rate = (:regrid, :horizontal_slice),
T_sfc = (:regrid, :horizontal_slice),
tubulent_energy_fluxes = (:regrid, :horizontal_slice),
turbulent_energy_fluxes = (:regrid, :horizontal_slice),
q_liq_ice = (:regrid, :zonal_mean),
)

Expand All @@ -926,7 +917,7 @@ if ClimaComms.iamroot(comms_ctx)
toa_fluxes = (; clims = (-250, 250), units = "W/m^2"),
precipitation_rate = (clims = (0, 1e-4), units = "kg/m^2/s"),
T_sfc = (clims = (225, 310), units = "K"),
tubulent_energy_fluxes = (; clims = (-250, 250), units = "W/m^2"),
turbulent_energy_fluxes = (; clims = (-250, 250), units = "W/m^2"),
q_liq_ice = (; clims = (0, 10), units = "g/kg"),
)
amip_data, fig_amip = amip_paperplots(
Expand All @@ -947,7 +938,7 @@ if ClimaComms.iamroot(comms_ctx)
toa_fluxes = (:horizontal_slice,),
precipitation_rate = (:horizontal_slice,),
T_sfc = (:horizontal_slice,),
tubulent_energy_fluxes = (:horizontal_slice,),
turbulent_energy_fluxes = (:horizontal_slice,),
)
ncep_plot_spec = plot_spec
ncep_data, fig_ncep = ncep_paperplots(
Expand Down
2 changes: 1 addition & 1 deletion experiments/ClimaEarth/user_io/ncep_visualizer.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function Diagnostics.get_var(data_source::NCEPMonthlyDataSource, ::Val{:T_sfc})
return (t_celsius .+ 273.15, coords)
end

function Diagnostics.get_var(data_source::NCEPMonthlyDataSource, ::Val{:tubulent_energy_fluxes})
function Diagnostics.get_var(data_source::NCEPMonthlyDataSource, ::Val{:turbulent_energy_fluxes})
https = "https://downloads.psl.noaa.gov/Datasets/ncep.reanalysis2/Monthlies/gaussian_grid/lhtfl.sfc.mon.mean.nc"
ncep_vname = "lhtfl"
lhtfl, coords = download_read_nc(data_source, https, ncep_vname)
Expand Down
4 changes: 2 additions & 2 deletions experiments/ClimaEarth/user_io/user_diagnostics.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:T_sfc}) =
Utilities.swap_space!(cs.boundary_space, cs.fields.T_S)

"""
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:tubulent_energy_fluxes})
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:turbulent_energy_fluxes})
Combined aerodynamic turbulent energy surface fluxes (W m⁻²).
"""
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:tubulent_energy_fluxes}) =
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:turbulent_energy_fluxes}) =
Utilities.swap_space!(cs.boundary_space, cs.fields.F_turb_energy)

# land diagnotics
48 changes: 33 additions & 15 deletions perf/Manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

julia_version = "1.10.4"
manifest_format = "2.0"
project_hash = "302422306467d2326750e939162edbd82fdbb61b"
project_hash = "c9f4bf3697b7ea6a30d48bb382aa6b79e19cbe91"

[[deps.ADTypes]]
git-tree-sha1 = "aa4d425271a914d8c4af6ad9fccb6eb3aec662c7"
Expand Down Expand Up @@ -32,9 +32,9 @@ version = "0.4.5"

[[deps.Accessors]]
deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "LinearAlgebra", "MacroTools", "Markdown", "Test"]
git-tree-sha1 = "c0d491ef0b135fd7d63cbc6404286bc633329425"
git-tree-sha1 = "f61b15be1d76846c0ce31d3fcfac5380ae53db6a"
uuid = "7d9f7c33-5ae7-4f3b-8dc6-eff91059b697"
version = "0.1.36"
version = "0.1.37"

[deps.Accessors.extensions]
AccessorsAxisKeysExt = "AxisKeys"
Expand Down Expand Up @@ -300,7 +300,7 @@ version = "0.3.15"
deps = ["CUDA", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "DocStringExtensions", "JLD2", "NCDatasets", "Plots", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "TempestRemap_jll", "Thermodynamics"]
path = ".."
uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
version = "0.1.0"
version = "0.1.1"

[[deps.ClimaDiagnostics]]
deps = ["Accessors", "ClimaComms", "ClimaCore", "Dates", "NCDatasets", "SciMLBase"]
Expand Down Expand Up @@ -392,9 +392,9 @@ version = "0.7.5"

[[deps.ColorSchemes]]
deps = ["ColorTypes", "ColorVectorSpace", "Colors", "FixedPointNumbers", "PrecompileTools", "Random"]
git-tree-sha1 = "4b270d6465eb21ae89b732182c20dc165f8bf9f2"
git-tree-sha1 = "b5278586822443594ff615963b0c09755771b3e0"
uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
version = "3.25.0"
version = "3.26.0"

[[deps.ColorTypes]]
deps = ["FixedPointNumbers", "Random"]
Expand Down Expand Up @@ -482,9 +482,9 @@ version = "2.4.2"

[[deps.ConstructionBase]]
deps = ["LinearAlgebra"]
git-tree-sha1 = "260fd2400ed2dab602a7c15cf10c1933c59930a2"
git-tree-sha1 = "d8a9c0b6ac2d9081bf76324b39c78ca3ce4f0c98"
uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
version = "1.5.5"
version = "1.5.6"
weakdeps = ["IntervalSets", "StaticArrays"]

[deps.ConstructionBase.extensions]
Expand Down Expand Up @@ -888,16 +888,16 @@ uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
version = "0.26.7"

[[deps.GR]]
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
git-tree-sha1 = "3e527447a45901ea392fe12120783ad6ec222803"
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Qt6Wayland_jll", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
git-tree-sha1 = "629693584cef594c3f6f99e76e7a7ad17e60e8d5"
uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
version = "0.73.6"
version = "0.73.7"

[[deps.GR_jll]]
deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"]
git-tree-sha1 = "182c478a179b267dd7a741b6f8f4c3e0803795d6"
git-tree-sha1 = "a8863b69c2a0859f2c2c87ebdc4c6712e88bdf0d"
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
version = "0.73.6+0"
version = "0.73.7+0"

[[deps.GaussQuadrature]]
deps = ["SpecialFunctions"]
Expand Down Expand Up @@ -1855,6 +1855,24 @@ git-tree-sha1 = "492601870742dcd38f233b23c3ec629628c1d724"
uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56"
version = "6.7.1+1"

[[deps.Qt6Declarative_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6ShaderTools_jll"]
git-tree-sha1 = "e5dd466bf2569fe08c91a2cc29c1003f4797ac3b"
uuid = "629bc702-f1f5-5709-abd5-49b8460ea067"
version = "6.7.1+2"

[[deps.Qt6ShaderTools_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll"]
git-tree-sha1 = "1a180aeced866700d4bebc3120ea1451201f16bc"
uuid = "ce943373-25bb-56aa-8eca-768745ed7b5a"
version = "6.7.1+1"

[[deps.Qt6Wayland_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6Declarative_jll"]
git-tree-sha1 = "729927532d48cf79f49070341e1d918a65aba6b0"
uuid = "e99dba38-086e-5de3-a5b1-6e4c66e897c3"
version = "6.7.1+1"

[[deps.QuadGK]]
deps = ["DataStructures", "LinearAlgebra"]
git-tree-sha1 = "9b23c31e76e333e6fb4c1595ae6afa74966a729e"
Expand Down Expand Up @@ -1990,9 +2008,9 @@ version = "0.6.43"

[[deps.SciMLBase]]
deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface", "Tables"]
git-tree-sha1 = "7a38aa94aaf425ab68b96f373cd036a204eaf04b"
git-tree-sha1 = "4345907b161ed71358fd343f8d9d178b68bb185a"
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
version = "2.43.0"
version = "2.43.1"

[deps.SciMLBase.extensions]
SciMLBaseChainRulesCoreExt = "ChainRulesCore"
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
Aqua = "0.8"
ArtifactWrappers = "0.2"
ClimaAtmos = "0.27"
ClimaLand = "0.12"
ClimaLand = "0.14"
ClimaParams = "0.10"
ClimaUtilities = "0.1"
Dates = "1"
Expand Down

2 comments on commit ecccb94

@AlexisRenchon
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/112255

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.1 -m "<description of version>" ecccb9448f78bb3cd2ab3c9480c1f23374b85995
git push origin v0.1.1

Please sign in to comment.