Changeset 15658 for NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/ICE/icevar.F90

Timestamp:

2022-01-19T19:34:39+01:00 (2 years ago)

Author:

jpalmier

Message:

Merge with first branch : NEMO_4.0.4_GO8_package

File:

• NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/ICE/icevar.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_GO8_paquage_branch/src/ICE/icevar.F90

@@ -244 +244 @@
       ELSEWHERE( h_il(:,:,:) >= zhl_max )  ;   a_ip_eff(:,:,:) = 0._wp                  ! lid is very thick. Cover all the pond up with ice and snow
       ELSEWHERE                            ;   a_ip_eff(:,:,:) = a_ip_frac(:,:,:) * &   ! lid is in between. Expose part of the pond
-         &                                                       ( h_il(:,:,:) - zhl_min ) / ( zhl_max - zhl_min )
+         &                                                       ( zhl_max - h_il(:,:,:) ) / ( zhl_max - zhl_min )
       END WHERE
       !
@@ -565 +565 @@
             END DO
          END DO
+
+         !-----------------------------------------------------------------
+         ! zap small ponds
+         !-----------------------------------------------------------------
+         DO jj = 1, jpj
+            DO ji = 1, jpi
+               IF ( v_ip(ji,jj,jl) <= epsi10 ) THEN
+                  a_ip(ji,jj,jl)      = 0._wp
+                  a_ip_frac(ji,jj,jl) = 0._wp
+                  v_ip(ji,jj,jl)      = 0._wp
+                  h_ip(ji,jj,jl)      = 0._wp
+                  v_il(ji,jj,jl)      = 0._wp
+                  h_il(ji,jj,jl)      = 0._wp
+                ENDIF
+            END DO
+         END DO
          !
       END DO 
@@ -696 +712 @@
       WHERE( pe_i (1:npti,:,:) < 0._wp .AND. pe_i (1:npti,:,:) > -epsi06 )   pe_i (1:npti,:,:) = 0._wp   !  e_i must be >= 0
       WHERE( pe_s (1:npti,:,:) < 0._wp .AND. pe_s (1:npti,:,:) > -epsi06 )   pe_s (1:npti,:,:) = 0._wp   !  e_s must be >= 0
-      IF( ln_pnd_LEV ) THEN
+      IF( ln_pnd_LEV .OR. ln_pnd_TOPO ) THEN
          WHERE( pa_ip(1:npti,:) < 0._wp .AND. pa_ip(1:npti,:) > -epsi10 )    pa_ip(1:npti,:)   = 0._wp   ! a_ip must be >= 0
          WHERE( pv_ip(1:npti,:) < 0._wp .AND. pv_ip(1:npti,:) > -epsi10 )    pv_ip(1:npti,:)   = 0._wp   ! v_ip must be >= 0