Skip to content

Commit 2e1c1af

Browse files
authored
Merge pull request #946 from CliMA/ac/snow_ema_PR
Merge NeuralSnow module into main
2 parents 1f8b44b + d428e97 commit 2e1c1af

File tree

18 files changed

+643
-116
lines changed

18 files changed

+643
-116
lines changed

.buildkite/Manifest-v1.11.toml

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

33
julia_version = "1.11.2"
44
manifest_format = "2.0"
5-
project_hash = "c37eb520716a42d13453d464e20722c2d9ad2f0e"
5+
project_hash = "ed73b8f9b8b31b7bd82adc044809f42aee092974"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f"
@@ -296,6 +296,12 @@ git-tree-sha1 = "e329286945d0cfc04456972ea732551869af1cfc"
296296
uuid = "4e9b3aee-d8a1-5a3d-ad8b-7d824db253f0"
297297
version = "1.0.1+0"
298298

299+
[[deps.CSV]]
300+
deps = ["CodecZlib", "Dates", "FilePathsBase", "InlineStrings", "Mmap", "Parsers", "PooledArrays", "PrecompileTools", "SentinelArrays", "Tables", "Unicode", "WeakRefStrings", "WorkerUtilities"]
301+
git-tree-sha1 = "deddd8725e5e1cc49ee205a1964256043720a6c3"
302+
uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
303+
version = "0.10.15"
304+
299305
[[deps.CUDA]]
300306
deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CUDA_Driver_jll", "CUDA_Runtime_Discovery", "CUDA_Runtime_jll", "Crayons", "DataFrames", "ExprTools", "GPUArrays", "GPUCompiler", "KernelAbstractions", "LLVM", "LLVMLoopInfo", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "NVTX", "Preferences", "PrettyTables", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "StaticArrays", "Statistics", "demumble_jll"]
301307
git-tree-sha1 = "e0725a467822697171af4dae15cec10b4fc19053"
@@ -415,26 +421,17 @@ deps = ["ArtifactWrappers", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "Clim
415421
path = ".."
416422
uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
417423
version = "0.15.6"
424+
weakdeps = ["BSON", "CSV", "CUDA", "ClimaParams", "DataFrames", "Flux", "HTTP", "StatsBase", "cuDNN"]
418425

419426
[deps.ClimaLand.extensions]
420427
CreateParametersExt = "ClimaParams"
421-
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN"]
422-
423-
[deps.ClimaLand.weakdeps]
424-
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
425-
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
426-
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
427-
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
428-
Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
429-
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
430-
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
431-
cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
428+
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN", "BSON"]
432429

433430
[[deps.ClimaParams]]
434431
deps = ["TOML"]
435-
git-tree-sha1 = "489c5655993c62fb34293908a6b0877e32f183ee"
432+
git-tree-sha1 = "1e17ed5997da08f1ca186df1882ef10010f70481"
436433
uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
437-
version = "0.10.16"
434+
version = "0.10.18"
438435

439436
[[deps.ClimaTimeSteppers]]
440437
deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
@@ -963,10 +960,10 @@ uuid = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
963960
version = "0.8.5"
964961

965962
[[deps.Flux]]
966-
deps = ["Adapt", "ChainRulesCore", "Compat", "Functors", "LinearAlgebra", "MLDataDevices", "MLUtils", "MacroTools", "NNlib", "OneHotArrays", "Optimisers", "Preferences", "ProgressLogging", "Random", "Reexport", "Setfield", "SparseArrays", "SpecialFunctions", "Statistics", "Zygote"]
967-
git-tree-sha1 = "df520a0727f843576801a0294f5be1a94be28e23"
963+
deps = ["Adapt", "ChainRulesCore", "Compat", "EnzymeCore", "Functors", "LinearAlgebra", "MLDataDevices", "MLUtils", "MacroTools", "NNlib", "OneHotArrays", "Optimisers", "Preferences", "ProgressLogging", "Random", "Reexport", "Setfield", "SparseArrays", "SpecialFunctions", "Statistics", "Zygote"]
964+
git-tree-sha1 = "40c77b726f127356110a3f0aa6e3ecd3ac14159b"
968965
uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c"
969-
version = "0.14.25"
966+
version = "0.15.2"
970967

971968
[deps.Flux.extensions]
972969
FluxAMDGPUExt = "AMDGPU"
@@ -1041,10 +1038,10 @@ uuid = "77dc65aa-8811-40c2-897b-53d922fa7daf"
10411038
version = "0.1.3"
10421039

10431040
[[deps.Functors]]
1044-
deps = ["LinearAlgebra"]
1045-
git-tree-sha1 = "64d8e93700c7a3f28f717d265382d52fac9fa1c1"
1041+
deps = ["Compat", "ConstructionBase", "LinearAlgebra", "Random"]
1042+
git-tree-sha1 = "60a0339f28a233601cb74468032b5c302d5067de"
10461043
uuid = "d9f16b24-f501-4c13-a1f2-28368ffc5196"
1047-
version = "0.4.12"
1044+
version = "0.5.2"
10481045

10491046
[[deps.Future]]
10501047
deps = ["Random"]
@@ -1224,9 +1221,9 @@ version = "1.14.2+1"
12241221

12251222
[[deps.HTTP]]
12261223
deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
1227-
git-tree-sha1 = "6c22309e9a356ac1ebc5c8a217045f9bae6f8d9a"
1224+
git-tree-sha1 = "627fcacdb7cb51dc67f557e1598cdffe4dda386d"
12281225
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
1229-
version = "1.10.13"
1226+
version = "1.10.14"
12301227

12311228
[[deps.HarfBuzz_jll]]
12321229
deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll"]
@@ -1387,9 +1384,9 @@ weakdeps = ["Dates", "Test"]
13871384
InverseFunctionsTestExt = "Test"
13881385

13891386
[[deps.InvertedIndices]]
1390-
git-tree-sha1 = "0dc7b50b8d436461be01300fd8cd45aa0274b038"
1387+
git-tree-sha1 = "6da3c4316095de0f5ee2ebd875df8721e7e0bdbe"
13911388
uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
1392-
version = "1.3.0"
1389+
version = "1.3.1"
13931390

13941391
[[deps.IrrationalConstants]]
13951392
git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
@@ -1703,9 +1700,9 @@ version = "2.16.0+0"
17031700

17041701
[[deps.LogExpFunctions]]
17051702
deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
1706-
git-tree-sha1 = "a2d09619db4e765091ee5c6ffe8872849de0feea"
1703+
git-tree-sha1 = "13ca9e2586b89836fd20cccf56e57e2b9ae7f38f"
17071704
uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
1708-
version = "0.3.28"
1705+
version = "0.3.29"
17091706

17101707
[deps.LogExpFunctions.extensions]
17111708
LogExpFunctionsChainRulesCoreExt = "ChainRulesCore"
@@ -1741,9 +1738,9 @@ version = "2024.2.0+0"
17411738

17421739
[[deps.MLDataDevices]]
17431740
deps = ["Adapt", "Compat", "Functors", "Preferences", "Random"]
1744-
git-tree-sha1 = "85b47bc5a8bf0c886286638585df3bec7c9f8269"
1741+
git-tree-sha1 = "2580925570e9906bb812896c7940345b68cdb6a3"
17451742
uuid = "7e8f7934-dd98-4c1a-8fe8-92b47a384d40"
1746-
version = "1.5.3"
1743+
version = "1.6.3"
17471744

17481745
[deps.MLDataDevices.extensions]
17491746
MLDataDevicesAMDGPUExt = "AMDGPU"
@@ -2099,9 +2096,14 @@ version = "0.5.5+0"
20992096

21002097
[[deps.Optimisers]]
21012098
deps = ["ChainRulesCore", "Functors", "LinearAlgebra", "Random", "Statistics"]
2102-
git-tree-sha1 = "c9ff5c686240c31eb8570b662dd1f66f4b183116"
2099+
git-tree-sha1 = "c5feff34a5cf6bdc6ca06de0c5b7d6847199f1c0"
21032100
uuid = "3bd65402-5787-11e9-1adc-39752487f4e2"
2104-
version = "0.3.4"
2101+
version = "0.4.2"
2102+
weakdeps = ["Adapt", "EnzymeCore"]
2103+
2104+
[deps.Optimisers.extensions]
2105+
OptimisersAdaptExt = ["Adapt"]
2106+
OptimisersEnzymeCoreExt = "EnzymeCore"
21052107

21062108
[[deps.Opus_jll]]
21072109
deps = ["Artifacts", "JLLWrappers", "Libdl"]
@@ -2668,9 +2670,9 @@ version = "0.1.2"
26682670

26692671
[[deps.SpecialFunctions]]
26702672
deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
2671-
git-tree-sha1 = "2f5d4697f21388cbe1ff299430dd169ef97d7e14"
2673+
git-tree-sha1 = "64cca0c26b4f31ba18f13f6c12af7c85f478cfde"
26722674
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
2673-
version = "2.4.0"
2675+
version = "2.5.0"
26742676
weakdeps = ["ChainRulesCore"]
26752677

26762678
[deps.SpecialFunctions.extensions]
@@ -3007,6 +3009,12 @@ git-tree-sha1 = "93f43ab61b16ddfb2fd3bb13b3ce241cafb0e6c9"
30073009
uuid = "2381bf8a-dfd0-557d-9999-79630e7b1b91"
30083010
version = "1.31.0+0"
30093011

3012+
[[deps.WeakRefStrings]]
3013+
deps = ["DataAPI", "InlineStrings", "Parsers"]
3014+
git-tree-sha1 = "b1be2855ed9ed8eac54e5caff2afcdb442d52c23"
3015+
uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
3016+
version = "1.4.2"
3017+
30103018
[[deps.WebP]]
30113019
deps = ["CEnum", "ColorTypes", "FileIO", "FixedPointNumbers", "ImageCore", "libwebp_jll"]
30123020
git-tree-sha1 = "aa1ca3c47f119fbdae8770c29820e5e6119b83f2"
@@ -3019,6 +3027,11 @@ git-tree-sha1 = "c1a7aa6219628fcd757dede0ca95e245c5cd9511"
30193027
uuid = "efce3f68-66dc-5838-9240-27a6d6f5f9b6"
30203028
version = "1.0.0"
30213029

3030+
[[deps.WorkerUtilities]]
3031+
git-tree-sha1 = "cd1659ba0d57b71a464a29e64dbc67cfe83d54e7"
3032+
uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60"
3033+
version = "1.6.1"
3034+
30223035
[[deps.XML2_jll]]
30233036
deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"]
30243037
git-tree-sha1 = "a2fccc6559132927d4c5dc183e3e01048c6dcbd6"

.buildkite/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
33
ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a"
44
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
5+
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
56
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
67
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
78
ClimaAnalysis = "29b5916a-a76c-4e73-9657-3c8fd22e65e6"

Project.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
2222
Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
2323

2424
[weakdeps]
25+
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
2526
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
2627
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
2728
ClimaParams = "5c42b081-d73a-476f-9059-fd94b934656c"
@@ -33,10 +34,11 @@ cuDNN = "02a925ec-e4fe-4b08-9a7e-0d78e3d38ccd"
3334

3435
[extensions]
3536
CreateParametersExt = "ClimaParams"
36-
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN"]
37+
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN", "BSON"]
3738

3839
[compat]
3940
ArtifactWrappers = "0.2"
41+
BSON = "0.3.9"
4042
CSV = "0.10.14"
4143
CUDA = "5.5"
4244
ClimaComms = "0.6"

docs/Manifest-v1.11.toml

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

33
julia_version = "1.11.2"
44
manifest_format = "2.0"
5-
project_hash = "355d659ef955f00d0dd0873a3a8938c4c8fe8215"
5+
project_hash = "04bb15e7c257352c3c06bc57a69afee68a5405e7"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f"
@@ -207,6 +207,11 @@ git-tree-sha1 = "2c7cc21e8678eff479978a0a2ef5ce2f51b63dff"
207207
uuid = "ab4f0b2a-ad5b-11e8-123f-65d77653426b"
208208
version = "0.5.0"
209209

210+
[[deps.BSON]]
211+
git-tree-sha1 = "4c3e506685c527ac6a54ccc0c8c76fd6f91b42fb"
212+
uuid = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
213+
version = "0.3.9"
214+
210215
[[deps.BandedMatrices]]
211216
deps = ["ArrayLayouts", "FillArrays", "LinearAlgebra", "PrecompileTools"]
212217
git-tree-sha1 = "2a81cc8adf470ac6bd87eef3ca3d194d08a8754c"
@@ -431,11 +436,11 @@ deps = ["ArtifactWrappers", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "Clim
431436
path = ".."
432437
uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532"
433438
version = "0.15.6"
434-
weakdeps = ["CSV", "CUDA", "ClimaParams", "DataFrames", "Flux", "HTTP", "StatsBase", "cuDNN"]
439+
weakdeps = ["BSON", "CSV", "CUDA", "ClimaParams", "DataFrames", "Flux", "HTTP", "StatsBase", "cuDNN"]
435440

436441
[deps.ClimaLand.extensions]
437442
CreateParametersExt = "ClimaParams"
438-
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN"]
443+
NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN", "BSON"]
439444

440445
[[deps.ClimaLandSimulations]]
441446
deps = ["ArtifactWrappers", "Bonito", "CairoMakie", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaLand", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "DataFrames", "Dates", "DelimitedFiles", "Format", "HTTP", "Insolation", "Interpolations", "InverseFunctions", "JSON", "LaTeXStrings", "MutableArithmetics", "NLsolve", "PlotUtils", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "Unitful", "UnitfulMoles", "WGLMakie", "cuDNN"]
@@ -445,9 +450,9 @@ version = "0.1.0"
445450

446451
[[deps.ClimaParams]]
447452
deps = ["TOML"]
448-
git-tree-sha1 = "489c5655993c62fb34293908a6b0877e32f183ee"
453+
git-tree-sha1 = "1e17ed5997da08f1ca186df1882ef10010f70481"
449454
uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
450-
version = "0.10.16"
455+
version = "0.10.18"
451456

452457
[[deps.ClimaTimeSteppers]]
453458
deps = ["ClimaComms", "Colors", "DataStructures", "DiffEqBase", "KernelAbstractions", "Krylov", "LinearAlgebra", "LinearOperators", "NVTX", "SciMLBase", "StaticArrays"]
@@ -1242,9 +1247,9 @@ version = "1.12.2+2"
12421247

12431248
[[deps.HTTP]]
12441249
deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "PrecompileTools", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
1245-
git-tree-sha1 = "6c22309e9a356ac1ebc5c8a217045f9bae6f8d9a"
1250+
git-tree-sha1 = "627fcacdb7cb51dc67f557e1598cdffe4dda386d"
12461251
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
1247-
version = "1.10.13"
1252+
version = "1.10.14"
12481253

12491254
[[deps.HarfBuzz_jll]]
12501255
deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll"]
@@ -1404,9 +1409,9 @@ weakdeps = ["Dates", "Test"]
14041409
InverseFunctionsTestExt = "Test"
14051410

14061411
[[deps.InvertedIndices]]
1407-
git-tree-sha1 = "0dc7b50b8d436461be01300fd8cd45aa0274b038"
1412+
git-tree-sha1 = "6da3c4316095de0f5ee2ebd875df8721e7e0bdbe"
14081413
uuid = "41ab1584-1d38-5bbf-9106-f11c6c58b48f"
1409-
version = "1.3.0"
1414+
version = "1.3.1"
14101415

14111416
[[deps.IrrationalConstants]]
14121417
git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
@@ -1715,9 +1720,9 @@ version = "2.20.1"
17151720

17161721
[[deps.LogExpFunctions]]
17171722
deps = ["DocStringExtensions", "IrrationalConstants", "LinearAlgebra"]
1718-
git-tree-sha1 = "a2d09619db4e765091ee5c6ffe8872849de0feea"
1723+
git-tree-sha1 = "13ca9e2586b89836fd20cccf56e57e2b9ae7f38f"
17191724
uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
1720-
version = "0.3.28"
1725+
version = "0.3.29"
17211726

17221727
[deps.LogExpFunctions.extensions]
17231728
LogExpFunctionsChainRulesCoreExt = "ChainRulesCore"
@@ -2662,9 +2667,9 @@ version = "0.1.2"
26622667

26632668
[[deps.SpecialFunctions]]
26642669
deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
2665-
git-tree-sha1 = "2f5d4697f21388cbe1ff299430dd169ef97d7e14"
2670+
git-tree-sha1 = "64cca0c26b4f31ba18f13f6c12af7c85f478cfde"
26662671
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
2667-
version = "2.4.0"
2672+
version = "2.5.0"
26682673
weakdeps = ["ChainRulesCore"]
26692674

26702675
[deps.SpecialFunctions.extensions]

docs/Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[deps]
22
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
3+
BSON = "fbb218c0-5317-5bc6-957e-2ee96dd4b1f0"
34
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
45
CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
56
ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884"

docs/tutorials/standalone/Snow/base_tutorial.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
# We begin by importing the developed code to create and run the neural network,
4444
# as well as some preliminary packages:
4545
using ClimaLand
46-
using DataFrames, CSV, HTTP, Dates, Flux, StatsBase, cuDNN
46+
using DataFrames, CSV, HTTP, Dates, Flux, StatsBase, cuDNN, BSON
4747

4848
# The code lives in an extenson that we have to manually load. The extension can
49-
# be loaded only if "CSV", "HTTP", "Flux", "StatsBase", "cuDNN" and "ClimaLand"
49+
# be loaded only if "DataFrames", "CSV", "HTTP", "Flux", "StatsBase", "cuDNN", "BSON", and "ClimaLand"
5050
# are loaded.
5151
DataTools = Base.get_extension(ClimaLand, :NeuralSnowExt).DataTools
5252
ModelTools = Base.get_extension(ClimaLand, :NeuralSnowExt).ModelTools;

docs/tutorials/standalone/Snow/data_tutorial.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
# in training artificial intelligence models for seasonal snow forecasting.
66
# The code below contains a basic version of the code used to produce
77
# `training_data.csv`, which is used in the [base tutorial](../base_tutorial/) for snow forecasting,
8-
# as well as the paper. However, exploration of the optional arguments
8+
# as well as the [paper](https://arxiv.org/abs/2412.06819). However, exploration of the optional arguments
99
# or requesting of alternative [SNOTEL data codes](https://www.nrcs.usda.gov/wps/portal/wcc/home/dataAccessHelp/webService/webServiceReference#elementCodes) offers
1010
# additional utility in creating alternative data sets for further investigation.
1111

1212
# We begin by importing all required packages:
1313
using ClimaLand
14-
using DataFrames, CSV, HTTP, Dates, Flux, StatsBase, cuDNN
14+
using DataFrames, CSV, HTTP, Dates, Flux, StatsBase, cuDNN, BSON
1515

1616
# The code lives in an extenson that we have to manually load. The extension can
17-
# be loaded only if "CSV", "HTTP", "Flux", "StatsBase", "cuDNN" and "ClimaLand"
17+
# be loaded only if "DataFrames", "CSV", "HTTP", "Flux", "StatsBase", "cuDNN", "BSON", and "ClimaLand"
1818
# are loaded.
1919
DataTools = Base.get_extension(ClimaLand, :NeuralSnowExt).DataTools;
2020

@@ -88,7 +88,7 @@ scales = Dict{Symbol, Real}(
8888
# to yield the full dataset (if special cases are handled) found in
8989
# `training_data.csv` used in the [base tutorial](../base_tutorial/). Stations were
9090
# selected based upon their availability of the features utilized in
91-
# creating the model used in the paper:
91+
# creating the model used in the [paper](https://arxiv.org/abs/2412.06819):
9292

9393
# - `*` Indicates alternative handling of the `rectify_daily_hourly()` function.
9494

experiments/integrated/fluxnet/snow_soil/simulation.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ soil_model_type = Soil.EnergyHydrology
8888
snow_parameters = SnowParameters{FT}(
8989
dt;
9090
α_snow = α,
91-
ρ_snow = ρ,
91+
density = Snow.ConstantDensityModel(ρ),
9292
earth_param_set = earth_param_set,
9393
);
9494
snow_args = (; parameters = snow_parameters);

0 commit comments

Comments
 (0)