Merge pull request #568 from CliMA/aj/effective_radius

Clip effective radius between the values from the lookup table
CliMA · Feb 11, 2025 · ed0dca5 · ed0dca5 · trontrytel · Feb 11, 2025
2 parents 46ab9c1 + aae4d32
commit ed0dca5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -4,6 +4,11 @@ RRTMGP.jl Release Notes
 main
 ------
 
+v0.20.1
+------
+- Clip effective radius by the look-up table range
+PR [#568](https://github.com/CliMA/RRTMGP.jl/pull/568)
+
 v0.20.0
 ------
 - Add five size bins of dust and sea salt aerosols.
@@ -31,11 +36,11 @@ updated. PR [#550](https://github.com/CliMA/RRTMGP.jl/pull/550).
 #### Fix aerosol lookup table
 
 Starting with this release, RRTGMP.jl will use an aerosol look up table that is internally stored, as opposed
-to downloading it from the `rrtgmp-data` repository. The reason for this change is that the data distributed 
-with `rrtgmp-data` contains an an error in the array ordering for the aerosol optics lookup table for sea-salt (‘aero_salt_tbl’). 
-This error was fixed in the internal table. `RRTGMP.jl` will revert to using `rrtgmp-data` 
+to downloading it from the `rrtgmp-data` repository. The reason for this change is that the data distributed
+with `rrtgmp-data` contains an an error in the array ordering for the aerosol optics lookup table for sea-salt (‘aero_salt_tbl’).
+This error was fixed in the internal table. `RRTGMP.jl` will revert to using `rrtgmp-data`
 once the repository updates their tables. PR [#548](https://github.com/CliMA/RRTMGP.jl/pull/548/).
-This new lookup table fixes an error in the array ordering for the aerosol optics 
+This new lookup table fixes an error in the array ordering for the aerosol optics
 lookup table for the shortwave sea-salt data (‘aero_salt_tbl’).
 PR [#548](https://github.com/CliMA/RRTMGP.jl/pull/548/).
 

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "RRTMGP"
 uuid = "a01a1ee8-cea4-48fc-987c-fc7878d79da1"
 authors = ["Climate Modeling Alliance"]
-version = "0.20.0"
+version = "0.20.1"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

diff --git a/src/optics/cloud_optics.jl b/src/optics/cloud_optics.jl
@@ -157,6 +157,7 @@ This function computes the `TwoStream` cloud liquid properties using the `LookUp
     # cloud liquid particles
     if cld_path_liq > eps(FT)
         Δr_liq = (radliq_upr - radliq_lwr) / FT(nsize_liq - 1)
+        re_liq = max(min(re_liq, radliq_upr), radliq_lwr)
         loc = Int(max(min(unsafe_trunc(Int, (re_liq - radliq_lwr) / Δr_liq) + 1, nsize_liq - 1), 1))
         fac = (re_liq - radliq_lwr - (loc - 1) * Δr_liq) / Δr_liq
         fc1 = FT(1) - fac
@@ -198,6 +199,7 @@ This function computes the `TwoStream` cloud ice properties using the `LookUpTab
     # cloud ice particles
     if cld_path_ice > eps(FT)
         Δr_ice = (radice_upr - radice_lwr) / FT(nsize_ice - 1)
+        re_ice = max(min(re_ice, radice_upr), radice_lwr)
         loc = Int(max(min(unsafe_trunc(Int, (re_ice - radice_lwr) / Δr_ice) + 1, nsize_ice - 1), 1))
         fac = (re_ice - radice_lwr - (loc - 1) * Δr_ice) / Δr_ice
         fc1 = FT(1) - fac
@@ -229,7 +231,7 @@ function build_cloud_mask!(
         finish = _get_finish(cld_frac) # last cloudy layer
         # set cloud mask for non-cloudy layers
         _mask_outer_non_cloudy_layers!(cld_mask, start, finish)
-        # RRTMG uses random_arr[finish] > (FT(1) - cld_frac[finish]), 
+        # RRTMG uses random_arr[finish] > (FT(1) - cld_frac[finish]),
         # we change > to >= to address edge cases
         @inbounds cld_frac_ilayplus1 = cld_frac[finish]
         random_ilayplus1 = Random.rand()