Changeset 13180
- Timestamp:
- 2020-06-29T21:31:19+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/ticket2487/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/ticket2487/src/ICE/iceistate.F90
r13179 r13180 388 388 IF( .NOT.ln_linssh ) THEN 389 389 ! 390 WHERE( ht_0(:,:) > 0 ) ; z2d(:,:) = 1._wp + sshn(:,:)*tmask(:,:,1) / ht_0(:,:) 391 ELSEWHERE ; z2d(:,:) = 1._wp ; END WHERE 390 z2d(:,:) = 1._wp + sshn(:,:) * ssmask(:,:) / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) 392 391 ! 393 392 DO jk = 1,jpkm1 ! adjust initial vertical scale factors -
NEMO/branches/2020/ticket2487/src/OCE/SBC/sbcfwb.F90
r13177 r13180 38 38 REAL(wp) :: fwfold ! fwfold to be suppressed 39 39 REAL(wp) :: area ! global mean ocean surface (interior domain) 40 REAL(wp) :: area2 ! global ocean surface area (interior domain) incl. ice-shelf cavities 40 41 41 42 !! * Substitutions … … 91 92 ! isf cavities are excluded because it can feedback to the melting with generation of inhibition of plumes 92 93 ! and in case of no melt, it can generate HSSW. 94 area2 = glob_sum( 'sbcfwb', e1e2t(:,:) ) ! global interior-domain ocean surface incl. ice-shelf cavities 93 95 ! 94 96 #if ! defined key_si3 && ! defined key_cice … … 129 131 ! sum over the global domain 130 132 a_fwb = glob_sum( 'sbcfwb', e1e2t(:,:) * ( sshn(:,:) + snwice_mass(:,:) * r1_rau0 ) ) 131 a_fwb = a_fwb * rau0 / ( area * rday * nyear_len(1) ) ! convert in kg/m3/s133 a_fwb = a_fwb * rau0 / ( area2 * rday * nyear_len(1) ) ! convert in kg/m3/s 132 134 fwfold = a_fwb ! current year freshwater budget correction 133 135 ! ! estimate from the previous year budget -
NEMO/branches/2020/ticket2487/src/OCE/SBC/sbcice_cice.F90
r13179 r13180 236 236 ! 237 237 DO jk = 1,jpkm1 ! adjust initial vertical scale factors 238 e3t_n(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshn(:,:)* tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )239 e3t_b(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshb(:,:)* tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )238 e3t_n(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshn(:,:)*ssmask(:,:)/(ht_0(:,:) + 1._wp - ssmask(:,:)) ) 239 e3t_b(:,:,jk) = e3t_0(:,:,jk)*( 1._wp + sshb(:,:)*ssmask(:,:)/(ht_0(:,:) + 1._wp - ssmask(:,:)) ) 240 240 ENDDO 241 241 e3t_a(:,:,:) = e3t_b(:,:,:)
Note: See TracChangeset
for help on using the changeset viewer.