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 11263 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/ICE/icethd_do.F90 – NEMO

Ignore:
Timestamp:
2019-07-12T12:47:53+02:00 (5 years ago)
Author:
smasson
Message:

dev_r10984_HPC-13 : merge with trunk@11242, see #2285

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/ICE/icethd_do.F90

    r10994 r11263  
    128128 
    129129      ! Default new ice thickness 
    130       WHERE( qlead(:,:) < 0._wp )   ;   ht_i_new(:,:) = rn_hinew 
    131       ELSEWHERE                     ;   ht_i_new(:,:) = 0._wp 
     130      WHERE( qlead(:,:) < 0._wp  .AND. tau_icebfr(:,:) == 0._wp )   ;   ht_i_new(:,:) = rn_hinew ! if cooling and no landfast 
     131      ELSEWHERE                                                     ;   ht_i_new(:,:) = 0._wp 
    132132      END WHERE 
    133133 
     
    182182                  END DO 
    183183                  ! 
     184                  ! bound ht_i_new (though I don't see why it should be necessary) 
     185                  ht_i_new(ji,jj) = MAX( 0.01_wp, MIN( ht_i_new(ji,jj), hi_max(jpl) ) ) 
     186                  ! 
    184187               ENDIF 
    185188               ! 
Note: See TracChangeset for help on using the changeset viewer.