Changeset 13643
- Timestamp:
- 2020-10-20T01:41:14+02:00 (3 years ago)
- Location:
- NEMO/trunk/src/ICE
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/trunk/src/ICE/ice1d.F90
r13472 r13643 145 145 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: sst_1d 146 146 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: sss_1d 147 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:) :: frq_m_1d 147 148 148 149 ! convergence check … … 225 226 ! 226 227 ii = ii + 1 227 ALLOCATE( sst_1d(jpij) , sss_1d(jpij) , STAT=ierr(ii) )228 ALLOCATE( sst_1d(jpij) , sss_1d(jpij) , frq_m_1d(jpij) , STAT=ierr(ii) ) 228 229 ! 229 230 ii = ii + 1 -
NEMO/trunk/src/ICE/icethd.F90
r13641 r13643 435 435 CALL tab_2d_1d( npti, nptidx(1:npti), sst_1d(1:npti), sst_m ) 436 436 CALL tab_2d_1d( npti, nptidx(1:npti), sss_1d(1:npti), sss_m ) 437 CALL tab_2d_1d( npti, nptidx(1:npti), frq_m_1d(1:npti), frq_m ) 437 438 ! 438 439 ! to update ice age -
NEMO/trunk/src/ICE/icethd_dh.F90
r13601 r13643 139 139 ! 140 140 DO ji = 1, npti 141 zf_tt(ji) = qcn_ice_bot_1d(ji) + qsb_ice_bot_1d(ji) + fhld_1d(ji) 141 zf_tt(ji) = qcn_ice_bot_1d(ji) + qsb_ice_bot_1d(ji) + fhld_1d(ji) + qtr_ice_bot_1d(ji) * frq_m_1d(ji) 142 142 zq_bot(ji) = MAX( 0._wp, zf_tt(ji) * rDt_ice ) 143 143 END DO -
NEMO/trunk/src/ICE/iceupdate.F90
r13601 r13643 136 136 ! solar flux transmitted thru the 1st level of the ocean (i.e. not used by sea-ice) 137 137 qsr(ji,jj) = ( 1._wp - at_i_b(ji,jj) ) * qsr_oce(ji,jj) * ( 1._wp - frq_m(ji,jj) ) & 138 ! + solar flux transmitted thru ice (also not used by sea-ice)139 & + SUM( a_i_b(ji,jj,:) * qtr_ice_bot(ji,jj,:) ) 138 ! + solar flux transmitted thru ice and the 1st ocean level (also not used by sea-ice) 139 & + SUM( a_i_b(ji,jj,:) * qtr_ice_bot(ji,jj,:) ) * ( 1._wp - frq_m(ji,jj) ) 140 140 ! 141 141 ELSE !-- cooling or no ice left
Note: See TracChangeset
for help on using the changeset viewer.