Changeset 12333


Ignore:
Timestamp:
2020-01-17T17:33:38+01:00 (9 months ago)
Author:
dancopsey
Message:

Remove outer IF test that tests for snow thicknesses greater than 0.1. This is already delt with by using the isnow method further up in the code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0.1_remove_0.1m_snow_test/src/ICE/icethd_zdf_bl99.F90

    r11715 r12333  
    839839      ! effective conductivity and 1st layer temperature (needed by Met Office) 
    840840      DO ji = 1, npti 
    841          IF( h_s_1d(ji) > 0.1_wp ) THEN  
    842             cnd_ice_1d(ji) = 2._wp * zkappa_s(ji,0) 
     841         IF( h_i_1d(ji) > 0.1_wp ) THEN 
     842            cnd_ice_1d(ji) = 2._wp * zkappa_i(ji,0) 
    843843         ELSE 
    844             IF( h_i_1d(ji) > 0.1_wp ) THEN 
    845                cnd_ice_1d(ji) = 2._wp * zkappa_i(ji,0) 
    846             ELSE 
    847                cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) * 10._wp 
    848             ENDIF 
     844            cnd_ice_1d(ji) = 2._wp * ztcond_i(ji,0) * 10._wp 
    849845         ENDIF 
    850846         t1_ice_1d(ji) = isnow(ji) * t_s_1d(ji,1) + ( 1._wp - isnow(ji) ) * t_i_1d(ji,1) 
Note: See TracChangeset for help on using the changeset viewer.