Changeset 4180 for trunk/LMDZ.COMMON/libf/evolution/surf_ice.F90

Timestamp:

Apr 10, 2026, 7:17:55 PM (6 hours ago)

Author:

jbclement

Message:

PEM:

• Rework layering-related logic, especially clarify interactions between surface and subsurface water tendencies and disable CO2 lag resistance (inconsistent without updating pressure and mass balance + PCM).
• Prevent simultaneous activation of layering and ice flows.
• Add warning when flux_geo /= 0 while soil is disabled.
• Add new utility function "is_lvl_enabled" for displaying.
• Replace deprecated 'minieps' with 'eps'/'tol'.

JBC

File:

• trunk/LMDZ.COMMON/libf/evolution/surf_ice.F90 (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/evolution/surf_ice.F90

@@ -16 +16 @@
 ! DEPENDENCIES
 ! ------------
-use numerics, only: dp, qp, di, k4, minieps
+use numerics, only: dp, qp, di, k4, eps, tol
 
 ! DECLARATION
@@ -30 +30 @@
 integer(di),                              parameter :: WEIGHT_RESERVOIR = 5_di ! Weight by locally available H2O ice mass
 integer(di),                              parameter :: WEIGHT_DIRECTION = 6_di ! Weight by directional capacity (up/down)
-integer(di),                              private   :: weight_method = WEIGHT_DIRECTION ! Default method for balancing
+integer(di),                              private   :: weight_method = WEIGHT_COMBINED ! Default method for balancing
 real(dp),                                 parameter :: rho_co2ice = 1650._dp ! Density of CO2 ice [kg.m-3]
 real(dp),                                 parameter :: rho_h2oice = 920._dp  ! Density of H2O ice [kg.m-3]
@@ -420 +420 @@
 ! ---------------
 integer(di), parameter :: max_iter = 50_di ! Maximum number of iterations for the balancing procedure
-real(dp),    parameter :: eps = 1.e-12_dp ! Small number to prevent division by zero in weights normalization
-real(dp),    parameter :: tiny_corr = minieps ! Minimum correction to consider that progress is made in the balancing procedure
 integer(di)                              :: i, islope, iter
 integer(di)                              :: method_used
@@ -556 +554 @@
     Delta = Delta - Delta_used
 
-    if (abs(Delta_used) < tiny_corr) exit
+    ! Test if the balancing procedure progresses
+    if (abs(Delta_used) < tol) exit
 end do