New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13864 – NEMO

Changeset 13864


Ignore:
Timestamp:
2020-11-24T18:34:20+01:00 (4 years ago)
Author:
dancopsey
Message:

Merged in changes from NEMO4.0.3 branch here:

http://forge.ipsl.jussieu.fr/nemo/log/NEMO/branches/UKMO/NEMO_4.0.3_isnow_comb_t1_ice

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r13787_isnow_comb_t1_ice/src/ICE/icethd_zdf_bl99.F90

    r13472 r13864  
    908908            cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) / zhi_ssl ! cnd_ice is capped by: cond_i/zhi_ssl 
    909909         ENDIF 
    910          t1_ice_1d(ji) = isnow(ji) * t_s_1d(ji,1) + ( 1._wp - isnow(ji) ) * t_i_1d(ji,1) 
     910         t1_ice_1d(ji) = isnow_comb(ji) * t_s_1d(ji,1) + ( 1._wp - isnow_comb(ji) ) * t_i_1d(ji,1) 
    911911      END DO 
    912912      ! 
Note: See TracChangeset for help on using the changeset viewer.