Skip to content

Commit ecccb94

Browse files
AlexisRenchonAlexisRenchon
authored
Merge pull request #903 from CliMA/as/up-ca-patch
Release Coupler v0.1.1 + update compat following ClimaAtmos 0.27.2 patch release
2 parents 9de314e + 92cc860 commit ecccb94

File tree

7 files changed

+77
-50
lines changed

7 files changed

+77
-50
lines changed

‎Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "ClimaCoupler"
22
uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7"
33
authors = ["CliMA Contributors <[email protected]>"]
4-
version = "0.1.0"
4+
version = "0.1.1"
55

66
[deps]
77
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"

‎experiments/ClimaEarth/Manifest.toml‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.4"
44
manifest_format = "2.0"
5-
project_hash = "81777e8e74b7c019cb52af8f085df74a2aaaefbe"
5+
project_hash = "26bc87e2a5206094ca53b64409eb5da90aa13fe5"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "aa4d425271a914d8c4af6ad9fccb6eb3aec662c7"
@@ -32,9 +32,9 @@ version = "0.4.5"
3232

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

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

379379
[[deps.ClimaDiagnostics]]
380380
deps = ["Accessors", "ClimaComms", "ClimaCore", "Dates", "NCDatasets", "SciMLBase"]
@@ -472,9 +472,9 @@ version = "0.4.0"
472472

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

479479
[[deps.ColorTypes]]
480480
deps = ["FixedPointNumbers", "Random"]
@@ -562,9 +562,9 @@ version = "2.4.2"
562562

563563
[[deps.ConstructionBase]]
564564
deps = ["LinearAlgebra"]
565-
git-tree-sha1 = "260fd2400ed2dab602a7c15cf10c1933c59930a2"
565+
git-tree-sha1 = "d8a9c0b6ac2d9081bf76324b39c78ca3ce4f0c98"
566566
uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
567-
version = "1.5.5"
567+
version = "1.5.6"
568568
weakdeps = ["IntervalSets", "StaticArrays"]
569569

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

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

10581058
[[deps.GR_jll]]
10591059
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"]
1060-
git-tree-sha1 = "182c478a179b267dd7a741b6f8f4c3e0803795d6"
1060+
git-tree-sha1 = "a8863b69c2a0859f2c2c87ebdc4c6712e88bdf0d"
10611061
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
1062-
version = "0.73.6+0"
1062+
version = "0.73.7+0"
10631063

10641064
[[deps.GaussQuadrature]]
10651065
deps = ["SpecialFunctions"]
@@ -2297,6 +2297,24 @@ git-tree-sha1 = "492601870742dcd38f233b23c3ec629628c1d724"
22972297
uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56"
22982298
version = "6.7.1+1"
22992299

2300+
[[deps.Qt6Declarative_jll]]
2301+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6ShaderTools_jll"]
2302+
git-tree-sha1 = "e5dd466bf2569fe08c91a2cc29c1003f4797ac3b"
2303+
uuid = "629bc702-f1f5-5709-abd5-49b8460ea067"
2304+
version = "6.7.1+2"
2305+
2306+
[[deps.Qt6ShaderTools_jll]]
2307+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll"]
2308+
git-tree-sha1 = "1a180aeced866700d4bebc3120ea1451201f16bc"
2309+
uuid = "ce943373-25bb-56aa-8eca-768745ed7b5a"
2310+
version = "6.7.1+1"
2311+
2312+
[[deps.Qt6Wayland_jll]]
2313+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6Declarative_jll"]
2314+
git-tree-sha1 = "729927532d48cf79f49070341e1d918a65aba6b0"
2315+
uuid = "e99dba38-086e-5de3-a5b1-6e4c66e897c3"
2316+
version = "6.7.1+1"
2317+
23002318
[[deps.QuadGK]]
23012319
deps = ["DataStructures", "LinearAlgebra"]
23022320
git-tree-sha1 = "9b23c31e76e333e6fb4c1595ae6afa74966a729e"
@@ -2466,9 +2484,9 @@ version = "3.45.3+0"
24662484

24672485
[[deps.SciMLBase]]
24682486
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"]
2469-
git-tree-sha1 = "7a38aa94aaf425ab68b96f373cd036a204eaf04b"
2487+
git-tree-sha1 = "4345907b161ed71358fd343f8d9d178b68bb185a"
24702488
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2471-
version = "2.43.0"
2489+
version = "2.43.1"
24722490

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

28592877
[[deps.TranscodingStreams]]
2860-
git-tree-sha1 = "60df3f8126263c0d6b357b9a1017bb94f53e3582"
2878+
git-tree-sha1 = "96612ac5365777520c3c5396314c8cf7408f436a"
28612879
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
2862-
version = "0.11.0"
2880+
version = "0.11.1"
28632881
weakdeps = ["Random", "Test"]
28642882

