Changeset 3295


Ignore:
Timestamp:
07/05/17 19:14:28 (5 years ago)
Author:
cetlod
Message:

CM6.0.11 : minor correction on SOURCES/NEMO/zdftke.F90

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/zdftke.F90

    r3293 r3295  
    553553         ! 
    554554         CASE( 1 )                           ! scaling with constant sea-ice thickness 
    555             zmxlm(:,:,1) =  rn_hice  
     555            zmxlm(:,:,1) = ( ( 1. - fr_i(:,:) ) * zraug * taum(:,:) + fr_i(:,:) * rn_hice ) * tmask(:,:,1) 
    556556         ! 
    557557         CASE( 2 )                                 ! scaling with mean sea-ice thickness 
    558558#if defined key_lim3 
    559             zmxlm(:,:,1) = ( 1. - fr_i(:,:) ) * zraug * taum(:,:) * tmask(:,:,1) + fr_i(:,:) * htm_i(:,:) * 2. 
     559            zmxlm(:,:,1) = ( ( 1. - fr_i(:,:) ) * zraug * taum(:,:) + fr_i(:,:) * htm_i(:,:) * 2. ) * tmask(:,:,1) 
    560560#elif ( defined key_lim2 || defined key_cice ) 
    561             zmxlm(:,:,1) = ( 1. - fr_i(:,:) ) * zraug * taum(:,:) * tmask(:,:,1) + fr_i(:,:) * MAXVAL( ht_i, 3 ) 
     561            zmxlm(:,:,1) = ( ( 1. - fr_i(:,:) ) * zraug * taum(:,:) + fr_i(:,:) * MAXVAL( ht_i, 3 ) ) * tmask(:,:,1) 
    562562#else 
    563563            zmxlm(:,:,1) = zraug * taum(:,:) * tmask(:,:,1)  
     
    566566         CASE( 3 )                                 ! scaling with max sea-ice thickness 
    567567#if defined key_lim3 || defined key_lim2 || defined key_cice  
    568             zmxlm(:,:,1) = ( 1. - fr_i(:,:) ) * zraug * taum(:,:) * tmask(:,:,1) + fr_i(:,:) * MAXVAL( ht_i, 3 ) 
     568            zmxlm(:,:,1) = ( ( 1. - fr_i(:,:) ) * zraug * taum(:,:) + fr_i(:,:) * MAXVAL( ht_i, 3 ) ) * tmask(:,:,1) 
    569569#else 
    570570            zmxlm(:,:,1) = zraug * taum(:,:) * tmask(:,:,1)  
Note: See TracChangeset for help on using the changeset viewer.