diff --git a/.buildkite/Manifest-v1.11.toml b/.buildkite/Manifest-v1.11.toml index fd55e053a2..b83ca7de65 100644 --- a/.buildkite/Manifest-v1.11.toml +++ b/.buildkite/Manifest-v1.11.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.11.2" +julia_version = "1.11.1" manifest_format = "2.0" -project_hash = "bf1216ed2bc76713a01437d07332219f6bcd0c54" +project_hash = "c37eb520716a42d13453d464e20722c2d9ad2f0e" [[deps.ADTypes]] git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f" @@ -995,12 +995,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc" uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" version = "1.3.7" -[[deps.Formatting]] -deps = ["Logging", "Printf"] -git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87" -uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" -version = "0.4.3" - [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853" diff --git a/.buildkite/Manifest.toml b/.buildkite/Manifest.toml index bb2c9c2e38..a99a1f1cf4 100644 --- a/.buildkite/Manifest.toml +++ b/.buildkite/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.7" +julia_version = "1.10.6" manifest_format = "2.0" -project_hash = "caf39978363ec9f96f38fb6498ca16e9535c8a91" +project_hash = "e342c3afef8f338923763f75fb641220d04b23da" [[deps.ADTypes]] git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f" @@ -989,12 +989,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc" uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" version = "1.3.7" -[[deps.Formatting]] -deps = ["Logging", "Printf"] -git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87" -uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" -version = "0.4.3" - [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853" diff --git a/.buildkite/Project.toml b/.buildkite/Project.toml index 7f298bb8a0..0d30fa30b3 100644 --- a/.buildkite/Project.toml +++ b/.buildkite/Project.toml @@ -17,7 +17,7 @@ DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab" Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" -Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0" +Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6" HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3" Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" diff --git a/docs/Manifest-v1.11.toml b/docs/Manifest-v1.11.toml index 74cbe53b67..96c76ed83e 100644 --- a/docs/Manifest-v1.11.toml +++ b/docs/Manifest-v1.11.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.11.2" +julia_version = "1.11.1" manifest_format = "2.0" -project_hash = "375d00e829a5d8c49c86dce3a9f254044ec00898" +project_hash = "355d659ef955f00d0dd0873a3a8938c4c8fe8215" [[deps.ADTypes]] git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f" @@ -438,7 +438,7 @@ weakdeps = ["CSV", "CUDA", "ClimaParams", "DataFrames", "Flux", "HTTP", "StatsBa NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN"] [[deps.ClimaLandSimulations]] -deps = ["ArtifactWrappers", "Bonito", "CairoMakie", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaLand", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "DataFrames", "Dates", "DelimitedFiles", "Formatting", "HTTP", "Insolation", "Interpolations", "InverseFunctions", "JSON", "LaTeXStrings", "MutableArithmetics", "NLsolve", "PlotUtils", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "Unitful", "UnitfulMoles", "WGLMakie", "cuDNN"] +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"] path = "../lib/ClimaLandSimulations" uuid = "348a0bd3-1299-4261-8002-d2cd97df6055" version = "0.1.0" @@ -1043,12 +1043,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc" uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" version = "1.3.7" -[[deps.Formatting]] -deps = ["Logging", "Printf"] -git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87" -uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" -version = "0.4.3" - [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853" diff --git a/docs/Manifest.toml b/docs/Manifest.toml index c5f6af4412..d22178998b 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -1,8 +1,8 @@ # This file is machine-generated - editing it directly is not advised -julia_version = "1.10.7" +julia_version = "1.10.6" manifest_format = "2.0" -project_hash = "f72307bcd95e950ef8de1249d1ec62d211530a69" +project_hash = "1cc11a5b33163e663d21d119426c3e05ec356bf1" [[deps.ADTypes]] git-tree-sha1 = "72af59f5b8f09faee36b4ec48e014a79210f2f4f" @@ -435,7 +435,7 @@ weakdeps = ["CSV", "CUDA", "ClimaParams", "DataFrames", "Flux", "HTTP", "StatsBa NeuralSnowExt = ["CSV", "DataFrames", "HTTP", "Flux", "StatsBase", "cuDNN"] [[deps.ClimaLandSimulations]] -deps = ["ArtifactWrappers", "Bonito", "CairoMakie", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaLand", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "DataFrames", "Dates", "DelimitedFiles", "Formatting", "HTTP", "Insolation", "Interpolations", "InverseFunctions", "JSON", "LaTeXStrings", "MutableArithmetics", "NLsolve", "PlotUtils", "RootSolvers", "SciMLBase", "StaticArrays", "Statistics", "StatsBase", "SurfaceFluxes", "Thermodynamics", "Unitful", "UnitfulMoles", "WGLMakie", "cuDNN"] +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"] path = "../lib/ClimaLandSimulations" uuid = "348a0bd3-1299-4261-8002-d2cd97df6055" version = "0.1.0" @@ -1037,12 +1037,6 @@ git-tree-sha1 = "9c68794ef81b08086aeb32eeaf33531668d5f5fc" uuid = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" version = "1.3.7" -[[deps.Formatting]] -deps = ["Logging", "Printf"] -git-tree-sha1 = "fb409abab2caf118986fc597ba84b50cbaf00b87" -uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" -version = "0.4.3" - [[deps.ForwardDiff]] deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "LinearAlgebra", "LogExpFunctions", "NaNMath", "Preferences", "Printf", "Random", "SpecialFunctions"] git-tree-sha1 = "a2df1b776752e3f344e5116c06d75a10436ab853" diff --git a/docs/Project.toml b/docs/Project.toml index 83032395f1..ab2afb5f12 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -15,7 +15,7 @@ Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b" Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" EnsembleKalmanProcesses = "aa8a2aa5-91d8-4396-bcef-d4f2ec43552d" Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c" -Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0" +Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3" Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" diff --git a/experiments/integrated/fluxnet/met_drivers_FLUXNET.jl b/experiments/integrated/fluxnet/met_drivers_FLUXNET.jl index 1799e57eb2..cd9291ddca 100644 --- a/experiments/integrated/fluxnet/met_drivers_FLUXNET.jl +++ b/experiments/integrated/fluxnet/met_drivers_FLUXNET.jl @@ -1,7 +1,7 @@ using DelimitedFiles using Thermodynamics using Dates -using Formatting +using Format using HTTP using JSON using Insolation @@ -44,7 +44,7 @@ labels = ( :CO2, ) -# For every data column to be collected, name of the column in the file, +# For every data column to be collected, name of the column in the file, # transformation function to desired unit, and string of final unit collect_args = [ ("TA_F", (x) -> x .+ 273.15, "K") @@ -65,8 +65,8 @@ collect_args = [ ("CO2_F_MDS", (x) -> x .* 1e-6, "mol") ] -# Named tuple mapping every label to a DataColumn with the correct transformed -# unit and data status. Automatically fills gaps in the data +# Named tuple mapping every label to a DataColumn with the correct transformed +# unit and data status. Automatically fills gaps in the data drivers = (; zip( labels, @@ -118,9 +118,9 @@ Estimate the fraction of precipitation that is in snow form, given the air temperature at the surface in K and the relative humidity (between 0 and 1). -See Jennings, K.S., Winchell, T.S., Livneh, B. et al. -Spatial variation of the rain–snow temperature threshold across the -Northern Hemisphere. Nat Commun 9, 1148 (2018). +See Jennings, K.S., Winchell, T.S., Livneh, B. et al. +Spatial variation of the rain–snow temperature threshold across the +Northern Hemisphere. Nat Commun 9, 1148 (2018). https://doi.org/10.1038/s41467-018-03629-7 """ function snow_precip_fraction(air_temp, hum) diff --git a/lib/ClimaLandSimulations/Project.toml b/lib/ClimaLandSimulations/Project.toml index 090f8e0ba2..f8ad19c2fb 100644 --- a/lib/ClimaLandSimulations/Project.toml +++ b/lib/ClimaLandSimulations/Project.toml @@ -17,7 +17,7 @@ ClimaUtilities = "b3f4f4ca-9299-4f7f-bd9b-81e1242a7513" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab" -Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0" +Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3" Insolation = "e98cc03f-d57e-4e3c-b70c-8d51efe9e0d8" Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" @@ -50,7 +50,6 @@ ClimaUtilities = "0.1.2" DataFrames = "1" Dates = "1" DelimitedFiles = "1" -Formatting = "0.4" HTTP = "1" Interpolations = "0.15" JSON = "0.21" diff --git a/lib/ClimaLandSimulations/src/Fluxnet/Fluxnet.jl b/lib/ClimaLandSimulations/src/Fluxnet/Fluxnet.jl index 117e7c32d5..d94ac8c71e 100644 --- a/lib/ClimaLandSimulations/src/Fluxnet/Fluxnet.jl +++ b/lib/ClimaLandSimulations/src/Fluxnet/Fluxnet.jl @@ -24,7 +24,6 @@ using Unitful, UnitfulMoles using ArtifactWrappers using DelimitedFiles using Thermodynamics -using Formatting using DataFrames # Directory paths