28652883
[deps.TranscodingStreams.extensions]

‎experiments/ClimaEarth/run_amip.jl‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -489,15 +489,6 @@ Note, this will be replaced by the diagnostics framework currently in ClimaAtmos
489489
into a more general package, so we can use it to save fields from surface models.
490490
=#
491491
if use_coupler_diagnostics
492-
monthly_3d_diags = Diagnostics.init_diagnostics(
493-
(:T, :u, :q_tot, :q_liq_ice),
494-
atmos_sim.domain.center_space;
495-
save = TimeManager.Monthly(),
496-
operations = (; accumulate = Diagnostics.TimeMean([Int(0)])),
497-
output_dir = COUPLER_OUTPUT_DIR,
498-
name_tag = "monthly_mean_3d_",
499-
)
500-
501492
monthly_3d_diags = Diagnostics.init_diagnostics(
502493
(:T, :u, :q_tot, :q_liq_ice),
503494
atmos_sim.domain.center_space;
@@ -508,7 +499,7 @@ if use_coupler_diagnostics
508499
)
509500

510501
monthly_2d_diags = Diagnostics.init_diagnostics(
511-
(:precipitation_rate, :toa_fluxes, :T_sfc, :tubulent_energy_fluxes),
502+
(:precipitation_rate, :toa_fluxes, :T_sfc, :turbulent_energy_fluxes),
512503
boundary_space;
513504
save = TimeManager.Monthly(),
514505
operations = (; accumulate = Diagnostics.TimeMean([Int(0)])),
@@ -915,7 +906,7 @@ if ClimaComms.iamroot(comms_ctx)
915906
toa_fluxes = (:regrid, :horizontal_slice),
916907
precipitation_rate = (:regrid, :horizontal_slice),
917908
T_sfc = (:regrid, :horizontal_slice),
918-
tubulent_energy_fluxes = (:regrid, :horizontal_slice),
909+
turbulent_energy_fluxes = (:regrid, :horizontal_slice),
919910
q_liq_ice = (:regrid, :zonal_mean),
920911
)
921912

@@ -926,7 +917,7 @@ if ClimaComms.iamroot(comms_ctx)
926917
toa_fluxes = (; clims = (-250, 250), units = "W/m^2"),
927918
precipitation_rate = (clims = (0, 1e-4), units = "kg/m^2/s"),
928919
T_sfc = (clims = (225, 310), units = "K"),
929-
tubulent_energy_fluxes = (; clims = (-250, 250), units = "W/m^2"),
920+
turbulent_energy_fluxes = (; clims = (-250, 250), units = "W/m^2"),
930921
q_liq_ice = (; clims = (0, 10), units = "g/kg"),
931922
)
932923
amip_data, fig_amip = amip_paperplots(
@@ -947,7 +938,7 @@ if ClimaComms.iamroot(comms_ctx)
947938
toa_fluxes = (:horizontal_slice,),
948939
precipitation_rate = (:horizontal_slice,),
949940
T_sfc = (:horizontal_slice,),
950-
tubulent_energy_fluxes = (:horizontal_slice,),
941+
turbulent_energy_fluxes = (:horizontal_slice,),
951942
)
952943
ncep_plot_spec = plot_spec
953944
ncep_data, fig_ncep = ncep_paperplots(

‎experiments/ClimaEarth/user_io/ncep_visualizer.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function Diagnostics.get_var(data_source::NCEPMonthlyDataSource, ::Val{:T_sfc})
155155
return (t_celsius .+ 273.15, coords)
156156
end
157157

158-
function Diagnostics.get_var(data_source::NCEPMonthlyDataSource, ::Val{:tubulent_energy_fluxes})
158+
function Diagnostics.get_var(data_source::NCEPMonthlyDataSource, ::Val{:turbulent_energy_fluxes})
159159
https = "https://downloads.psl.noaa.gov/Datasets/ncep.reanalysis2/Monthlies/gaussian_grid/lhtfl.sfc.mon.mean.nc"
160160
ncep_vname = "lhtfl"
161161
lhtfl, coords = download_read_nc(data_source, https, ncep_vname)

‎experiments/ClimaEarth/user_io/user_diagnostics.jl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:T_sfc}) =
100100
Utilities.swap_space!(cs.boundary_space, cs.fields.T_S)
101101

102102
"""
103-
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:tubulent_energy_fluxes})
103+
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:turbulent_energy_fluxes})
104104
105105
Combined aerodynamic turbulent energy surface fluxes (W m⁻²).
106106
"""
107-
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:tubulent_energy_fluxes}) =
107+
Diagnostics.get_var(cs::Interfacer.CoupledSimulation, ::Val{:turbulent_energy_fluxes}) =
108108
Utilities.swap_space!(cs.boundary_space, cs.fields.F_turb_energy)
109109

