Changeset 5447 for branches/UKMO/dev_r5107_mld_zint/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90

Timestamp:

2015-06-19T18:07:11+02:00 (9 years ago)

Author:

davestorkey

Message:

Update UKMO/dev_r5107_mld_zint branch to revision 5442 of the trunk.

File:

• branches/UKMO/dev_r5107_mld_zint/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90 (modified) (3 diffs)

branches/UKMO/dev_r5107_mld_zint/NEMOGCM/NEMO/LIM_SRC_2/limthd_zdf_2.F90

@@ -18 +18 @@
    USE ice_2
    USE limistate_2
-   USE sbc_oce, ONLY : lk_cpl
+   USE sbc_oce, ONLY : ln_cpl
    USE in_out_manager
    USE lib_mpp          ! MPP library
@@ -273 +273 @@
        END DO
 
-       IF( ltrcdm2dc_ice )THEN
-
-          DO ji = kideb , kiut
-             zihsn  = MAX( zzero , SIGN (zone , -h_snow_1d(ji) ) )
-             zihic  = MAX( zzero , 1.0 - ( h_ice_1d(ji) / zhsu ) )
-             zi0(ji)  = zihsn * ( fr1_i0_1d(ji) + zihic * fr2_i0_1d(ji) )
-             zexp     = MIN( zone , EXP( -1.5 * ( h_ice_1d(ji) - zhsu ) ) )
-             fstbif_daymean_1d(ji) = zi0(ji) * qsr_ice_mean_1d(ji) * zexp
-          END DO
-
-       ENDIF
-
        !--------------------------------------------------------------------------------
        !  4. Computation of the surface temperature : determined by considering the 
@@ -337 +325 @@
        !----------------------------------------------------------------------  
                      
-       IF ( .NOT. lk_cpl ) THEN   ! duplicate the loop for performances issues
+       IF ( .NOT. ln_cpl ) THEN   ! duplicate the loop for performances issues
           DO ji = kideb, kiut
              sist_1d(ji) = MIN( ztsmlt(ji) , sist_1d(ji) )