Fixup EnergyHydrology parameter prescriptions

Espeer5 · Espeer5 · commit fba4d2aaa11a · 2025-02-12T03:46:34.000-08:00
diff --git a/docs/tutorials/standalone/Soil/evaporation.jl b/docs/tutorials/standalone/Soil/evaporation.jl
@@ -117,8 +117,7 @@ params = ClimaLand.Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo,
-    NIR_albedo,
+    (PAR_albedo, NIR_albedo),
     emissivity,
     z_0m,
     z_0b,
diff --git a/docs/tutorials/standalone/Soil/evaporation_gilat_loess.jl b/docs/tutorials/standalone/Soil/evaporation_gilat_loess.jl
@@ -62,8 +62,7 @@ params = ClimaLand.Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo,
-    NIR_albedo,
+    (PAR_albedo, NIR_albedo),
     emissivity,
     z_0m,
     z_0b,
diff --git a/docs/tutorials/standalone/Soil/sublimation.jl b/docs/tutorials/standalone/Soil/sublimation.jl
@@ -103,8 +103,7 @@ params = ClimaLand.Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo,
-    NIR_albedo,
+    (PAR_albedo, NIR_albedo),
     emissivity,
     z_0m,
     z_0b,
diff --git a/experiments/benchmarks/land.jl b/experiments/benchmarks/land.jl
@@ -101,10 +101,8 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -118,8 +116,8 @@ function setup_prob(t0, tf, Δt; nelements = (101, 15))
         S_s,
         θ_r,
         spectral_discretization,
-        (PAR_albedo_dry, NIR_albedo_dry),
-        (PAR_albedo_wet, NIR_albedo_wet),
+        albedo_dry,
+        albedo_wet,
     )
 
     f_over = FT(3.28) # 1/m
diff --git a/experiments/benchmarks/snowy_land.jl b/experiments/benchmarks/snowy_land.jl
@@ -101,10 +101,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -118,8 +116,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         S_s,
         θ_r,
         spectral_discretization,
-        (PAR_albedo_dry, NIR_albedo_dry),
-        (PAR_albedo_wet, NIR_albedo_wet),
+        albedo_dry,
+        albedo_wet,
     )
     f_over = FT(3.28) # 1/m
     R_sb = FT(1.484e-4 / 1000) # m/s
diff --git a/experiments/integrated/fluxnet/ozark_pft.jl b/experiments/integrated/fluxnet/ozark_pft.jl
@@ -133,8 +133,7 @@ soil_ps = Soil.EnergyHydrologyParameters(
     z_0b = z_0b_soil,
     emissivity = soil_ϵ,
     spectral_discretization = spectral_discretization,
-    PAR_albedo = soil_α_PAR,
-    NIR_albedo = soil_α_NIR,
+    albedo = (soil_α_PAR, soil_α_NIR),
 );
 
 soil_args = (domain = soil_domain, parameters = soil_ps)
diff --git a/experiments/integrated/fluxnet/run_fluxnet.jl b/experiments/integrated/fluxnet/run_fluxnet.jl
@@ -91,8 +91,7 @@ soil_ps = Soil.EnergyHydrologyParameters(
     z_0b = z_0b_soil,
     emissivity = soil_ϵ,
     spectral_discretization = spectral_discretization,
-    PAR_albedo = soil_α_PAR,
-    NIR_albedo = soil_α_NIR,
+    albedo = (soil_α_PAR, soil_α_NIR),
 );
 
 soil_args = (domain = soil_domain, parameters = soil_ps)
diff --git a/experiments/integrated/fluxnet/snow_soil/simulation.jl b/experiments/integrated/fluxnet/snow_soil/simulation.jl
@@ -76,8 +76,7 @@ soil_ps = Soil.EnergyHydrologyParameters(
     z_0m = z_0m_soil,
     z_0b = z_0b_soil,
     emissivity = soil_ϵ,
-    PAR_albedo = soil_α_PAR,
-    NIR_albedo = soil_α_NIR,
+    albedo = (soil_α_PAR, soil_α_NIR),
 )
 
 soil_args = (parameters = soil_ps,)
