Changeset 11908 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src
- Timestamp:
- 2019-11-14T20:20:07+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/ISF/isfcpl.F90
r11902 r11908 61 61 ! check presence of variable needed for coupling 62 62 ! iom_varid return 0 if not found 63 id = 063 id = 1 64 64 id = id * iom_varid(numror, 'ssmask', ldstop = .false.) 65 65 id = id * iom_varid(numror, 'tmask' , ldstop = .false.) … … 145 145 !!---------------------------------------------------------------------- 146 146 !! 147 INTEGER :: ji, jj, jd 147 INTEGER :: ji, jj, jd, jk !! loop index 148 148 INTEGER :: jip1, jim1, jjp1, jjm1 149 149 !! … … 195 195 ! 196 196 ! recompute the vertical scale factor, depth and water thickness 197 IF(lwp) write(numout,*) 'isfcpl_ssh : recompute scale factor from sshn (new wet cell)' 198 IF(lwp) write(numout,*) '~~~~~~~~~~~' 199 DO jk = 1, jpk 200 e3t_n(:,:,jk) = e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:) ) & 201 & / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk) & 202 & + e3t_0(:,:,jk) * (1._wp -tmask(:,:,jk)) 203 END DO 204 e3t_b(:,:,:) = e3t_n(:,:,:) 197 205 CALL dom_vvl_zgr() 198 206 ! -
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/TRA/traisf.F90
r11902 r11908 68 68 ! ensure 0 trend due to unconservation of the ice shelf coupling 69 69 IF ( ln_isfcpl_cons ) CALL tra_isf_cpl(risfcpl_cons_tsc, tsa) 70 71 IF ( ln_isfdebug ) THEN 72 CALL debug('tra_isf: risfcpl_tsc T',risfcpl_tsc(:,:,1)) 73 CALL debug('tra_isf: risfcpl_tsc S',risfcpl_tsc(:,:,2)) 74 END IF 70 75 ! 71 76 END IF 72 77 ! 73 78 IF ( ln_isfdebug ) THEN 74 CALL debug('tra_isf: risfcpl_tsc T',risfcpl_tsc(:,:,1))75 CALL debug('tra_isf: risfcpl_tsc S',risfcpl_tsc(:,:,2))76 79 CALL debug('tra_isf: tsa T' ,tsa(:,:,:,1)) 77 80 CALL debug('tra_isf: tsa S' ,tsa(:,:,:,2))
Note: See TracChangeset
for help on using the changeset viewer.