Changeset 11395 for NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN
- Timestamp:
- 2019-08-02T16:19:00+02:00 (5 years ago)
- Location:
- NEMO/branches/2019/ENHANCE-02_ISF_nemo
- Files:
-
- 5 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/divhor.F90
r10425 r11395 22 22 USE sbc_oce, ONLY : ln_rnf, ln_isf ! surface boundary condition: ocean 23 23 USE sbcrnf ! river runoff 24 USE sbcisf! ice shelf24 USE isfhdiv ! ice shelf 25 25 USE iscplhsb ! ice sheet / ocean coupling 26 26 USE iscplini ! ice sheet / ocean coupling … … 100 100 ! 101 101 #endif 102 IF( ln_isf ) CALL sbc_isf_div( hdivn ) !== ice shelf ==! (update hdivn field) 103 ! 104 IF( ln_iscpl .AND. ln_hsb ) CALL iscpl_div( hdivn ) !== ice sheet ==! (update hdivn field) 102 IF( ln_isf ) CALL isf_hdiv( hdivn ) !== ice shelf ==! (update hdivn field) 105 103 ! 106 104 CALL lbc_lnk( 'divhor', hdivn, 'T', 1. ) ! (no sign change) -
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/dynhpg.F90
r10491 r11395 31 31 !!---------------------------------------------------------------------- 32 32 USE oce ! ocean dynamics and tracers 33 USE isf ! ice shelf 33 34 USE sbc_oce ! surface variable (only for the flag with ice shelf) 34 35 USE dom_oce ! ocean space and time domain -
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/dynnxt.F90
r10425 r11395 29 29 USE sbc_oce ! Surface boundary condition: ocean fields 30 30 USE sbcrnf ! river runoffs 31 USE sbcisf ! ice shelf31 USE isfnxt 32 32 USE phycst ! physical constants 33 33 USE dynadv ! dynamics: vector invariant versus flux form … … 241 241 ENDIF 242 242 END IF 243 244 IF ( ln_isf ) THEN ! if ice shelf melting 245 DO jk = 1, jpkm1 ! Deal with isf separetely, as can be through depth too 246 DO jj = 1, jpj 247 DO ji = 1, jpi 248 IF( misfkt(ji,jj) <=jk .and. jk < misfkb(ji,jj) ) THEN 249 e3t_b(ji,jj,jk) = e3t_b(ji,jj,jk) - zcoef * ( fwfisf_b(ji,jj) - fwfisf(ji,jj) ) & 250 & * ( e3t_n(ji,jj,jk) * r1_hisf_tbl(ji,jj) ) * tmask(ji,jj,jk) 251 ELSEIF ( jk==misfkb(ji,jj) ) THEN 252 e3t_b(ji,jj,jk) = e3t_b(ji,jj,jk) - zcoef * ( fwfisf_b(ji,jj) - fwfisf(ji,jj) ) & 253 & * ( e3t_n(ji,jj,jk) * r1_hisf_tbl(ji,jj) ) * ralpha(ji,jj) * tmask(ji,jj,jk) 254 ENDIF 255 END DO 256 END DO 257 END DO 258 END IF 243 ! 244 ! ice shelf melting 245 IF ( ln_isf ) CALL isf_dynnxt( zcoef ) 259 246 ! 260 247 IF( ln_dynadv_vec ) THEN ! Asselin filter applied on velocity -
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/dynspg_ts.F90
r10742 r11395 33 33 USE zdf_oce ! vertical physics: variables 34 34 USE zdfdrg ! vertical physics: top/bottom drag coef. 35 USE sbcisf! ice shelf variable (fwfisf)35 USE isf ! ice shelf variable (fwfisf) 36 36 USE sbcapr ! surface boundary condition: atmospheric pressure 37 37 USE dynadv , ONLY: ln_dynadv_vec … … 632 632 ! ! Surface net water flux and rivers 633 633 IF (ln_bt_fw) THEN 634 zssh_frc(:,:) = r1_rau0 * ( emp(:,:) - rnf(:,:) + fwfisf (:,:) )634 zssh_frc(:,:) = r1_rau0 * ( emp(:,:) - rnf(:,:) + fwfisf_cav(:,:) + fwfisf_par(:,:) ) 635 635 ELSE 636 636 zztmp = r1_rau0 * r1_2 637 637 zssh_frc(:,:) = zztmp * ( emp(:,:) + emp_b(:,:) - rnf(:,:) - rnf_b(:,:) & 638 & + fwfisf(:,:) + fwfisf_b(:,:) ) 638 & + fwfisf_cav(:,:) + fwfisf_cav_b(:,:) & 639 & + fwfisf_par(:,:) + fwfisf_par_b(:,:) ) 639 640 ENDIF 640 641 ! -
NEMO/branches/2019/ENHANCE-02_ISF_nemo/src/OCE/DYN/sshwzv.F90
r11293 r11395 17 17 !!---------------------------------------------------------------------- 18 18 USE oce ! ocean dynamics and tracers variables 19 USE isf ! ice shelf 19 20 USE dom_oce ! ocean space and time domain variables 20 21 USE sbc_oce ! surface boundary condition: ocean … … 256 257 sshb(:,:) = sshb(:,:) - zcoef * ( emp_b(:,:) - emp (:,:) & 257 258 & - rnf_b(:,:) + rnf (:,:) & 258 & + fwfisf_b(:,:) - fwfisf(:,:) ) * ssmask(:,:) 259 & + fwfisf_cav_b(:,:) - fwfisf_cav(:,:) & 260 & + fwfisf_par_b(:,:) - fwfisf_par(:,:) ) * ssmask(:,:) 259 261 ENDIF 260 262 sshn(:,:) = ssha(:,:) ! now <-- after
Note: See TracChangeset
for help on using the changeset viewer.