Changeset 11564 for NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/ICE/icethd_do.F90
- Timestamp:
- 2019-09-18T16:11:52+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r10973_AGRIF-01_jchanut_small_jpi_jpj/src/ICE/icethd_do.F90
r10425 r11564 113 113 114 114 IF( ln_icediachk ) CALL ice_cons_hsm( 0, 'icethd_do', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft ) 115 116 CALL ice_var_agg(1) 117 CALL ice_var_glo2eqv 118 115 IF( ln_icediachk ) CALL ice_cons2D ( 0, 'icethd_do', diag_v, diag_s, diag_t, diag_fv, diag_fs, diag_ft ) 116 117 at_i(:,:) = SUM( a_i, dim=3 ) 119 118 !------------------------------------------------------------------------------! 120 119 ! 1) Collection thickness of ice formed in leads and polynyas … … 130 129 131 130 ! Default new ice thickness 132 WHERE( qlead(:,:) < 0._wp ) ; ht_i_new(:,:) = rn_hinew133 ELSEWHERE ; ht_i_new(:,:) = 0._wp131 WHERE( qlead(:,:) < 0._wp .AND. tau_icebfr(:,:) == 0._wp ) ; ht_i_new(:,:) = rn_hinew ! if cooling and no landfast 132 ELSEWHERE ; ht_i_new(:,:) = 0._wp 134 133 END WHERE 135 134 … … 184 183 END DO 185 184 ! 185 ! bound ht_i_new (though I don't see why it should be necessary) 186 ht_i_new(ji,jj) = MAX( 0.01_wp, MIN( ht_i_new(ji,jj), hi_max(jpl) ) ) 187 ! 186 188 ENDIF 187 189 ! … … 319 321 320 322 ! --- lateral ice growth --- ! 321 ! If lateral ice growth gives an ice concentration gt 1, then323 ! If lateral ice growth gives an ice concentration > amax, then 322 324 ! we keep the excessive volume in memory and attribute it later to bottom accretion 323 325 DO ji = 1, npti 324 IF ( za_newice(ji) > ( rn_amax_1d(ji) - at_i_1d(ji) ) ) THEN325 zda_res(ji) = za_newice(ji) - (rn_amax_1d(ji) - at_i_1d(ji) )326 IF ( za_newice(ji) > MAX( 0._wp, rn_amax_1d(ji) - at_i_1d(ji) ) ) THEN ! max is for roundoff error 327 zda_res(ji) = za_newice(ji) - MAX( 0._wp, rn_amax_1d(ji) - at_i_1d(ji) ) 326 328 zdv_res(ji) = zda_res (ji) * zh_newice(ji) 327 za_newice(ji) = za_newice(ji) - zda_res (ji)328 zv_newice(ji) = zv_newice(ji) - zdv_res (ji)329 za_newice(ji) = MAX( 0._wp, za_newice(ji) - zda_res (ji) ) 330 zv_newice(ji) = MAX( 0._wp, zv_newice(ji) - zdv_res (ji) ) 329 331 ELSE 330 332 zda_res(ji) = 0._wp … … 419 421 ! 420 422 IF( ln_icediachk ) CALL ice_cons_hsm(1, 'icethd_do', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) 423 IF( ln_icediachk ) CALL ice_cons2D (1, 'icethd_do', diag_v, diag_s, diag_t, diag_fv, diag_fs, diag_ft) 421 424 ! 422 425 END SUBROUTINE ice_thd_do … … 442 445 REWIND( numnam_ice_ref ) ! Namelist namthd_do in reference namelist : Ice thermodynamics 443 446 READ ( numnam_ice_ref, namthd_do, IOSTAT = ios, ERR = 901) 444 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namthd_do in reference namelist' , lwp)447 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namthd_do in reference namelist' ) 445 448 REWIND( numnam_ice_cfg ) ! Namelist namthd_do in configuration namelist : Ice thermodynamics 446 449 READ ( numnam_ice_cfg, namthd_do, IOSTAT = ios, ERR = 902 ) 447 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namthd_do in configuration namelist' , lwp)450 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namthd_do in configuration namelist' ) 448 451 IF(lwm) WRITE( numoni, namthd_do ) 449 452 !
Note: See TracChangeset
for help on using the changeset viewer.