Changeset 13043

Timestamp:

2020-06-04T13:07:22+02:00 (5 years ago)

Author:

dancopsey

Message:

Remove outer IF test that tests for snow thicknesses greater than 0.1.

File:

• NEMO/branches/UKMO/NEMO_4.0.1_snow_frac_cpl/src/ICE/icethd_zdf_bl99.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.1_snow_frac_cpl/src/ICE/icethd_zdf_bl99.F90

@@ -839 +839 @@
       ! effective conductivity and 1st layer temperature (needed by Met Office)
       DO ji = 1, npti
-         IF( h_s_1d(ji) > 0.1_wp ) THEN 
-            cnd_ice_1d(ji) = 2._wp * zkappa_s(ji,0)
+         IF( h_i_1d(ji) > 0.1_wp ) THEN
+            cnd_ice_1d(ji) = 2._wp * zkappa_i(ji,0)
          ELSE
-            IF( h_i_1d(ji) > 0.1_wp ) THEN
-               cnd_ice_1d(ji) = 2._wp * zkappa_i(ji,0)
-            ELSE
-               cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) * 10._wp
-            ENDIF
+            cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) * 10._wp
          ENDIF
          t1_ice_1d(ji) = isnow(ji) * t_s_1d(ji,1) + ( 1._wp - isnow(ji) ) * t_i_1d(ji,1)