diff --git a/experiments/integrated/global/global_parameters.jl b/experiments/integrated/global/global_parameters.jl
@@ -13,10 +13,8 @@ spatially_varying_soil_params =
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo_dry,
-    NIR_albedo_dry,
-    PAR_albedo_wet,
-    NIR_albedo_wet,
+    albedo_dry,
+    albedo_wet,
     f_max,
 ) = spatially_varying_soil_params
 soil_params = Soil.EnergyHydrologyParameters(
@@ -29,10 +27,8 @@ soil_params = Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo_dry = PAR_albedo_dry,
-    NIR_albedo_dry = NIR_albedo_dry,
-    PAR_albedo_wet = PAR_albedo_wet,
-    NIR_albedo_wet = NIR_albedo_wet,
+    albedo_dry = albedo_dry,
+    albedo_wet = albedo_wet,
 );
 f_over = FT(3.28) # 1/m
 R_sb = FT(1.484e-4 / 1000) # m/s
diff --git a/experiments/integrated/performance/conservation/ozark_conservation_setup.jl b/experiments/integrated/performance/conservation/ozark_conservation_setup.jl
@@ -75,8 +75,7 @@ soil_ps = Soil.EnergyHydrologyParameters(
     z_0b = z_0b_soil,
     emissivity = soil_ϵ,
     spectral_discretization = spectral_discretization,
-    PAR_albedo = soil_α_PAR,
-    NIR_albedo = soil_α_NIR,
+    albedo = (soil_α_PAR, soil_α_NIR),
 )
 
 soil_args = (domain = soil_domain, parameters = soil_ps)
diff --git a/experiments/long_runs/land.jl b/experiments/long_runs/land.jl
@@ -101,10 +101,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -117,10 +115,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry = PAR_albedo_dry,
-        NIR_albedo_dry = NIR_albedo_dry,
-        PAR_albedo_wet = PAR_albedo_wet,
-        NIR_albedo_wet = NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
     )
 
     f_over = FT(3.28) # 1/m
diff --git a/experiments/long_runs/land_region.jl b/experiments/long_runs/land_region.jl
@@ -106,10 +106,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (10, 10, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -123,8 +121,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (10, 10, 15))
         S_s,
         θ_r,
         spectral_discretization = spectral_discretization,
-        albedo_dry = (PAR_albedo_dry, NIR_albedo_dry),
-        albedo_wet = (PAR_albedo_wet, NIR_albedo_wet),
+        albedo_dry = albedo_dry,
+        albedo_wet = albedo_wet,
     )
     f_over = FT(3.28) # 1/m
     R_sb = FT(1.484e-4 / 1000) # m/s
diff --git a/experiments/long_runs/snowy_land.jl b/experiments/long_runs/snowy_land.jl
@@ -106,10 +106,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -123,8 +121,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         S_s,
         θ_r,
         spectral_discretization = spectral_discretization,
-        albedo_dry = (PAR_albedo_dry, NIR_albedo_dry),
-        albedo_wet = (PAR_albedo_wet, NIR_albedo_wet),
+        albedo_dry = albedo_dry,
+        albedo_wet = albedo_wet,
     )
     f_over = FT(3.28) # 1/m
     R_sb = FT(1.484e-4 / 1000) # m/s
diff --git a/experiments/long_runs/soil.jl b/experiments/long_runs/soil.jl
@@ -96,10 +96,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry,
-        NIR_albedo_dry,
-        PAR_albedo_wet,
-        NIR_albedo_wet,
+        albedo_dry,
+        albedo_wet,
         f_max,
     ) = spatially_varying_soil_params
     soil_params = Soil.EnergyHydrologyParameters(
@@ -112,10 +110,8 @@ function setup_prob(t0, tf, Δt; outdir = outdir, nelements = (101, 15))
         K_sat,
         S_s,
         θ_r,
-        PAR_albedo_dry = PAR_albedo_dry,
-        NIR_albedo_dry = NIR_albedo_dry,
-        PAR_albedo_wet = PAR_albedo_wet,
-        NIR_albedo_wet = NIR_albedo_wet,
+        albedo_dry = albedo_dry,
+        albedo_wet = albedo_wet,
     )
 
     f_over = FT(3.28) # 1/m
