Changeset 15746

Timestamp:

2022-03-09T12:40:43+01:00 (2 years ago)

Author:

jpalmier

Message:

includes NEMO_4.0.4_penetrating_solar_no_neg fix in to avoid conflict issues

File:

• NEMO/branches/UKMO/NEMO_4.0.4_MEDUSA_externals_GC5/src/OCE/SBC/sbccpl.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.4_MEDUSA_externals_GC5/src/OCE/SBC/sbccpl.F90

@@ -2384 +2384 @@
          CASE ('coupled')
             IF (ln_scale_ice_flux) THEN
-               WHERE( a_i(:,:,:) > 0.0_wp ) zqtr_ice_top(:,:,:) = frcv(jpr_qtr)%z3(:,:,:) * a_i_last_couple(:,:,:) / a_i(:,:,:)
+               WHERE( a_i(:,:,:) > 0.0_wp ) zqtr_ice_top(:,:,:) = MAX(0._wp, frcv(jpr_qtr)%z3(:,:,:)) * a_i_last_couple(:,:,:) / a_i(:,:,:)
                WHERE( a_i(:,:,:) <= 0.0_wp ) zqtr_ice_top(:,:,:) = 0.0_wp
             ELSE
-               zqtr_ice_top(:,:,:) = frcv(jpr_qtr)%z3(:,:,:)
+               zqtr_ice_top(:,:,:) = MAX(0._wp, frcv(jpr_qtr)%z3(:,:,:))
             ENDIF