From 485fd7c2138cdd30c33ebf883f435f73d5588b66 Mon Sep 17 00:00:00 2001 From: kmdeck Date: Mon, 30 Sep 2024 15:18:18 -0700 Subject: [PATCH 1/4] use land branch with qsat fix, set psnow to zero --- Project.toml | 1 + experiments/ClimaEarth/components/land/climaland_bucket.jl | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 4bd05b8cda..6f0b2391ea 100644 --- a/Project.toml +++ b/Project.toml @@ -8,6 +8,7 @@ Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" ClimaComms = "3a4d1b5c-c61d-41fd-a00a-5873ba7a1b0d" ClimaCore = "d414da3d-4745-48bb-8d80-42e94e092884" ClimaCoreTempestRemap = "d934ef94-cdd4-4710-83d6-720549644b70" +ClimaLand = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819" Logging = "56ddb016-857b-54e1-b83d-db4d58db5568" diff --git a/experiments/ClimaEarth/components/land/climaland_bucket.jl b/experiments/ClimaEarth/components/land/climaland_bucket.jl index ecb3ceed2e..015f529bea 100644 --- a/experiments/ClimaEarth/components/land/climaland_bucket.jl +++ b/experiments/ClimaEarth/components/land/climaland_bucket.jl @@ -97,7 +97,7 @@ function bucket_init( # the snow would melt in time `τc`. It prevents us from having to specially time step in cases where # all the snow melts in a single timestep. σS_c = FT(0.2) # critical snow water equivalent - W_f = FT(10) # bucket capacity + W_f = FT(0.2) # bucket capacity κ_soil = FT(0.7) # soil conductivity ρc_soil = FT(2e8) # soil volumetric heat capacity @@ -124,7 +124,7 @@ function bucket_init( T_sfc_0 = FT(271.0) @. Y.bucket.T = T_sfc_0 + temp_anomaly(coords.subsurface) - Y.bucket.W .= 6.5 + Y.bucket.W .= 0.1 Y.bucket.Ws .= 0.0 Y.bucket.σS .= 0.0 @@ -208,7 +208,7 @@ function Interfacer.update_field!(sim::BucketSimulation, ::Val{:turbulent_energy end function Interfacer.update_field!(sim::BucketSimulation, ::Val{:snow_precipitation}, field) ρ_liq = (LP.ρ_cloud_liq(sim.model.parameters.earth_param_set)) - parent(sim.integrator.p.drivers.P_snow) .= parent(field ./ ρ_liq) + parent(sim.integrator.p.drivers.P_snow) .= parent(0)#field ./ ρ_liq) end function Interfacer.update_field!(sim::BucketSimulation, ::Val{:turbulent_moisture_flux}, field) ρ_liq = (LP.ρ_cloud_liq(sim.model.parameters.earth_param_set)) From cada3607e7090df994a397cc02e980b5caf34fe9 Mon Sep 17 00:00:00 2001 From: kmdeck Date: Mon, 30 Sep 2024 16:36:06 -0700 Subject: [PATCH 2/4] update manifest in climaearth --- experiments/ClimaEarth/Manifest.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/experiments/ClimaEarth/Manifest.toml b/experiments/ClimaEarth/Manifest.toml index 750c0737df..2d6a338ed6 100644 --- a/experiments/ClimaEarth/Manifest.toml +++ b/experiments/ClimaEarth/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.5" manifest_format = "2.0" -project_hash = "3f041ae318abcda7361d1017b4769284277fd054" +project_hash = "4b893fc507a36bfff019f70ec53323e3f9a653a9" [[deps.ADTypes]] git-tree-sha1 = "5a5eafb8344b81b8c2237f8a6f6b3602b3f6180e" @@ -334,7 +334,7 @@ uuid = "d934ef94-cdd4-4710-83d6-720549644b70" version = "0.3.17" [[deps.ClimaCoupler]] -deps = ["ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "Dates", "JLD2", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"] +deps = ["Artifacts", "ClimaComms", "ClimaCore", "ClimaCoreTempestRemap", "ClimaLand", "Dates", "JLD2", "Logging", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"] path = "../.." uuid = "4ade58fe-a8da-486c-bd89-46df092ec0c7" version = "0.1.1" @@ -347,7 +347,9 @@ version = "0.2.6" [[deps.ClimaLand]] deps = ["ArtifactWrappers", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaUtilities", "Dates", "DocStringExtensions", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "NCDatasets", "SciMLBase", "StaticArrays", "SurfaceFluxes", "Thermodynamics"] -git-tree-sha1 = "ecb91842be1740ba97cbedd7123f4479013ec9d9" +git-tree-sha1 = "dbe9bfdc6ef1ec04b0d5da8052659f1eddbec02d" +repo-rev = "kd/bucket_qsat_fix" +repo-url = "https://github.com/CliMA/ClimaLand.jl.git" uuid = "08f4d4ce-cf43-44bb-ad95-9d2d5f413532" version = "0.15.0" From 39b5769cb0f2a39c7acc9b0f9d55413bc67db8fe Mon Sep 17 00:00:00 2001 From: kmdeck Date: Mon, 30 Sep 2024 16:46:50 -0700 Subject: [PATCH 3/4] clima atmos branch and toml update --- experiments/ClimaEarth/Manifest.toml | 4 +++- toml/amip.toml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/experiments/ClimaEarth/Manifest.toml b/experiments/ClimaEarth/Manifest.toml index 2d6a338ed6..fafe99ee74 100644 --- a/experiments/ClimaEarth/Manifest.toml +++ b/experiments/ClimaEarth/Manifest.toml @@ -290,7 +290,9 @@ weakdeps = ["GeoMakie", "Makie"] [[deps.ClimaAtmos]] deps = ["Adapt", "ArgParse", "ArtifactWrappers", "Artifacts", "AtmosphericProfilesLibrary", "ClimaComms", "ClimaCore", "ClimaDiagnostics", "ClimaParams", "ClimaTimeSteppers", "ClimaUtilities", "CloudMicrophysics", "Dates", "DiffEqBase", "FastGaussQuadrature", "Insolation", "Interpolations", "LazyArtifacts", "LinearAlgebra", "Logging", "NCDatasets", "NVTX", "RRTMGP", "SciMLBase", "StaticArrays", "Statistics", "SurfaceFluxes", "Thermodynamics", "YAML"] -git-tree-sha1 = "0bf67981e00dc746b0d386ef6b20407f817b2a63" +git-tree-sha1 = "46e71d5a34db90621a542abe32b321b550490fc3" +repo-rev = "zs/v0275_fix" +repo-url = "https://github.com/CliMA/ClimaAtmos.jl.git" uuid = "b2c96348-7fb7-4fe0-8da9-78d88439e717" version = "0.27.5" diff --git a/toml/amip.toml b/toml/amip.toml index 19c521eb48..cc704f9b65 100644 --- a/toml/amip.toml +++ b/toml/amip.toml @@ -1,5 +1,5 @@ [alpha_rayleigh_w] -value = 10.0 +value = 1.0 [zd_rayleigh] value = 35000.0 From dc8a4e24337a043540fd7b771c36c0427a0b0783 Mon Sep 17 00:00:00 2001 From: kmdeck <65979205+kmdeck@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:54:20 -0700 Subject: [PATCH 4/4] Update climaland_bucket.jl --- experiments/ClimaEarth/components/land/climaland_bucket.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/ClimaEarth/components/land/climaland_bucket.jl b/experiments/ClimaEarth/components/land/climaland_bucket.jl index 015f529bea..a56b472076 100644 --- a/experiments/ClimaEarth/components/land/climaland_bucket.jl +++ b/experiments/ClimaEarth/components/land/climaland_bucket.jl @@ -208,7 +208,7 @@ function Interfacer.update_field!(sim::BucketSimulation, ::Val{:turbulent_energy end function Interfacer.update_field!(sim::BucketSimulation, ::Val{:snow_precipitation}, field) ρ_liq = (LP.ρ_cloud_liq(sim.model.parameters.earth_param_set)) - parent(sim.integrator.p.drivers.P_snow) .= parent(0)#field ./ ρ_liq) + parent(sim.integrator.p.drivers.P_snow) .= parent(0 .* field ./ ρ_liq) end function Interfacer.update_field!(sim::BucketSimulation, ::Val{:turbulent_moisture_flux}, field) ρ_liq = (LP.ρ_cloud_liq(sim.model.parameters.earth_param_set))