diff --git a/src/simulations/spatial_parameters.jl b/src/simulations/spatial_parameters.jl
@@ -375,10 +375,8 @@ function default_spatially_varying_soil_parameters(
         K_sat = K_sat,
         S_s = S_s,
         θ_r = θ_r,
-        PAR_albedo_wet = PAR_albedo_wet,
-        NIR_albedo_wet = NIR_albedo_wet,
-        PAR_albedo_dry = PAR_albedo_dry,
-        NIR_albedo_dry = NIR_albedo_dry,
+        (PAR_albedo_wet.NIR_albedo_wet),
+        (PAR_albedo_dry, NIR_albedo_dry),
         f_max = f_max,
         mask = mask,
     )
diff --git a/test/integrated/soil_snow.jl b/test/integrated/soil_snow.jl
@@ -68,10 +68,8 @@ soil_params = ClimaLand.Soil.EnergyHydrologyParameters(
     K_sat,
     S_s,
     θ_r,
-    PAR_albedo_dry,
-    NIR_albedo_dry,
-    PAR_albedo_wet,
-    NIR_albedo_wet,
+    (PAR_albedo_dry, NIR_albedo_dry),
+    (PAR_albedo_wet, NIR_albedo_wet),
     emissivity,
     z_0m,
     z_0b,
diff --git a/test/shared_utilities/implicit_timestepping/energy_hydrology_model.jl b/test/shared_utilities/implicit_timestepping/energy_hydrology_model.jl
@@ -234,10 +234,8 @@ for FT in (Float32, Float64)
                 heat = zero_heat_flux,
             ),
         )
-        NIR_albedo_dry = fill(FT(0.4), domain.space.surface)
-        PAR_albedo_dry = fill(FT(0.2), domain.space.surface)
-        NIR_albedo_wet = fill(FT(0.3), domain.space.surface)
-        PAR_albedo_wet = fill(FT(0.1), domain.space.surface)
+        albedo_dry = fill(FT.((0.2, 0.4)), domain.space.surface)
+        albedo_wet = fill(FT.((0.1, 0.3)), domain.space.surface)
         params = ClimaLand.Soil.EnergyHydrologyParameters(
             FT;
             ν,
@@ -248,10 +246,8 @@ for FT in (Float32, Float64)
             K_sat,
             S_s,
             θ_r,
-            NIR_albedo_dry,
-            PAR_albedo_dry,
-            NIR_albedo_wet,
-            PAR_albedo_wet,
+            albedo_dry,
+            albedo_wet,
             emissivity,
             z_0m,
             z_0b,

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,7 @@ soil_ps = Soil.EnergyHydrologyParameters(`
`76`	`76`	`z_0m = z_0m_soil,`
`77`	`77`	`z_0b = z_0b_soil,`
`78`	`78`	`emissivity = soil_ϵ,`
`79`		`- PAR_albedo = soil_α_PAR,`
`80`		`- NIR_albedo = soil_α_NIR,`
	`79`	`+ albedo = (soil_α_PAR, soil_α_NIR),`
`81`	`80`	`)`
`82`	`81`
`83`	`82`	`soil_args = (parameters = soil_ps,)`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ soil_ps = Soil.EnergyHydrologyParameters(`
`75`	`75`	`z_0b = z_0b_soil,`
`76`	`76`	`emissivity = soil_ϵ,`
`77`	`77`	`spectral_discretization = spectral_discretization,`
`78`		`- PAR_albedo = soil_α_PAR,`
`79`		`- NIR_albedo = soil_α_NIR,`
	`78`	`+ albedo = (soil_α_PAR, soil_α_NIR),`
`80`	`79`	`)`
`81`	`80`
`82`	`81`	`soil_args = (domain = soil_domain, parameters = soil_ps)`