110110
# land diagnotics

‎perf/Manifest.toml‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.10.4"
44
manifest_format = "2.0"
5-
project_hash = "302422306467d2326750e939162edbd82fdbb61b"
5+
project_hash = "c9f4bf3697b7ea6a30d48bb382aa6b79e19cbe91"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "aa4d425271a914d8c4af6ad9fccb6eb3aec662c7"
@@ -32,9 +32,9 @@ version = "0.4.5"
3232

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

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

305305
[[deps.ClimaDiagnostics]]
306306
deps = ["Accessors", "ClimaComms", "ClimaCore", "Dates", "NCDatasets", "SciMLBase"]
@@ -392,9 +392,9 @@ version = "0.7.5"
392392

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

399399
[[deps.ColorTypes]]
400400
deps = ["FixedPointNumbers", "Random"]
@@ -482,9 +482,9 @@ version = "2.4.2"
482482

483483
[[deps.ConstructionBase]]
484484
deps = ["LinearAlgebra"]
485-
git-tree-sha1 = "260fd2400ed2dab602a7c15cf10c1933c59930a2"
485+
git-tree-sha1 = "d8a9c0b6ac2d9081bf76324b39c78ca3ce4f0c98"
486486
uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
487-
version = "1.5.5"
487+
version = "1.5.6"
488488
weakdeps = ["IntervalSets", "StaticArrays"]
489489

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

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

896896
[[deps.GR_jll]]
897897
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"]
898-
git-tree-sha1 = "182c478a179b267dd7a741b6f8f4c3e0803795d6"
898+
git-tree-sha1 = "a8863b69c2a0859f2c2c87ebdc4c6712e88bdf0d"
899899
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
900-
version = "0.73.6+0"
900+
version = "0.73.7+0"
901901

902902
[[deps.GaussQuadrature]]
903903
deps = ["SpecialFunctions"]
@@ -1855,6 +1855,24 @@ git-tree-sha1 = "492601870742dcd38f233b23c3ec629628c1d724"
18551855
uuid = "c0090381-4147-56d7-9ebc-da0b1113ec56"
18561856
version = "6.7.1+1"
18571857

1858+
[[deps.Qt6Declarative_jll]]
1859+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6ShaderTools_jll"]
1860+
git-tree-sha1 = "e5dd466bf2569fe08c91a2cc29c1003f4797ac3b"
1861+
uuid = "629bc702-f1f5-5709-abd5-49b8460ea067"
1862+
version = "6.7.1+2"
1863+
1864+
[[deps.Qt6ShaderTools_jll]]
1865+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll"]
1866+
git-tree-sha1 = "1a180aeced866700d4bebc3120ea1451201f16bc"
1867+
uuid = "ce943373-25bb-56aa-8eca-768745ed7b5a"
1868+
version = "6.7.1+1"
1869+
1870+
[[deps.Qt6Wayland_jll]]
1871+
deps = ["Artifacts", "JLLWrappers", "Libdl", "Qt6Base_jll", "Qt6Declarative_jll"]
1872+
git-tree-sha1 = "729927532d48cf79f49070341e1d918a65aba6b0"
1873+
uuid = "e99dba38-086e-5de3-a5b1-6e4c66e897c3"
1874+
version = "6.7.1+1"
1875+
18581876
[[deps.QuadGK]]
18591877
deps = ["DataStructures", "LinearAlgebra"]
18601878
git-tree-sha1 = "9b23c31e76e333e6fb4c1595ae6afa74966a729e"
@@ -1990,9 +2008,9 @@ version = "0.6.43"
19902008

19912009
[[deps.SciMLBase]]
19922010
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"]
1993-
git-tree-sha1 = "7a38aa94aaf425ab68b96f373cd036a204eaf04b"
2011+
git-tree-sha1 = "4345907b161ed71358fd343f8d9d178b68bb185a"
19942012
uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1995-
version = "2.43.0"
2013+
version = "2.43.1"
19962014

19972015
[deps.SciMLBase.extensions]
19982016
SciMLBaseChainRulesCoreExt = "ChainRulesCore"

‎test/Project.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
4444
Aqua = "0.8"
4545
ArtifactWrappers = "0.2"
4646
ClimaAtmos = "0.27"
47-
ClimaLand = "0.12"
47+
ClimaLand = "0.14"
4848
ClimaParams = "0.10"
4949
ClimaUtilities = "0.1"
5050
Dates = "1"

0 commit comments

Comments
 (0)