Changeset 12995

Timestamp:

2020-05-30T08:17:37+02:00 (4 years ago)

Author:

dancopsey

Message:

Do not use isnow in forming zkappa_i but still use it for the coupler

File:

• NEMO/branches/UKMO/NEMO_4.0.1_remove_0.1m_snow_test/src/ICE/icethd_zdf_bl99.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_remove_0.1m_snow_test/src/ICE/icethd_zdf_bl99.F90

@@ -124 +124 @@
       REAL(wp), DIMENSION(jpij,0:nlay_s)   ::   zkappa_s    ! Kappa factor in the snow
       REAL(wp), DIMENSION(jpij,0:nlay_s)   ::   zeta_s      ! Eta factor in the snow
+      REAL(wp), DIMENSION(jpij)            ::   zkappa_combi ! Combined snow and ice surface conductivity
       REAL(wp), DIMENSION(jpij,nlay_i+3)   ::   zindterm    ! 'Ind'ependent term
       REAL(wp), DIMENSION(jpij,nlay_i+3)   ::   zindtbis    ! Temporary 'ind'ependent term
@@ -317 +318 @@
          END DO
          DO ji = 1, npti   ! Snow-ice interface
-            IF ( .NOT. l_T_converged(ji) ) &
-               zkappa_i(ji,0) = zkappa_s(ji,nlay_s) * isnow(ji) + zkappa_i(ji,0) * ( 1._wp - isnow(ji) )
+            IF ( .NOT. l_T_converged(ji) ) THEN
+               ! Calculate combined surface snow and ice conductivity to pass through the coupler
+               zkappa_combi(ji) = zkappa_s(ji,0) * isnow(ji) + zkappa_i(ji,0) * ( 1._wp - isnow(ji) )
+
+               ! If there is snow then use the same snow-ice interface conductivity for the top layer of ice
+               IF ( h_s_1d(ji) > 0._wp ) THEN
+                  zkappa_i(ji,0) = zkappa_s(ji,nlay_s)
+               END IF
+
          END DO
          !
@@ -847 +855 @@
       DO ji = 1, npti
          IF( h_i_1d(ji) > 0.1_wp ) THEN
-            cnd_ice_1d(ji) = 2._wp * zkappa_i(ji,0)
+            cnd_ice_1d(ji) = 2._wp * zkappa_combi(ji)
          ELSE
             cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) * 10._wp