Changeset 11053 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE
- Timestamp:
- 2019-05-24T12:53:06+02:00 (5 years ago)
- Location:
- NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE
- Files:
-
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/BDY/bdydta.F90
r10957 r11053 255 255 CALL fld_read( kt=kt, kn_fsbc=1, sd=bf(jstart:jend), & 256 256 & map=nbmap_ptr(jstart:jend), kt_offset=time_offset, jpk_bdy=nb_jpk_bdy, & 257 & fvl=ln_full_vel_array(jbdy) )257 & fvl=ln_full_vel_array(jbdy), Kmm=Kmm ) 258 258 ENDIF 259 259 ! If full velocities in boundary data then split into barotropic and baroclinic data … … 270 270 & + e3u(ii,ij,ik,Kmm) * umask(ii,ij,ik) * dta%u3d(ib,ik) 271 271 END DO 272 dta%u2d(ib) = dta%u2d(ib) * r1_hu _n(ii,ij)272 dta%u2d(ib) = dta%u2d(ib) * r1_hu(ii,ij,Kmm) 273 273 DO ik = 1, jpkm1 274 274 dta%u3d(ib,ik) = dta%u3d(ib,ik) - dta%u2d(ib) … … 284 284 & + e3v(ii,ij,ik,Kmm) * vmask(ii,ij,ik) * dta%v3d(ib,ik) 285 285 END DO 286 dta%v2d(ib) = dta%v2d(ib) * r1_hv _n(ii,ij)286 dta%v2d(ib) = dta%v2d(ib) * r1_hv(ii,ij,Kmm) 287 287 DO ik = 1, jpkm1 288 288 dta%v3d(ib,ik) = dta%v3d(ib,ik) - dta%v2d(ib) -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/BDY/bdydyn.F90
r10957 r11053 78 78 zva2d(:,:) = zva2d(:,:) + e3v(:,:,jk,Kaa) * pvv(:,:,jk,Kaa) * vmask(:,:,jk) 79 79 END DO 80 zua2d(:,:) = zua2d(:,:) * r1_hu _a(:,:)81 zva2d(:,:) = zva2d(:,:) * r1_hv _a(:,:)80 zua2d(:,:) = zua2d(:,:) * r1_hu(:,:,Kaa) 81 zva2d(:,:) = zva2d(:,:) * r1_hv(:,:,Kaa) 82 82 83 83 DO jk = 1 , jpkm1 … … 99 99 !------------------------------------------------------- 100 100 101 IF( ll_dyn2d ) CALL bdy_dyn2d( kt, zua2d, zva2d, uu_b(:,:,Kbb), vv_b(:,:,Kbb), r1_hu _a(:,:), r1_hv_a(:,:), ssh(:,:,Kaa) )101 IF( ll_dyn2d ) CALL bdy_dyn2d( kt, zua2d, zva2d, uu_b(:,:,Kbb), vv_b(:,:,Kbb), r1_hu(:,:,Kaa), r1_hv(:,:,Kaa), ssh(:,:,Kaa) ) 102 102 103 103 IF( ll_dyn3d ) CALL bdy_dyn3d( kt, Kbb, puu, pvv, Kaa ) -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DIA/diawri.F90
r10989 r11053 138 138 139 139 IF( ll_wd ) THEN 140 CALL iom_put( "ssh" , (ssh n+ssh_ref)*tmask(:,:,1) ) ! sea surface height (brought back to the reference used for wetting and drying)140 CALL iom_put( "ssh" , (ssh(:,:,Kmm)+ssh_ref)*tmask(:,:,1) ) ! sea surface height (brought back to the reference used for wetting and drying) 141 141 ELSE 142 142 CALL iom_put( "ssh" , ssh(:,:,Kmm) ) ! sea surface height -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DOM/dom_oce.F90
r11050 r11053 121 121 REAL(wp), PUBLIC, ALLOCATABLE, SAVE , DIMENSION(:,:) :: e1e2f , r1_e1e2f !: associated metrics at f-point 122 122 ! 123 REAL(wp), PUBLIC, ALLOCATABLE, SAVE 123 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ff_f , ff_t !: Coriolis factor at f- & t-points [1/s] 124 124 !!---------------------------------------------------------------------- 125 125 !! vertical coordinate and scale factors … … 138 138 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: e3vw_0 !: vw-vert. scale factor [m] 139 139 ! ! time-dependent scale factors 140 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET,DIMENSION(:,:,:,:) :: e3t, e3u, e3v, e3w, e3uw, e3vw !: vert. scale factor [m]141 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET, DIMENSION(:,:,:) ::e3f !: F-point vert. scale factor [m]140 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: e3t, e3u, e3v, e3w, e3uw, e3vw !: vert. scale factor [m] 141 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: e3f !: F-point vert. scale factor [m] 142 142 143 143 ! ! reference depths of cells … … 146 146 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: gde3w_0 !: w- depth (sum of e3w) [m] 147 147 ! ! time-dependent depths of cells 148 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET,DIMENSION(:,:,:,:) :: gdept, gdepw149 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET,DIMENSION(:,:,:) :: gde3w148 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: gdept, gdepw 149 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: gde3w 150 150 151 151 ! ! reference heights of water column … … 154 154 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: hv_0 !: v-depth [m] 155 155 ! time-dependent heights of water column 156 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET, DIMENSION(:,:) :: ht !: height of water column at T-points [m] 157 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, TARGET, DIMENSION(:,:,:) :: hu, hv, r1_hu, r1_hv !: height of water column [m] and reciprocal [1/m] 158 159 !! TEMPORARY POINTERS FOR DEVELOPMENT ONLY 160 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: e3t_b , e3t_n , e3t_a !: t- vert. scale factor [m] 161 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: e3u_b , e3u_n , e3u_a !: u- vert. scale factor [m] 162 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: e3v_b , e3v_n , e3v_a !: v- vert. scale factor [m] 163 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: e3f_n !: f- vert. scale factor [m] 164 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: e3w_b , e3w_n !: w- vert. scale factor [m] 165 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: e3uw_b , e3uw_n !: uw-vert. scale factor [m] 166 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: e3vw_b , e3vw_n !: vw-vert. scale factor [m] 167 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: gdept_b , gdept_n !: t- depth [m] 168 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: gdepw_b , gdepw_n !: w- depth [m] 169 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: gde3w_n !: w- depth (sum of e3w) [m] 170 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: ht_n !: t-depth [m] 171 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: hu_b , hu_n , hu_a !: u-depth [m] 172 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: hv_b , hv_n , hv_a !: v-depth [m] 173 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: r1_hu_b , r1_hu_n , r1_hu_a !: inverse of u-depth [1/m] 174 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: r1_hv_b , r1_hv_n , r1_hv_a !: inverse of v-depth [1/m] 175 !! TEMPORARY POINTERS FOR DEVELOPMENT ONLY 156 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: ht !: height of water column at T-points [m] 157 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: hu, hv, r1_hu, r1_hv !: height of water column [m] and reciprocal [1/m] 176 158 177 159 INTEGER, PUBLIC :: nla10 !: deepest W level Above ~10m (nlb10 - 1) -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DOM/domain.F90
r10978 r11053 179 179 ! 180 180 ! before ! now ! after ! 181 ht _n= ht_0 ! ! water column thickness182 hu _b = hu_0 ; hu_n = hu_0 ; hu_a= hu_0 !183 hv _b = hv_0 ; hv_n = hv_0 ; hv_a= hv_0 !184 r1_hu _b = z1_hu_0 ; r1_hu_n = z1_hu_0 ; r1_hu_a= z1_hu_0 ! inverse of water column thickness185 r1_hv _b = z1_hv_0 ; r1_hv_n = z1_hv_0 ; r1_hv_a= z1_hv_0 !181 ht = ht_0 ! ! water column thickness 182 hu(:,:,Kbb) = hu_0 ; hu(:,:,Kmm) = hu_0 ; hu(:,:,Kaa) = hu_0 ! 183 hv(:,:,Kbb) = hv_0 ; hv(:,:,Kmm) = hv_0 ; hv(:,:,Kaa) = hv_0 ! 184 r1_hu(:,:,Kbb) = z1_hu_0 ; r1_hu(:,:,Kmm) = z1_hu_0 ; r1_hu(:,:,Kaa) = z1_hu_0 ! inverse of water column thickness 185 r1_hv(:,:,Kbb) = z1_hv_0 ; r1_hv(:,:,Kmm) = z1_hv_0 ; r1_hv(:,:,Kaa) = z1_hv_0 ! 186 186 ! 187 187 ! -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DOM/domvvl.F90
r11050 r11053 181 181 ! 182 182 ! !== thickness of the water column !! (ocean portion only) 183 ht _n(:,:) = e3t(:,:,1,Kmm) * tmask(:,:,1) !!gm BUG : this should be 1/2 * e3w(k=1) ....184 hu _b(:,:) = e3u(:,:,1,Kbb) * umask(:,:,1)185 hu _n(:,:) = e3u(:,:,1,Kmm) * umask(:,:,1)186 hv _b(:,:) = e3v(:,:,1,Kbb) * vmask(:,:,1)187 hv _n(:,:) = e3v(:,:,1,Kmm) * vmask(:,:,1)183 ht(:,:) = e3t(:,:,1,Kmm) * tmask(:,:,1) !!gm BUG : this should be 1/2 * e3w(k=1) .... 184 hu(:,:,Kbb) = e3u(:,:,1,Kbb) * umask(:,:,1) 185 hu(:,:,Kmm) = e3u(:,:,1,Kmm) * umask(:,:,1) 186 hv(:,:,Kbb) = e3v(:,:,1,Kbb) * vmask(:,:,1) 187 hv(:,:,Kmm) = e3v(:,:,1,Kmm) * vmask(:,:,1) 188 188 DO jk = 2, jpkm1 189 ht _n(:,:) = ht_n(:,:) + e3t(:,:,jk,Kmm) * tmask(:,:,jk)190 hu _b(:,:) = hu_b(:,:) + e3u(:,:,jk,Kbb) * umask(:,:,jk)191 hu _n(:,:) = hu_n(:,:) + e3u(:,:,jk,Kmm) * umask(:,:,jk)192 hv _b(:,:) = hv_b(:,:) + e3v(:,:,jk,Kbb) * vmask(:,:,jk)193 hv _n(:,:) = hv_n(:,:) + e3v(:,:,jk,Kmm) * vmask(:,:,jk)189 ht(:,:) = ht(:,:) + e3t(:,:,jk,Kmm) * tmask(:,:,jk) 190 hu(:,:,Kbb) = hu(:,:,Kbb) + e3u(:,:,jk,Kbb) * umask(:,:,jk) 191 hu(:,:,Kmm) = hu(:,:,Kmm) + e3u(:,:,jk,Kmm) * umask(:,:,jk) 192 hv(:,:,Kbb) = hv(:,:,Kbb) + e3v(:,:,jk,Kbb) * vmask(:,:,jk) 193 hv(:,:,Kmm) = hv(:,:,Kmm) + e3v(:,:,jk,Kmm) * vmask(:,:,jk) 194 194 END DO 195 195 ! 196 196 ! !== inverse of water column thickness ==! (u- and v- points) 197 r1_hu _b(:,:) = ssumask(:,:) / ( hu_b(:,:) + 1._wp - ssumask(:,:) ) ! _i mask due to ISF198 r1_hu _n(:,:) = ssumask(:,:) / ( hu_n(:,:) + 1._wp - ssumask(:,:) )199 r1_hv _b(:,:) = ssvmask(:,:) / ( hv_b(:,:) + 1._wp - ssvmask(:,:) )200 r1_hv _n(:,:) = ssvmask(:,:) / ( hv_n(:,:) + 1._wp - ssvmask(:,:) )197 r1_hu(:,:,Kbb) = ssumask(:,:) / ( hu(:,:,Kbb) + 1._wp - ssumask(:,:) ) ! _i mask due to ISF 198 r1_hu(:,:,Kmm) = ssumask(:,:) / ( hu(:,:,Kmm) + 1._wp - ssumask(:,:) ) 199 r1_hv(:,:,Kbb) = ssvmask(:,:) / ( hv(:,:,Kbb) + 1._wp - ssvmask(:,:) ) 200 r1_hv(:,:,Kmm) = ssvmask(:,:) / ( hv(:,:,Kmm) + 1._wp - ssvmask(:,:) ) 201 201 202 202 ! !== z_tilde coordinate case ==! (Restoring frequencies) … … 550 550 ! *********************************** ! 551 551 552 hu _a(:,:) = e3u(:,:,1,Kaa) * umask(:,:,1)553 hv _a(:,:) = e3v(:,:,1,Kaa) * vmask(:,:,1)552 hu(:,:,Kaa) = e3u(:,:,1,Kaa) * umask(:,:,1) 553 hv(:,:,Kaa) = e3v(:,:,1,Kaa) * vmask(:,:,1) 554 554 DO jk = 2, jpkm1 555 hu _a(:,:) = hu_a(:,:) + e3u(:,:,jk,Kaa) * umask(:,:,jk)556 hv _a(:,:) = hv_a(:,:) + e3v(:,:,jk,Kaa) * vmask(:,:,jk)555 hu(:,:,Kaa) = hu(:,:,Kaa) + e3u(:,:,jk,Kaa) * umask(:,:,jk) 556 hv(:,:,Kaa) = hv(:,:,Kaa) + e3v(:,:,jk,Kaa) * vmask(:,:,jk) 557 557 END DO 558 558 ! ! Inverse of the local depth 559 559 !!gm BUG ? don't understand the use of umask_i here ..... 560 r1_hu _a(:,:) = ssumask(:,:) / ( hu_a(:,:) + 1._wp - ssumask(:,:) )561 r1_hv _a(:,:) = ssvmask(:,:) / ( hv_a(:,:) + 1._wp - ssvmask(:,:) )560 r1_hu(:,:,Kaa) = ssumask(:,:) / ( hu(:,:,Kaa) + 1._wp - ssumask(:,:) ) 561 r1_hv(:,:,Kaa) = ssvmask(:,:) / ( hv(:,:,Kaa) + 1._wp - ssvmask(:,:) ) 562 562 ! 563 563 IF( ln_timing ) CALL timing_stop('dom_vvl_sf_nxt') … … 625 625 ! -------------------------------------- 626 626 ! - ML - e3u(:,:,:,Kbb) and e3v(:,:,:,Kbb) are allready computed in dynnxt 627 ! - JC - hu _b, hv_b, hur_b, hvr_b also627 ! - JC - hu(:,:,:,Kbb), hv(:,:,:,:,Kbb), hur_b, hvr_b also 628 628 629 629 CALL dom_vvl_interpol( e3u(:,:,:,Kmm), e3f(:,:,:), 'F' ) -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DOM/iscplrst.F90
r10978 r11053 108 108 gdept(:,:,:,Kbb) = gdept(:,:,:,Kmm) 109 109 gdepw(:,:,:,Kbb) = gdepw(:,:,:,Kmm) 110 hu _b (:,:) = hu_n (:,:)111 hv _b (:,:) = hv_n (:,:)112 r1_hu _b(:,:) = r1_hu_n(:,:)113 r1_hv _b(:,:) = r1_hv_n(:,:)110 hu (:,:,Kbb) = hu (:,:,Kmm) 111 hv (:,:,Kbb) = hv (:,:,Kmm) 112 r1_hu(:,:,Kbb) = r1_hu(:,:,Kmm) 113 r1_hv(:,:,Kbb) = r1_hv(:,:,Kmm) 114 114 ! 115 115 END SUBROUTINE iscpl_stp … … 240 240 ! t-, u- and v- water column thickness 241 241 ! ------------------------------------ 242 ht _n(:,:) = 0._wp ; hu_n(:,:) = 0._wp ; hv_n(:,:) = 0._wp242 ht(:,:) = 0._wp ; hu(:,:,Kmm) = 0._wp ; hv(:,:,Kmm) = 0._wp 243 243 DO jk = 1, jpkm1 244 hu _n(:,:) = hu_n(:,:) + e3u(:,:,jk,Kmm) * umask(:,:,jk)245 hv _n(:,:) = hv_n(:,:) + e3v(:,:,jk,Kmm) * vmask(:,:,jk)246 ht _n(:,:) = ht_n(:,:) + e3t(:,:,jk,Kmm) * tmask(:,:,jk)244 hu(:,:,Kmm) = hu(:,:,Kmm) + e3u(:,:,jk,Kmm) * umask(:,:,jk) 245 hv(:,:,Kmm) = hv(:,:,Kmm) + e3v(:,:,jk,Kmm) * vmask(:,:,jk) 246 ht(:,:) = ht(:,:) + e3t(:,:,jk,Kmm) * tmask(:,:,jk) 247 247 END DO 248 248 ! ! Inverse of the local depth 249 r1_hu _n(:,:) = 1._wp / ( hu_n(:,:) + 1._wp - ssumask(:,:) ) * ssumask(:,:)250 r1_hv _n(:,:) = 1._wp / ( hv_n(:,:) + 1._wp - ssvmask(:,:) ) * ssvmask(:,:)249 r1_hu(:,:,Kmm) = 1._wp / ( hu(:,:,Kmm) + 1._wp - ssumask(:,:) ) * ssumask(:,:) 250 r1_hv(:,:,Kmm) = 1._wp / ( hv(:,:,Kmm) + 1._wp - ssvmask(:,:) ) * ssvmask(:,:) 251 251 252 252 END IF -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DOM/istate.F90
r10978 r11053 175 175 END DO 176 176 ! 177 uu_b(:,:,Kmm) = uu_b(:,:,Kmm) * r1_hu _n(:,:)178 vv_b(:,:,Kmm) = vv_b(:,:,Kmm) * r1_hv _n(:,:)177 uu_b(:,:,Kmm) = uu_b(:,:,Kmm) * r1_hu(:,:,Kmm) 178 vv_b(:,:,Kmm) = vv_b(:,:,Kmm) * r1_hv(:,:,Kmm) 179 179 ! 180 uu_b(:,:,Kbb) = uu_b(:,:,Kbb) * r1_hu _b(:,:)181 vv_b(:,:,Kbb) = vv_b(:,:,Kbb) * r1_hv _b(:,:)180 uu_b(:,:,Kbb) = uu_b(:,:,Kbb) * r1_hu(:,:,Kbb) 181 vv_b(:,:,Kbb) = vv_b(:,:,Kbb) * r1_hv(:,:,Kbb) 182 182 ! 183 183 END SUBROUTINE istate_init -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DYN/dynspg_ts.F90
r10919 r11053 250 250 DO jj = 1, jpjm1 251 251 DO ji = 1, jpim1 252 zwz(ji,jj) = ( ht _n(ji ,jj+1) + ht_n(ji+1,jj+1) + &253 & ht _n(ji ,jj ) + ht_n(ji+1,jj ) ) * 0.25_wp252 zwz(ji,jj) = ( ht(ji ,jj+1) + ht(ji+1,jj+1) + & 253 & ht(ji ,jj ) + ht(ji+1,jj ) ) * 0.25_wp 254 254 IF( zwz(ji,jj) /= 0._wp ) zwz(ji,jj) = ff_f(ji,jj) / zwz(ji,jj) 255 255 END DO … … 258 258 DO jj = 1, jpjm1 259 259 DO ji = 1, jpim1 260 zwz(ji,jj) = ( ht _n (ji ,jj+1) + ht_n(ji+1,jj+1) &261 & + ht _n (ji ,jj ) + ht_n(ji+1,jj ) ) &260 zwz(ji,jj) = ( ht (ji ,jj+1) + ht (ji+1,jj+1) & 261 & + ht (ji ,jj ) + ht (ji+1,jj ) ) & 262 262 & / ( MAX( 1._wp, ssmask(ji ,jj+1) + ssmask(ji+1,jj+1) & 263 263 & + ssmask(ji ,jj ) + ssmask(ji+1,jj ) ) ) … … 282 282 DO jj = 2, jpj 283 283 DO ji = 2, jpi 284 z1_ht = ssmask(ji,jj) / ( ht _n(ji,jj) + 1._wp - ssmask(ji,jj) )284 z1_ht = ssmask(ji,jj) / ( ht(ji,jj) + 1._wp - ssmask(ji,jj) ) 285 285 ftne(ji,jj) = ( ff_f(ji-1,jj ) + ff_f(ji ,jj ) + ff_f(ji ,jj-1) ) * z1_ht 286 286 ftnw(ji,jj) = ( ff_f(ji-1,jj-1) + ff_f(ji-1,jj ) + ff_f(ji ,jj ) ) * z1_ht … … 367 367 END DO 368 368 ! 369 zu_frc(:,:) = zu_frc(:,:) * r1_hu _n(:,:)370 zv_frc(:,:) = zv_frc(:,:) * r1_hv _n(:,:)369 zu_frc(:,:) = zu_frc(:,:) * r1_hu(:,:,Kmm) 370 zv_frc(:,:) = zv_frc(:,:) * r1_hv(:,:,Kmm) 371 371 ! 372 372 ! … … 388 388 ! ! -------------------------------------------------------- 389 389 ! 390 zwx(:,:) = puu_b(:,:,Kmm) * hu _n(:,:) * e2u(:,:) ! now fluxes391 zwy(:,:) = pvv_b(:,:,Kmm) * hv _n(:,:) * e1v(:,:)390 zwx(:,:) = puu_b(:,:,Kmm) * hu(:,:,Kmm) * e2u(:,:) ! now fluxes 391 zwy(:,:) = pvv_b(:,:,Kmm) * hv(:,:,Kmm) * e1v(:,:) 392 392 ! 393 393 SELECT CASE( nvor_scheme ) … … 395 395 DO jj = 2, jpjm1 396 396 DO ji = 2, jpim1 ! vector opt. 397 zu_trd(ji,jj) = + r1_4 * r1_e1e2u(ji,jj) * r1_hu _n(ji,jj) &398 & * ( e1e2t(ji+1,jj)*ht _n(ji+1,jj)*ff_t(ji+1,jj) * ( pvv_b(ji+1,jj,Kmm) + pvv_b(ji+1,jj-1,Kmm) ) &399 & + e1e2t(ji ,jj)*ht _n(ji ,jj)*ff_t(ji ,jj) * ( pvv_b(ji ,jj,Kmm) + pvv_b(ji ,jj-1,Kmm) ) )397 zu_trd(ji,jj) = + r1_4 * r1_e1e2u(ji,jj) * r1_hu(ji,jj,Kmm) & 398 & * ( e1e2t(ji+1,jj)*ht(ji+1,jj)*ff_t(ji+1,jj) * ( pvv_b(ji+1,jj,Kmm) + pvv_b(ji+1,jj-1,Kmm) ) & 399 & + e1e2t(ji ,jj)*ht(ji ,jj)*ff_t(ji ,jj) * ( pvv_b(ji ,jj,Kmm) + pvv_b(ji ,jj-1,Kmm) ) ) 400 400 ! 401 zv_trd(ji,jj) = - r1_4 * r1_e1e2v(ji,jj) * r1_hv _n(ji,jj) &402 & * ( e1e2t(ji,jj+1)*ht _n(ji,jj+1)*ff_t(ji,jj+1) * ( puu_b(ji,jj+1,Kmm) + puu_b(ji-1,jj+1,Kmm) ) &403 & + e1e2t(ji,jj )*ht _n(ji,jj )*ff_t(ji,jj ) * ( puu_b(ji,jj ,Kmm) + puu_b(ji-1,jj ,Kmm) ) )401 zv_trd(ji,jj) = - r1_4 * r1_e1e2v(ji,jj) * r1_hv(ji,jj,Kmm) & 402 & * ( e1e2t(ji,jj+1)*ht(ji,jj+1)*ff_t(ji,jj+1) * ( puu_b(ji,jj+1,Kmm) + puu_b(ji-1,jj+1,Kmm) ) & 403 & + e1e2t(ji,jj )*ht(ji,jj )*ff_t(ji,jj ) * ( puu_b(ji,jj ,Kmm) + puu_b(ji-1,jj ,Kmm) ) ) 404 404 END DO 405 405 END DO … … 546 546 DO ji = fs_2, fs_jpim1 ! vector opt. 547 547 zu_frc(ji,jj) = zu_frc(ji,jj) + & 548 & MAX(r1_hu _n(ji,jj) * r1_2 * ( rCdU_bot(ji+1,jj)+rCdU_bot(ji,jj) ), zztmp ) * zwx(ji,jj) * wdrampu(ji,jj)548 & MAX(r1_hu(ji,jj,Kmm) * r1_2 * ( rCdU_bot(ji+1,jj)+rCdU_bot(ji,jj) ), zztmp ) * zwx(ji,jj) * wdrampu(ji,jj) 549 549 zv_frc(ji,jj) = zv_frc(ji,jj) + & 550 & MAX(r1_hv _n(ji,jj) * r1_2 * ( rCdU_bot(ji,jj+1)+rCdU_bot(ji,jj) ), zztmp ) * zwy(ji,jj) * wdrampv(ji,jj)550 & MAX(r1_hv(ji,jj,Kmm) * r1_2 * ( rCdU_bot(ji,jj+1)+rCdU_bot(ji,jj) ), zztmp ) * zwy(ji,jj) * wdrampv(ji,jj) 551 551 END DO 552 552 END DO … … 554 554 DO jj = 2, jpjm1 555 555 DO ji = fs_2, fs_jpim1 ! vector opt. 556 zu_frc(ji,jj) = zu_frc(ji,jj) + r1_hu _n(ji,jj) * r1_2 * ( rCdU_bot(ji+1,jj)+rCdU_bot(ji,jj) ) * zwx(ji,jj)557 zv_frc(ji,jj) = zv_frc(ji,jj) + r1_hv _n(ji,jj) * r1_2 * ( rCdU_bot(ji,jj+1)+rCdU_bot(ji,jj) ) * zwy(ji,jj)556 zu_frc(ji,jj) = zu_frc(ji,jj) + r1_hu(ji,jj,Kmm) * r1_2 * ( rCdU_bot(ji+1,jj)+rCdU_bot(ji,jj) ) * zwx(ji,jj) 557 zv_frc(ji,jj) = zv_frc(ji,jj) + r1_hv(ji,jj,Kmm) * r1_2 * ( rCdU_bot(ji,jj+1)+rCdU_bot(ji,jj) ) * zwy(ji,jj) 558 558 END DO 559 559 END DO … … 584 584 DO jj = 2, jpjm1 585 585 DO ji = fs_2, fs_jpim1 ! vector opt. 586 zu_frc(ji,jj) = zu_frc(ji,jj) + r1_hu _n(ji,jj) * r1_2 * ( rCdU_top(ji+1,jj)+rCdU_top(ji,jj) ) * zwx(ji,jj)587 zv_frc(ji,jj) = zv_frc(ji,jj) + r1_hv _n(ji,jj) * r1_2 * ( rCdU_top(ji,jj+1)+rCdU_top(ji,jj) ) * zwy(ji,jj)586 zu_frc(ji,jj) = zu_frc(ji,jj) + r1_hu(ji,jj,Kmm) * r1_2 * ( rCdU_top(ji+1,jj)+rCdU_top(ji,jj) ) * zwx(ji,jj) 587 zv_frc(ji,jj) = zv_frc(ji,jj) + r1_hv(ji,jj,Kmm) * r1_2 * ( rCdU_top(ji,jj+1)+rCdU_top(ji,jj) ) * zwy(ji,jj) 588 588 END DO 589 589 END DO … … 593 593 DO jj = 2, jpjm1 594 594 DO ji = fs_2, fs_jpim1 ! vector opt. 595 zu_frc(ji,jj) = zu_frc(ji,jj) + r1_rau0 * utau(ji,jj) * r1_hu _n(ji,jj)596 zv_frc(ji,jj) = zv_frc(ji,jj) + r1_rau0 * vtau(ji,jj) * r1_hv _n(ji,jj)595 zu_frc(ji,jj) = zu_frc(ji,jj) + r1_rau0 * utau(ji,jj) * r1_hu(ji,jj,Kmm) 596 zv_frc(ji,jj) = zv_frc(ji,jj) + r1_rau0 * vtau(ji,jj) * r1_hv(ji,jj,Kmm) 597 597 END DO 598 598 END DO … … 601 601 DO jj = 2, jpjm1 602 602 DO ji = fs_2, fs_jpim1 ! vector opt. 603 zu_frc(ji,jj) = zu_frc(ji,jj) + zztmp * ( utau_b(ji,jj) + utau(ji,jj) ) * r1_hu _n(ji,jj)604 zv_frc(ji,jj) = zv_frc(ji,jj) + zztmp * ( vtau_b(ji,jj) + vtau(ji,jj) ) * r1_hv _n(ji,jj)603 zu_frc(ji,jj) = zu_frc(ji,jj) + zztmp * ( utau_b(ji,jj) + utau(ji,jj) ) * r1_hu(ji,jj,Kmm) 604 zv_frc(ji,jj) = zv_frc(ji,jj) + zztmp * ( vtau_b(ji,jj) + vtau(ji,jj) ) * r1_hv(ji,jj,Kmm) 605 605 END DO 606 606 END DO … … 681 681 vn_e (:,:) = pvv_b(:,:,Kmm) 682 682 ! 683 hu_e (:,:) = hu _n(:,:)684 hv_e (:,:) = hv _n(:,:)685 hur_e (:,:) = r1_hu _n(:,:)686 hvr_e (:,:) = r1_hv _n(:,:)683 hu_e (:,:) = hu(:,:,Kmm) 684 hv_e (:,:) = hv(:,:,Kmm) 685 hur_e (:,:) = r1_hu(:,:,Kmm) 686 hvr_e (:,:) = r1_hv(:,:,Kmm) 687 687 ELSE ! CENTRED integration: start from BEFORE fields 688 688 sshn_e(:,:) = pssh(:,:,Kbb) … … 690 690 vn_e (:,:) = pvv_b(:,:,Kbb) 691 691 ! 692 hu_e (:,:) = hu _b(:,:)693 hv_e (:,:) = hv _b(:,:)694 hur_e (:,:) = r1_hu _b(:,:)695 hvr_e (:,:) = r1_hv _b(:,:)692 hu_e (:,:) = hu(:,:,Kbb) 693 hv_e (:,:) = hv(:,:,Kbb) 694 hur_e (:,:) = r1_hu(:,:,Kbb) 695 hvr_e (:,:) = r1_hv(:,:,Kbb) 696 696 ENDIF 697 697 ! … … 790 790 zhtp2_e(:,:) = ht_0(:,:) + zsshp2_e(:,:) 791 791 ELSE 792 zhup2_e(:,:) = hu _n(:,:)793 zhvp2_e(:,:) = hv _n(:,:)794 zhtp2_e(:,:) = ht _n(:,:)792 zhup2_e(:,:) = hu(:,:,Kmm) 793 zhvp2_e(:,:) = hv(:,:,Kmm) 794 zhtp2_e(:,:) = ht(:,:) 795 795 ENDIF 796 796 ! !* after ssh … … 1138 1138 & + rdtbt * ( zhust_e(ji,jj) * zwx(ji,jj) & 1139 1139 & + zhup2_e(ji,jj) * zu_trd(ji,jj) & 1140 & + hu _n(ji,jj) * zu_frc(ji,jj) ) &1140 & + hu(ji,jj,Kmm) * zu_frc(ji,jj) ) & 1141 1141 & ) * zhura 1142 1142 … … 1144 1144 & + rdtbt * ( zhvst_e(ji,jj) * zwy(ji,jj) & 1145 1145 & + zhvp2_e(ji,jj) * zv_trd(ji,jj) & 1146 & + hv _n(ji,jj) * zv_frc(ji,jj) ) &1146 & + hv(ji,jj,Kmm) * zv_frc(ji,jj) ) & 1147 1147 & ) * zhvra 1148 1148 END DO … … 1257 1257 ! 1258 1258 DO jk=1,jpkm1 1259 puu(:,:,jk,Krhs) = puu(:,:,jk,Krhs) + r1_hu _n(:,:) * ( puu_b(:,:,Kaa) - puu_b(:,:,Kbb) * hu_b(:,:) ) * r1_2dt_b1260 pvv(:,:,jk,Krhs) = pvv(:,:,jk,Krhs) + r1_hv _n(:,:) * ( pvv_b(:,:,Kaa) - pvv_b(:,:,Kbb) * hv_b(:,:) ) * r1_2dt_b1259 puu(:,:,jk,Krhs) = puu(:,:,jk,Krhs) + r1_hu(:,:,Kmm) * ( puu_b(:,:,Kaa) - puu_b(:,:,Kbb) * hu(:,:,Kbb) ) * r1_2dt_b 1260 pvv(:,:,jk,Krhs) = pvv(:,:,jk,Krhs) + r1_hv(:,:,Kmm) * ( pvv_b(:,:,Kaa) - pvv_b(:,:,Kbb) * hv(:,:,Kbb) ) * r1_2dt_b 1261 1261 END DO 1262 1262 ! Save barotropic velocities not transport: … … 1268 1268 ! Correct velocities so that the barotropic velocity equals (un_adv, vn_adv) (in all cases) 1269 1269 DO jk = 1, jpkm1 1270 puu(:,:,jk,Kmm) = ( puu(:,:,jk,Kmm) + un_adv(:,:)*r1_hu _n(:,:) - puu_b(:,:,Kmm) ) * umask(:,:,jk)1271 pvv(:,:,jk,Kmm) = ( pvv(:,:,jk,Kmm) + vn_adv(:,:)*r1_hv _n(:,:) - pvv_b(:,:,Kmm) ) * vmask(:,:,jk)1270 puu(:,:,jk,Kmm) = ( puu(:,:,jk,Kmm) + un_adv(:,:)*r1_hu(:,:,Kmm) - puu_b(:,:,Kmm) ) * umask(:,:,jk) 1271 pvv(:,:,jk,Kmm) = ( pvv(:,:,jk,Kmm) + vn_adv(:,:)*r1_hv(:,:,Kmm) - pvv_b(:,:,Kmm) ) * vmask(:,:,jk) 1272 1272 END DO 1273 1273 1274 1274 IF ( ln_wd_dl .and. ln_wd_dl_bc) THEN 1275 1275 DO jk = 1, jpkm1 1276 puu(:,:,jk,Kmm) = ( un_adv(:,:)*r1_hu _n(:,:) &1277 & + zuwdav2(:,:)*(puu(:,:,jk,Kmm) - un_adv(:,:)*r1_hu _n(:,:)) ) * umask(:,:,jk)1278 pvv(:,:,jk,Kmm) = ( vn_adv(:,:)*r1_hv _n(:,:) &1279 & + zvwdav2(:,:)*(pvv(:,:,jk,Kmm) - vn_adv(:,:)*r1_hv _n(:,:)) ) * vmask(:,:,jk)1276 puu(:,:,jk,Kmm) = ( un_adv(:,:)*r1_hu(:,:,Kmm) & 1277 & + zuwdav2(:,:)*(puu(:,:,jk,Kmm) - un_adv(:,:)*r1_hu(:,:,Kmm)) ) * umask(:,:,jk) 1278 pvv(:,:,jk,Kmm) = ( vn_adv(:,:)*r1_hv(:,:,Kmm) & 1279 & + zvwdav2(:,:)*(pvv(:,:,jk,Kmm) - vn_adv(:,:)*r1_hv(:,:,Kmm)) ) * vmask(:,:,jk) 1280 1280 END DO 1281 1281 END IF 1282 1282 1283 1283 1284 CALL iom_put( "ubar", un_adv(:,:)*r1_hu _n(:,:) ) ! barotropic i-current1285 CALL iom_put( "vbar", vn_adv(:,:)*r1_hv _n(:,:) ) ! barotropic i-current1284 CALL iom_put( "ubar", un_adv(:,:)*r1_hu(:,:,Kmm) ) ! barotropic i-current 1285 CALL iom_put( "vbar", vn_adv(:,:)*r1_hv(:,:,Kmm) ) ! barotropic i-current 1286 1286 ! 1287 1287 #if defined key_agrif … … 1307 1307 ! 1308 1308 IF( ln_diatmb ) THEN 1309 CALL iom_put( "baro_u" , u n_b*ssumask(:,:)+zmdi*(1.-ssumask(:,:) ) ) ! Barotropic U Velocity1310 CALL iom_put( "baro_v" , v n_b*ssvmask(:,:)+zmdi*(1.-ssvmask(:,:) ) ) ! Barotropic V Velocity1309 CALL iom_put( "baro_u" , uu_b(:,:,Kmm)*ssumask(:,:)+zmdi*(1.-ssumask(:,:) ) ) ! Barotropic U Velocity 1310 CALL iom_put( "baro_v" , vv_b(:,:,Kmm)*ssvmask(:,:)+zmdi*(1.-ssvmask(:,:) ) ) ! Barotropic V Velocity 1311 1311 ENDIF 1312 1312 ! -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DYN/sshwzv.F90
r10978 r11053 93 93 ! !------------------------------! 94 94 IF(ln_wd_il) THEN 95 CALL wad_lmt(pssh(:,:,Kbb), zcoef * (emp_b(:,:) + emp(:,:)), z2dt )95 CALL wad_lmt(pssh(:,:,Kbb), zcoef * (emp_b(:,:) + emp(:,:)), z2dt, Kmm, uu, vv ) 96 96 ENDIF 97 97 … … 109 109 ! 110 110 #if defined key_agrif 111 CALL agrif_ssh( kt )111 Krhs_a = Kaa ; CALL agrif_ssh( kt ) 112 112 #endif 113 113 ! -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/DYN/wet_dry.F90
r10499 r11053 122 122 123 123 124 SUBROUTINE wad_lmt( sshb1, sshemp, z2dt)124 SUBROUTINE wad_lmt( psshb1, psshemp, z2dt, Kmm, puu, pvv ) 125 125 !!---------------------------------------------------------------------- 126 126 !! *** ROUTINE wad_lmt *** … … 132 132 !! ** Action : - calculate flux limiter and W/D flag 133 133 !!---------------------------------------------------------------------- 134 REAL(wp), DIMENSION(:,:), INTENT(inout) :: sshb1 !!gm DOCTOR names: should start with p ! 135 REAL(wp), DIMENSION(:,:), INTENT(in ) :: sshemp 136 REAL(wp) , INTENT(in ) :: z2dt 134 REAL(wp), DIMENSION(:,:) , INTENT(inout) :: psshb1 135 REAL(wp), DIMENSION(:,:) , INTENT(in ) :: psshemp 136 REAL(wp) , INTENT(in ) :: z2dt 137 INTEGER , INTENT(in ) :: Kmm ! time level index 138 REAL(wp), DIMENSION(jpi,jpj,jpk,jpt), INTENT(inout) :: puu, pvv ! velocity arrays 137 139 ! 138 140 INTEGER :: ji, jj, jk, jk1 ! dummy loop indices … … 150 152 ! 151 153 DO jk = 1, jpkm1 152 un(:,:,jk) = un(:,:,jk) * zwdlmtu(:,:)153 vn(:,:,jk) = vn(:,:,jk) * zwdlmtv(:,:)154 puu(:,:,jk,Kmm) = puu(:,:,jk,Kmm) * zwdlmtu(:,:) 155 pvv(:,:,jk,Kmm) = pvv(:,:,jk,Kmm) * zwdlmtv(:,:) 154 156 END DO 155 157 jflag = 0 … … 165 167 ! 166 168 DO jk = 1, jpkm1 ! Horizontal Flux in u and v direction 167 zflxu(:,:) = zflxu(:,:) + e3u _n(:,:,jk) * un(:,:,jk) * umask(:,:,jk)168 zflxv(:,:) = zflxv(:,:) + e3v _n(:,:,jk) * vn(:,:,jk) * vmask(:,:,jk)169 zflxu(:,:) = zflxu(:,:) + e3u(:,:,jk,Kmm) * puu(:,:,jk,Kmm) * umask(:,:,jk) 170 zflxv(:,:) = zflxv(:,:) + e3v(:,:,jk,Kmm) * pvv(:,:,jk,Kmm) * vmask(:,:,jk) 169 171 END DO 170 172 zflxu(:,:) = zflxu(:,:) * e2u(:,:) … … 183 185 & + MIN( zflxv(ji,jj) , 0._wp ) - MAX( zflxv(ji, jj-1) , 0._wp ) 184 186 ! 185 zdep2 = ht_0(ji,jj) + sshb1(ji,jj) - rn_wdmin1187 zdep2 = ht_0(ji,jj) + psshb1(ji,jj) - rn_wdmin1 186 188 IF( zdep2 <= 0._wp ) THEN ! add more safty, but not necessary 187 sshb1(ji,jj) = rn_wdmin1 - ht_0(ji,jj)189 psshb1(ji,jj) = rn_wdmin1 - ht_0(ji,jj) 188 190 IF(zflxu(ji, jj) > 0._wp) zwdlmtu(ji ,jj) = 0._wp 189 191 IF(zflxu(ji-1,jj) < 0._wp) zwdlmtu(ji-1,jj) = 0._wp … … 196 198 ! 197 199 ! ! HPG limiter from jholt 198 wdramp(:,:) = min((ht_0(:,:) + sshb1(:,:) - rn_wdmin1)/(rn_wdmin0 - rn_wdmin1),1.0_wp)200 wdramp(:,:) = min((ht_0(:,:) + psshb1(:,:) - rn_wdmin1)/(rn_wdmin0 - rn_wdmin1),1.0_wp) 199 201 !jth assume don't need a lbc_lnk here 200 202 DO jj = 1, jpjm1 … … 226 228 ! 227 229 zdep1 = (zzflxp + zzflxn) * z2dt / ztmp 228 zdep2 = ht_0(ji,jj) + sshb1(ji,jj) - rn_wdmin1 - z2dt *sshemp(ji,jj)230 zdep2 = ht_0(ji,jj) + psshb1(ji,jj) - rn_wdmin1 - z2dt * psshemp(ji,jj) 229 231 ! 230 232 IF( zdep1 > zdep2 ) THEN … … 255 257 ! 256 258 DO jk = 1, jpkm1 257 un(:,:,jk) = un(:,:,jk) * zwdlmtu(:,:)258 vn(:,:,jk) = vn(:,:,jk) * zwdlmtv(:,:)259 END DO 260 u n_b(:,:) = un_b(:,:) * zwdlmtu(:, :)261 v n_b(:,:) = vn_b(:,:) * zwdlmtv(:, :)259 puu(:,:,jk,Kmm) = puu(:,:,jk,Kmm) * zwdlmtu(:,:) 260 pvv(:,:,jk,Kmm) = pvv(:,:,jk,Kmm) * zwdlmtv(:,:) 261 END DO 262 uu_b(:,:,Kmm) = uu_b(:,:,Kmm) * zwdlmtu(:, :) 263 vv_b(:,:,Kmm) = vv_b(:,:,Kmm) * zwdlmtv(:, :) 262 264 ! 263 265 !!gm TO BE SUPPRESSED ? these lbc_lnk are useless since zwdlmtu and zwdlmtv are defined everywhere ! 264 CALL lbc_lnk_multi( 'wet_dry', un , 'U', -1., vn, 'V', -1. )265 CALL lbc_lnk_multi( 'wet_dry', u n_b, 'U', -1., vn_b, 'V', -1. )266 CALL lbc_lnk_multi( 'wet_dry', puu(:,:,:,Kmm) , 'U', -1., pvv(:,:,:,Kmm) , 'V', -1. ) 267 CALL lbc_lnk_multi( 'wet_dry', uu_b(:,:,Kmm), 'U', -1., vv_b(:,:,Kmm), 'V', -1. ) 266 268 !!gm 267 269 ! 268 270 IF(jflag == 1 .AND. lwp) WRITE(numout,*) 'Need more iterations in wad_lmt!!!' 269 271 ! 270 !IF( ln_rnf ) CALL sbc_rnf_div( hdiv n ) ! runoffs (update hdivnfield)272 !IF( ln_rnf ) CALL sbc_rnf_div( hdiv ) ! runoffs (update hdiv field) 271 273 ! 272 274 IF( ln_timing ) CALL timing_stop('wad_lmt') ! … … 392 394 IF( jflag == 1 .AND. lwp ) WRITE(numout,*) 'Need more iterations in wad_lmt_bt!!!' 393 395 ! 394 !IF( ln_rnf ) CALL sbc_rnf_div( hdiv n ) ! runoffs (update hdivnfield)396 !IF( ln_rnf ) CALL sbc_rnf_div( hdiv ) ! runoffs (update hdiv field) 395 397 ! 396 398 IF( ln_timing ) CALL timing_stop('wad_lmt_bt') ! -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/IOM/restart.F90
r10989 r11053 148 148 149 149 IF ( .NOT. ln_diurnal_only ) THEN 150 CALL iom_rstput( kt, nitrst, numrow, 'ub' , uu(:,:,: ,Kbb), ldxios = lwxios ) ! before fields151 CALL iom_rstput( kt, nitrst, numrow, 'vb' , vv(:,:,: ,Kbb), ldxios = lwxios )150 CALL iom_rstput( kt, nitrst, numrow, 'ub' , uu(:,:,: ,Kbb), ldxios = lwxios ) ! before fields 151 CALL iom_rstput( kt, nitrst, numrow, 'vb' , vv(:,:,: ,Kbb), ldxios = lwxios ) 152 152 CALL iom_rstput( kt, nitrst, numrow, 'tb' , ts(:,:,:,jp_tem,Kbb), ldxios = lwxios ) 153 153 CALL iom_rstput( kt, nitrst, numrow, 'sb' , ts(:,:,:,jp_sal,Kbb), ldxios = lwxios ) 154 CALL iom_rstput( kt, nitrst, numrow, 'sshb' , sshb, ldxios = lwxios )154 CALL iom_rstput( kt, nitrst, numrow, 'sshb' ,ssh(:,: ,Kbb), ldxios = lwxios ) 155 155 ! 156 CALL iom_rstput( kt, nitrst, numrow, 'un' , uu(:,:,: ,Kmm), ldxios = lwxios ) ! now fields157 CALL iom_rstput( kt, nitrst, numrow, 'vn' , vv(:,:,: ,Kmm), ldxios = lwxios )156 CALL iom_rstput( kt, nitrst, numrow, 'un' , uu(:,:,: ,Kmm), ldxios = lwxios ) ! now fields 157 CALL iom_rstput( kt, nitrst, numrow, 'vn' , vv(:,:,: ,Kmm), ldxios = lwxios ) 158 158 CALL iom_rstput( kt, nitrst, numrow, 'tn' , ts(:,:,:,jp_tem,Kmm), ldxios = lwxios ) 159 159 CALL iom_rstput( kt, nitrst, numrow, 'sn' , ts(:,:,:,jp_sal,Kmm), ldxios = lwxios ) 160 CALL iom_rstput( kt, nitrst, numrow, 'sshn' , sshn, ldxios = lwxios )160 CALL iom_rstput( kt, nitrst, numrow, 'sshn' ,ssh(:,: ,Kmm), ldxios = lwxios ) 161 161 CALL iom_rstput( kt, nitrst, numrow, 'rhop' , rhop, ldxios = lwxios ) 162 162 ! extra variable needed for the ice sheet coupling … … 275 275 276 276 IF( iom_varid( numror, 'ub', ldstop = .FALSE. ) > 0 ) THEN 277 CALL iom_get( numror, jpdom_autoglo, 'ub' , uu(:,:,: ,Kbb), ldxios = lrxios) ! before fields278 CALL iom_get( numror, jpdom_autoglo, 'vb' , vv(:,:,: ,Kbb), ldxios = lrxios)277 CALL iom_get( numror, jpdom_autoglo, 'ub' , uu(:,:,: ,Kbb), ldxios = lrxios ) ! before fields 278 CALL iom_get( numror, jpdom_autoglo, 'vb' , vv(:,:,: ,Kbb), ldxios = lrxios ) 279 279 CALL iom_get( numror, jpdom_autoglo, 'tb' , ts(:,:,:,jp_tem,Kbb), ldxios = lrxios ) 280 280 CALL iom_get( numror, jpdom_autoglo, 'sb' , ts(:,:,:,jp_sal,Kbb), ldxios = lrxios ) 281 CALL iom_get( numror, jpdom_autoglo, 'sshb' , sshb, ldxios = lrxios)281 CALL iom_get( numror, jpdom_autoglo, 'sshb' ,ssh(:,: ,Kbb), ldxios = lrxios ) 282 282 ELSE 283 283 neuler = 0 284 284 ENDIF 285 285 ! 286 CALL iom_get( numror, jpdom_autoglo, 'un' , uu(:,:,: ,Kmm), ldxios = lrxios )! now fields287 CALL iom_get( numror, jpdom_autoglo, 'vn' , vv(:,:,: ,Kmm), ldxios = lrxios)286 CALL iom_get( numror, jpdom_autoglo, 'un' , uu(:,:,: ,Kmm), ldxios = lrxios ) ! now fields 287 CALL iom_get( numror, jpdom_autoglo, 'vn' , vv(:,:,: ,Kmm), ldxios = lrxios ) 288 288 CALL iom_get( numror, jpdom_autoglo, 'tn' , ts(:,:,:,jp_tem,Kmm), ldxios = lrxios ) 289 289 CALL iom_get( numror, jpdom_autoglo, 'sn' , ts(:,:,:,jp_sal,Kmm), ldxios = lrxios ) 290 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn, ldxios = lrxios )290 CALL iom_get( numror, jpdom_autoglo, 'sshn' ,ssh(:,: ,Kmm), ldxios = lrxios ) 291 291 IF( iom_varid( numror, 'rhop', ldstop = .FALSE. ) > 0 ) THEN 292 292 CALL iom_get( numror, jpdom_autoglo, 'rhop' , rhop, ldxios = lrxios ) ! now potential density … … 297 297 IF( neuler == 0 ) THEN ! Euler restart (neuler=0) 298 298 ts (:,:,:,:,Kbb) = ts (:,:,:,:,Kmm) ! all before fields set to now values 299 uu (:,:,: ,Kbb) = uu (:,:,:,Kmm)300 vv (:,:,: ,Kbb) = vv (:,:,:,Kmm)301 ssh b (:,:) = sshn (:,:)299 uu (:,:,: ,Kbb) = uu (:,:,: ,Kmm) 300 vv (:,:,: ,Kbb) = vv (:,:,: ,Kmm) 301 ssh (:,: ,Kbb) = ssh (:,: ,Kmm) 302 302 ! 303 303 IF( .NOT.ln_linssh ) THEN -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/OBS/diaobs.F90
r10922 r11053 460 460 ! 461 461 IF( TRIM(cobstypessurf(jtype)) == 'sla' ) THEN 462 CALL obs_rea_mdt( surfdataqc(jtype), n2dintsurf(jtype) )462 CALL obs_rea_mdt( surfdataqc(jtype), n2dintsurf(jtype), Kmm ) 463 463 IF( ln_altbias ) & 464 464 & CALL obs_rea_altbias ( surfdataqc(jtype), n2dintsurf(jtype), cn_altbiasfile ) … … 499 499 USE dom_oce, ONLY : gdept, gdept_1d ! Ocean space domain variables (Kmm time-level only) 500 500 USE phycst , ONLY : rday ! Physical constants 501 USE oce , ONLY : ts, uu, vv, ssh n! Ocean dynamics and tracers variables (Kmm time-level only)501 USE oce , ONLY : ts, uu, vv, ssh ! Ocean dynamics and tracers variables (Kmm time-level only) 502 502 USE phycst , ONLY : rday ! Physical constants 503 503 #if defined key_si3 … … 598 598 zsurfvar(:,:) = ts(:,:,1,jp_tem,Kmm) 599 599 CASE('sla') 600 zsurfvar(:,:) = ssh n(:,:)600 zsurfvar(:,:) = ssh(:,:,Kmm) 601 601 CASE('sss') 602 602 zsurfvar(:,:) = ts(:,:,1,jp_sal,Kmm) -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/OBS/obs_read_altbias.F90
r10068 r11053 29 29 & gphit 30 30 USE oce, ONLY : & ! Model variables 31 & ssh n31 & ssh 32 32 USE obs_inter_h2d 33 33 USE obs_utils ! Various observation tools -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/OBS/obs_readmdt.F90
r10425 r11053 25 25 & tmask, tmask_i, e1e2t, gphit, glamt 26 26 USE obs_const, ONLY : obfillflt ! Fillvalue 27 USE oce , ONLY : ssh n! Model variables27 USE oce , ONLY : ssh ! Model variables 28 28 29 29 IMPLICIT NONE … … 44 44 CONTAINS 45 45 46 SUBROUTINE obs_rea_mdt( sladata, k2dint )46 SUBROUTINE obs_rea_mdt( sladata, k2dint, Kmm ) 47 47 !!--------------------------------------------------------------------- 48 48 !! … … 59 59 TYPE(obs_surf), INTENT(inout) :: sladata ! SLA data 60 60 INTEGER , INTENT(in) :: k2dint ! ? 61 INTEGER , INTENT(in) :: Kmm ! ? 61 62 ! 62 63 CHARACTER(LEN=12), PARAMETER :: cpname = 'obs_rea_mdt' … … 106 107 ! Remove the offset between the MDT used with the sla and the model MDT 107 108 IF( nn_msshc == 1 .OR. nn_msshc == 2 ) & 108 & CALL obs_offset_mdt( jpi, jpj, z_mdt, zfill )109 & CALL obs_offset_mdt( jpi, jpj, z_mdt, zfill, Kmm ) 109 110 110 111 ! Intepolate the MDT already on the model grid at the observation point … … 169 170 170 171 171 SUBROUTINE obs_offset_mdt( kpi, kpj, mdt, zfill )172 SUBROUTINE obs_offset_mdt( kpi, kpj, mdt, zfill, Kmm ) 172 173 !!--------------------------------------------------------------------- 173 174 !! … … 183 184 !!---------------------------------------------------------------------- 184 185 INTEGER, INTENT(IN) :: kpi, kpj 186 INTEGER, INTENT(IN) :: Kmm 185 187 REAL(wp), DIMENSION(kpi,kpj), INTENT(INOUT) :: mdt ! MDT used on the model grid 186 188 REAL(wp) , INTENT(IN ) :: zfill … … 216 218 zarea = zarea + zdxdy 217 219 zeta1 = zeta1 + mdt(ji,jj) * zdxdy 218 zeta2 = zeta2 + ssh n (ji,jj) * zdxdy220 zeta2 = zeta2 + ssh(ji,jj,Kmm) * zdxdy 219 221 END DO 220 222 END DO -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/OBS/obs_sstbias.F90
r9023 r11053 28 28 & glamt 29 29 USE oce, ONLY : & ! Model variables 30 & ssh n30 & ssh 31 31 USE obs_inter_h2d 32 32 USE obs_utils ! Various observation tools -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/SBC/fldread.F90
r10922 r11053 130 130 CONTAINS 131 131 132 SUBROUTINE fld_read( kt, kn_fsbc, sd, map, kit, kt_offset, jpk_bdy, fvl )132 SUBROUTINE fld_read( kt, kn_fsbc, sd, map, kit, kt_offset, jpk_bdy, fvl, Kmm ) 133 133 !!--------------------------------------------------------------------- 134 134 !! *** ROUTINE fld_read *** … … 153 153 INTEGER , INTENT(in ), OPTIONAL :: jpk_bdy ! number of vertical levels in the BDY data 154 154 LOGICAL , INTENT(in ), OPTIONAL :: fvl ! number of vertical levels in the BDY data 155 INTEGER , INTENT(in ), OPTIONAL :: Kmm ! ocean time level index 155 156 !! 156 157 INTEGER :: itmp ! local variable … … 287 288 ! read after data 288 289 IF( PRESENT(jpk_bdy) ) THEN 289 CALL fld_get( sd(jf), imap, jpk_bdy, fvl )290 CALL fld_get( sd(jf), imap, jpk_bdy, fvl, Kmm ) 290 291 ELSE 291 292 CALL fld_get( sd(jf), imap ) … … 614 615 615 616 616 SUBROUTINE fld_get( sdjf, map, jpk_bdy, fvl )617 SUBROUTINE fld_get( sdjf, map, jpk_bdy, fvl, Kmm ) 617 618 !!--------------------------------------------------------------------- 618 619 !! *** ROUTINE fld_get *** … … 624 625 INTEGER , INTENT(in), OPTIONAL :: jpk_bdy ! number of vertical levels in the bdy data 625 626 LOGICAL , INTENT(in), OPTIONAL :: fvl ! number of vertical levels in the bdy data 627 INTEGER , INTENT(in), OPTIONAL :: Kmm ! ocean time level index 626 628 ! 627 629 INTEGER :: ipk ! number of vertical levels of sdjf%fdta ( 2D: ipk=1 ; 3D: ipk=jpk ) … … 638 640 IF( PRESENT(jpk_bdy) ) THEN 639 641 IF( sdjf%ln_tint ) THEN ; CALL fld_map( sdjf%num, sdjf%clvar, sdjf%fdta(:,:,:,2), & 640 sdjf%nrec_a(1), map, sdjf%igrd, sdjf%ibdy, jpk_bdy, fvl )642 sdjf%nrec_a(1), map, sdjf%igrd, sdjf%ibdy, jpk_bdy, fvl, Kmm ) 641 643 ELSE ; CALL fld_map( sdjf%num, sdjf%clvar, sdjf%fnow(:,:,: ), & 642 sdjf%nrec_a(1), map, sdjf%igrd, sdjf%ibdy, jpk_bdy, fvl )644 sdjf%nrec_a(1), map, sdjf%igrd, sdjf%ibdy, jpk_bdy, fvl, Kmm ) 643 645 ENDIF 644 646 ELSE … … 701 703 END SUBROUTINE fld_get 702 704 703 SUBROUTINE fld_map( num, clvar, dta, nrec, map, igrd, ibdy, jpk_bdy, fvl )705 SUBROUTINE fld_map( num, clvar, dta, nrec, map, igrd, ibdy, jpk_bdy, fvl, Kmm ) 704 706 !!--------------------------------------------------------------------- 705 707 !! *** ROUTINE fld_map *** … … 718 720 INTEGER , INTENT(in), OPTIONAL :: igrd, ibdy, jpk_bdy ! grid type, set number and number of vertical levels in the bdy data 719 721 LOGICAL , INTENT(in), OPTIONAL :: fvl ! grid type, set number and number of vertical levels in the bdy data 722 INTEGER , INTENT(in), OPTIONAL :: Kmm ! ocean time level index 720 723 INTEGER :: jpkm1_bdy! number of vertical levels in the bdy data minus 1 721 724 !! … … 813 816 814 817 IF ( ln_bdy ) & 815 CALL fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl, ilendta )818 CALL fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl, ilendta, Kmm) 816 819 817 820 ELSE ! boundary data assumed to be on model grid … … 838 841 END SUBROUTINE fld_map 839 842 840 SUBROUTINE fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl, ilendta )843 SUBROUTINE fld_bdy_interp(dta_read, dta_read_z, dta_read_dz, map, jpk_bdy, igrd, ibdy, fv, dta, fvl, ilendta, Kmm) 841 844 842 845 !!--------------------------------------------------------------------- … … 857 860 INTEGER , INTENT(in) :: igrd, ibdy, jpk_bdy ! number of levels in bdy data 858 861 INTEGER , INTENT(in) :: ilendta ! length of data in file 862 INTEGER , INTENT(in), OPTIONAL :: Kmm ! ocean time level index 859 863 !! 860 864 INTEGER :: ipi ! length of boundary data on local process … … 900 904 SELECT CASE( igrd ) 901 905 CASE(1) 902 IF( ABS( (zh - ht _n(zij,zjj)) / ht_n(zij,zjj)) * tmask(zij,zjj,1) > 0.01_wp ) THEN906 IF( ABS( (zh - ht(zij,zjj)) / ht(zij,zjj)) * tmask(zij,zjj,1) > 0.01_wp ) THEN 903 907 WRITE(ibstr,"(I10.10)") map%ptr(ib) 904 908 CALL ctl_warn('fld_bdy_interp: T depths differ between grids at BDY point '//TRIM(ibstr)//' by more than 1%') 905 ! IF(lwp) WRITE(*,*) 'DEPTHT', zh, sum(e3t(zij,zjj,:, nfld_Nnn), mask=tmask(zij,zjj,:)==1), ht_n(zij,zjj), map%ptr(ib), ib, zij, zjj909 ! IF(lwp) WRITE(*,*) 'DEPTHT', zh, sum(e3t(zij,zjj,:,Kmm), mask=tmask(zij,zjj,:)==1), ht(zij,zjj), map%ptr(ib), ib, zij, zjj 906 910 ENDIF 907 911 CASE(2) 908 IF( ABS( (zh - hu _n(zij,zjj)) * r1_hu_n(zij,zjj)) * umask(zij,zjj,1) > 0.01_wp ) THEN912 IF( ABS( (zh - hu(zij,zjj,Kmm)) * r1_hu(zij,zjj,Kmm)) * umask(zij,zjj,1) > 0.01_wp ) THEN 909 913 WRITE(ibstr,"(I10.10)") map%ptr(ib) 910 914 CALL ctl_warn('fld_bdy_interp: U depths differ between grids at BDY point '//TRIM(ibstr)//' by more than 1%') 911 IF(lwp) WRITE(*,*) 'DEPTHU', zh, sum(e3u(zij,zjj,:, nfld_Nnn), mask=umask(zij,zjj,:)==1), sum(umask(zij,zjj,:)), &912 & hu _n(zij,zjj), map%ptr(ib), ib, zij, zjj, narea-1 , &915 IF(lwp) WRITE(*,*) 'DEPTHU', zh, sum(e3u(zij,zjj,:,Kmm), mask=umask(zij,zjj,:)==1), sum(umask(zij,zjj,:)), & 916 & hu(zij,zjj,Kmm), map%ptr(ib), ib, zij, zjj, narea-1 , & 913 917 & dta_read(map%ptr(ib),1,:) 914 918 ENDIF 915 919 CASE(3) 916 IF( ABS( (zh - hv _n(zij,zjj)) * r1_hv_n(zij,zjj)) * vmask(zij,zjj,1) > 0.01_wp ) THEN920 IF( ABS( (zh - hv(zij,zjj,Kmm)) * r1_hv(zij,zjj,Kmm)) * vmask(zij,zjj,1) > 0.01_wp ) THEN 917 921 WRITE(ibstr,"(I10.10)") map%ptr(ib) 918 922 CALL ctl_warn('fld_bdy_interp: V depths differ between grids at BDY point '//TRIM(ibstr)//' by more than 1%') … … 922 926 SELECT CASE( igrd ) 923 927 CASE(1) 924 zl = gdept(zij,zjj,ik, nfld_Nnn) ! if using in step could use fsdept instead of gdept_n?928 zl = gdept(zij,zjj,ik,Kmm) ! if using in step could use fsdept instead of gdept_n? 925 929 CASE(2) 926 930 IF(ln_sco) THEN 927 zl = ( gdept(zij,zjj,ik, nfld_Nnn) + gdept(zij+1,zjj,ik,nfld_Nnn) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n?931 zl = ( gdept(zij,zjj,ik,Kmm) + gdept(zij+1,zjj,ik,Kmm) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n? 928 932 ELSE 929 zl = MIN( gdept(zij,zjj,ik, nfld_Nnn), gdept(zij+1,zjj,ik,nfld_Nnn) )933 zl = MIN( gdept(zij,zjj,ik,Kmm), gdept(zij+1,zjj,ik,Kmm) ) 930 934 ENDIF 931 935 CASE(3) 932 936 IF(ln_sco) THEN 933 zl = ( gdept(zij,zjj,ik, nfld_Nnn) + gdept(zij,zjj+1,ik,nfld_Nnn) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n?937 zl = ( gdept(zij,zjj,ik,Kmm) + gdept(zij,zjj+1,ik,Kmm) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n? 934 938 ELSE 935 zl = MIN( gdept(zij,zjj,ik, nfld_Nnn), gdept(zij,zjj+1,ik,nfld_Nnn) )939 zl = MIN( gdept(zij,zjj,ik,Kmm), gdept(zij,zjj+1,ik,Kmm) ) 936 940 ENDIF 937 941 END SELECT … … 941 945 dta(ib,1,ik) = dta_read(map%ptr(ib),1,MAXLOC(dta_read_z(map%ptr(ib),1,:),1)) 942 946 ELSE ! inbetween : vertical interpolation between ikk & ikk+1 943 DO ikk = 1, jpkm1_bdy ! when gdept(ikk, nfld_Nnn) < zl < gdept(ikk+1,nfld_Nnn)947 DO ikk = 1, jpkm1_bdy ! when gdept(ikk,Kmm) < zl < gdept(ikk+1,Kmm) 944 948 IF( ( (zl-dta_read_z(map%ptr(ib),1,ikk)) * (zl-dta_read_z(map%ptr(ib),1,ikk+1)) <= 0._wp) & 945 949 & .AND. (dta_read_z(map%ptr(ib),1,ikk+1) /= fv_alt)) THEN … … 965 969 ENDDO 966 970 DO ik = 1, ipk ! calculate transport on model grid 967 ztrans_new = ztrans_new + dta(ib,1,ik) * e3u(zij,zjj,ik, nfld_Nnn) * umask(zij,zjj,ik)971 ztrans_new = ztrans_new + dta(ib,1,ik) * e3u(zij,zjj,ik,Kmm) * umask(zij,zjj,ik) 968 972 ENDDO 969 973 DO ik = 1, ipk ! make transport correction 970 974 IF(fvl) THEN ! bdy data are total velocity so adjust bt transport term to match input data 971 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hu _n(zij,zjj) ) * umask(zij,zjj,ik)975 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hu(zij,zjj,Kmm) ) * umask(zij,zjj,ik) 972 976 ELSE ! we're just dealing with bc velocity so bt transport term should sum to zero 973 IF( ABS(ztrans * r1_hu _n(zij,zjj)) > 0.01_wp ) &977 IF( ABS(ztrans * r1_hu(zij,zjj,Kmm)) > 0.01_wp ) & 974 978 & CALL ctl_warn('fld_bdy_interp: barotropic component of > 0.01 ms-1 found in baroclinic velocities at') 975 dta(ib,1,ik) = dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hu _n(zij,zjj) * umask(zij,zjj,ik)979 dta(ib,1,ik) = dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hu(zij,zjj,Kmm) * umask(zij,zjj,ik) 976 980 ENDIF 977 981 ENDDO … … 990 994 ENDDO 991 995 DO ik = 1, ipk ! calculate transport on model grid 992 ztrans_new = ztrans_new + dta(ib,1,ik) * e3v(zij,zjj,ik, nfld_Nnn) * vmask(zij,zjj,ik)996 ztrans_new = ztrans_new + dta(ib,1,ik) * e3v(zij,zjj,ik,Kmm) * vmask(zij,zjj,ik) 993 997 ENDDO 994 998 DO ik = 1, ipk ! make transport correction 995 999 IF(fvl) THEN ! bdy data are total velocity so adjust bt transport term to match input data 996 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hv _n(zij,zjj) ) * vmask(zij,zjj,ik)1000 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hv(zij,zjj,Kmm) ) * vmask(zij,zjj,ik) 997 1001 ELSE ! we're just dealing with bc velocity so bt transport term should sum to zero 998 dta(ib,1,ik) = dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hv _n(zij,zjj) * vmask(zij,zjj,ik)1002 dta(ib,1,ik) = dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hv(zij,zjj,Kmm) * vmask(zij,zjj,ik) 999 1003 ENDIF 1000 1004 ENDDO … … 1025 1029 SELECT CASE( igrd ) 1026 1030 CASE(1) 1027 IF( ABS( (zh - ht _n(zij,zjj)) / ht_n(zij,zjj)) * tmask(zij,zjj,1) > 0.01_wp ) THEN1031 IF( ABS( (zh - ht(zij,zjj)) / ht(zij,zjj)) * tmask(zij,zjj,1) > 0.01_wp ) THEN 1028 1032 WRITE(ibstr,"(I10.10)") map%ptr(ib) 1029 1033 CALL ctl_warn('fld_bdy_interp: T depths differ between grids at BDY point '//TRIM(ibstr)//' by more than 1%') 1030 ! IF(lwp) WRITE(*,*) 'DEPTHT', zh, sum(e3t(zij,zjj,:, nfld_Nnn), mask=tmask(zij,zjj,:)==1), ht_n(zij,zjj), map%ptr(ib), ib, zij, zjj1034 ! IF(lwp) WRITE(*,*) 'DEPTHT', zh, sum(e3t(zij,zjj,:,Kmm), mask=tmask(zij,zjj,:)==1), ht(zij,zjj), map%ptr(ib), ib, zij, zjj 1031 1035 ENDIF 1032 1036 CASE(2) 1033 IF( ABS( (zh - hu _n(zij,zjj)) * r1_hu_n(zij,zjj)) * umask(zij,zjj,1) > 0.01_wp ) THEN1037 IF( ABS( (zh - hu(zij,zjj,Kmm)) * r1_hu(zij,zjj,Kmm)) * umask(zij,zjj,1) > 0.01_wp ) THEN 1034 1038 WRITE(ibstr,"(I10.10)") map%ptr(ib) 1035 1039 CALL ctl_warn('fld_bdy_interp: U depths differ between grids at BDY point '//TRIM(ibstr)//' by more than 1%') 1036 1040 ENDIF 1037 1041 CASE(3) 1038 IF( ABS( (zh - hv _n(zij,zjj)) * r1_hv_n(zij,zjj)) * vmask(zij,zjj,1) > 0.01_wp ) THEN1042 IF( ABS( (zh - hv(zij,zjj,Kmm)) * r1_hv(zij,zjj,Kmm)) * vmask(zij,zjj,1) > 0.01_wp ) THEN 1039 1043 WRITE(ibstr,"(I10.10)") map%ptr(ib) 1040 1044 CALL ctl_warn('fld_bdy_interp: V depths differ between grids at BDY point '//TRIM(ibstr)//' by more than 1%') … … 1044 1048 SELECT CASE( igrd ) ! coded for sco - need zco and zps option using min 1045 1049 CASE(1) 1046 zl = gdept(zij,zjj,ik, nfld_Nnn) ! if using in step could use fsdept instead of gdept_n?1050 zl = gdept(zij,zjj,ik,Kmm) ! if using in step could use fsdept instead of gdept_n? 1047 1051 CASE(2) 1048 1052 IF(ln_sco) THEN 1049 zl = ( gdept(zij,zjj,ik, nfld_Nnn) + gdept(zij+1,zjj,ik,nfld_Nnn) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n?1053 zl = ( gdept(zij,zjj,ik,Kmm) + gdept(zij+1,zjj,ik,Kmm) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n? 1050 1054 ELSE 1051 zl = MIN( gdept(zij,zjj,ik, nfld_Nnn), gdept(zij+1,zjj,ik,nfld_Nnn) )1055 zl = MIN( gdept(zij,zjj,ik,Kmm), gdept(zij+1,zjj,ik,Kmm) ) 1052 1056 ENDIF 1053 1057 CASE(3) 1054 1058 IF(ln_sco) THEN 1055 zl = ( gdept(zij,zjj,ik, nfld_Nnn) + gdept(zij,zjj+1,ik,nfld_Nnn) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n?1059 zl = ( gdept(zij,zjj,ik,Kmm) + gdept(zij,zjj+1,ik,Kmm) ) * 0.5_wp ! if using in step could use fsdept instead of gdept_n? 1056 1060 ELSE 1057 zl = MIN( gdept(zij,zjj,ik, nfld_Nnn), gdept(zij,zjj+1,ik,nfld_Nnn) )1061 zl = MIN( gdept(zij,zjj,ik,Kmm), gdept(zij,zjj+1,ik,Kmm) ) 1058 1062 ENDIF 1059 1063 END SELECT … … 1063 1067 dta(ib,1,ik) = dta_read(ji,jj,MAXLOC(dta_read_z(ji,jj,:),1)) 1064 1068 ELSE ! inbetween : vertical interpolation between ikk & ikk+1 1065 DO ikk = 1, jpkm1_bdy ! when gdept(ikk, nfld_Nnn) < zl < gdept(ikk+1,nfld_Nnn)1069 DO ikk = 1, jpkm1_bdy ! when gdept(ikk,Kmm) < zl < gdept(ikk+1,Kmm) 1066 1070 IF( ( (zl-dta_read_z(ji,jj,ikk)) * (zl-dta_read_z(ji,jj,ikk+1)) <= 0._wp) & 1067 1071 & .AND. (dta_read_z(ji,jj,ikk+1) /= fv_alt)) THEN … … 1089 1093 ENDDO 1090 1094 DO ik = 1, ipk ! calculate transport on model grid 1091 ztrans_new = ztrans_new + dta(ib,1,ik) * e3u(zij,zjj,ik, nfld_Nnn) * umask(zij,zjj,ik)1095 ztrans_new = ztrans_new + dta(ib,1,ik) * e3u(zij,zjj,ik,Kmm) * umask(zij,zjj,ik) 1092 1096 ENDDO 1093 1097 DO ik = 1, ipk ! make transport correction 1094 1098 IF(fvl) THEN ! bdy data are total velocity so adjust bt transport term to match input data 1095 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hu _n(zij,zjj) ) * umask(zij,zjj,ik)1099 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hu(zij,zjj,Kmm) ) * umask(zij,zjj,ik) 1096 1100 ELSE ! we're just dealing with bc velocity so bt transport term should sum to zero 1097 dta(ib,1,ik) = ( dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hu _n(zij,zjj) ) * umask(zij,zjj,ik)1101 dta(ib,1,ik) = ( dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hu(zij,zjj,Kmm) ) * umask(zij,zjj,ik) 1098 1102 ENDIF 1099 1103 ENDDO … … 1114 1118 ENDDO 1115 1119 DO ik = 1, ipk ! calculate transport on model grid 1116 ztrans_new = ztrans_new + dta(ib,1,ik) * e3v(zij,zjj,ik, nfld_Nnn) * vmask(zij,zjj,ik)1120 ztrans_new = ztrans_new + dta(ib,1,ik) * e3v(zij,zjj,ik,Kmm) * vmask(zij,zjj,ik) 1117 1121 ENDDO 1118 1122 DO ik = 1, ipk ! make transport correction 1119 1123 IF(fvl) THEN ! bdy data are total velocity so adjust bt transport term to match input data 1120 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hv _n(zij,zjj) ) * vmask(zij,zjj,ik)1124 dta(ib,1,ik) = ( dta(ib,1,ik) + ( ztrans - ztrans_new ) * r1_hv(zij,zjj,Kmm) ) * vmask(zij,zjj,ik) 1121 1125 ELSE ! we're just dealing with bc velocity so bt transport term should sum to zero 1122 dta(ib,1,ik) = ( dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hv _n(zij,zjj) ) * vmask(zij,zjj,ik)1126 dta(ib,1,ik) = ( dta(ib,1,ik) + ( 0._wp - ztrans_new ) * r1_hv(zij,zjj,Kmm) ) * vmask(zij,zjj,ik) 1123 1127 ENDIF 1124 1128 ENDDO -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/SBC/sbccpl.F90
r10922 r11053 32 32 USE cpl_oasis3 ! OASIS3 coupling 33 33 USE geo2ocean ! 34 USE oce , ONLY : ts, uu, vv, ssh n, sshb, fraqsr_1lev34 USE oce , ONLY : ts, uu, vv, ssh, fraqsr_1lev 35 35 USE ocealb ! 36 36 USE eosbn2 ! … … 2037 2037 2038 2038 2039 SUBROUTINE sbc_cpl_snd( kt, K mm )2039 SUBROUTINE sbc_cpl_snd( kt, Kbb, Kmm ) 2040 2040 !!---------------------------------------------------------------------- 2041 2041 !! *** ROUTINE sbc_cpl_snd *** … … 2047 2047 !!---------------------------------------------------------------------- 2048 2048 INTEGER, INTENT(in) :: kt 2049 INTEGER, INTENT(in) :: K mm ! ocean model time level index2049 INTEGER, INTENT(in) :: Kbb, Kmm ! ocean model time level index 2050 2050 ! 2051 2051 INTEGER :: ji, jj, jl ! dummy loop indices … … 2476 2476 IF( ln_apr_dyn ) THEN 2477 2477 IF( kt /= nit000 ) THEN 2478 ztmp1(:,:) = ssh b(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )2478 ztmp1(:,:) = ssh(:,:,Kbb) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 2479 2479 ELSE 2480 ztmp1(:,:) = ssh b(:,:)2480 ztmp1(:,:) = ssh(:,:,Kbb) 2481 2481 ENDIF 2482 2482 ELSE 2483 ztmp1(:,:) = ssh n(:,:)2483 ztmp1(:,:) = ssh(:,:,Kmm) 2484 2484 ENDIF 2485 2485 CALL cpl_snd( jps_wlev , isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info ) … … 2491 2491 ! ! removed inverse barometer ssh when Patm 2492 2492 ! forcing is used (for sea-ice dynamics) 2493 IF( ln_apr_dyn ) THEN ; ztmp1(:,:) = ssh b(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )2494 ELSE ; ztmp1(:,:) = ssh n(:,:)2493 IF( ln_apr_dyn ) THEN ; ztmp1(:,:) = ssh(:,:,Kbb) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 2494 ELSE ; ztmp1(:,:) = ssh(:,:,Kmm) 2495 2495 ENDIF 2496 2496 CALL cpl_snd( jps_ssh , isec, RESHAPE ( ztmp1 , (/jpi,jpj,1/) ), info ) -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/SBC/sbcfwb.F90
r10570 r11053 48 48 CONTAINS 49 49 50 SUBROUTINE sbc_fwb( kt, kn_fwb, kn_fsbc )50 SUBROUTINE sbc_fwb( kt, kn_fwb, kn_fsbc, Kmm ) 51 51 !!--------------------------------------------------------------------- 52 52 !! *** ROUTINE sbc_fwb *** … … 65 65 INTEGER, INTENT( in ) :: kn_fsbc ! 66 66 INTEGER, INTENT( in ) :: kn_fwb ! ocean time-step index 67 INTEGER, INTENT( in ) :: Kmm ! ocean time level index 67 68 ! 68 69 INTEGER :: inum, ikty, iyear ! local integers … … 131 132 a_fwb_b = a_fwb ! mean sea level taking into account the ice+snow 132 133 ! sum over the global domain 133 a_fwb = glob_sum( 'sbcfwb', e1e2t(:,:) * ( ssh n(:,:) + snwice_mass(:,:) * r1_rau0 ) )134 a_fwb = glob_sum( 'sbcfwb', e1e2t(:,:) * ( ssh(:,:,Kmm) + snwice_mass(:,:) * r1_rau0 ) ) 134 135 a_fwb = a_fwb * 1.e+3 / ( area * rday * 365. ) ! convert in Kg/m3/s = mm/s 135 136 !!gm ! !!bug 365d year -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/SBC/sbcice_cice.F90
r10922 r11053 147 147 148 148 149 SUBROUTINE cice_sbc_init( ksbc )149 SUBROUTINE cice_sbc_init( ksbc, Kbb, Kmm ) 150 150 !!--------------------------------------------------------------------- 151 151 !! *** ROUTINE cice_sbc_init *** … … 154 154 !!--------------------------------------------------------------------- 155 155 INTEGER, INTENT( in ) :: ksbc ! surface forcing type 156 INTEGER, INTENT( in ) :: Kbb, Kmm ! time level indices 156 157 REAL(wp), DIMENSION(jpi,jpj) :: ztmp1, ztmp2 157 158 REAL(wp) :: zcoefu, zcoefv, zcoeff ! local scalar … … 227 228 IF( .NOT.ln_rstart ) THEN 228 229 IF( ln_ice_embd ) THEN ! embedded sea-ice: deplete the initial ssh below sea-ice area 229 ssh n(:,:) = sshn(:,:) - snwice_mass(:,:) * r1_rau0230 ssh b(:,:) = sshb(:,:) - snwice_mass(:,:) * r1_rau0230 ssh(:,:,Kmm) = ssh(:,:,Kmm) - snwice_mass(:,:) * r1_rau0 231 ssh(:,:,Kbb) = ssh(:,:,Kbb) - snwice_mass(:,:) * r1_rau0 231 232 232 233 !!gm This should be put elsewhere.... (same remark for limsbc) … … 235 236 ! 236 237 DO jk = 1,jpkm1 ! adjust initial vertical scale factors 237 e3t(:,:,jk,Kmm) = e3t_0(:,:,jk)*( 1._wp + ssh n(:,:)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )238 e3t(:,:,jk,Kbb) = e3t_0(:,:,jk)*( 1._wp + ssh b(:,:)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) )238 e3t(:,:,jk,Kmm) = e3t_0(:,:,jk)*( 1._wp + ssh(:,:,Kmm)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) ) 239 e3t(:,:,jk,Kbb) = e3t_0(:,:,jk)*( 1._wp + ssh(:,:,Kbb)*tmask(:,:,1)/(ht_0(:,:) + 1.0 - tmask(:,:,1)) ) 239 240 ENDDO 240 241 e3t(:,:,:,Krhs) = e3t(:,:,:,Kbb) … … 259 260 gdept(:,:,1,Kmm) = 0.5_wp * e3w(:,:,1,Kmm) 260 261 gdepw(:,:,1,Kmm) = 0.0_wp 261 gde3w(:,:,1) = gdept(:,:,1,Kmm) - ssh n(:,:)262 gde3w(:,:,1) = gdept(:,:,1,Kmm) - ssh(:,:,Kmm) 262 263 DO jk = 2, jpk 263 264 gdept(:,:,jk,Kmm) = gdept(:,:,jk-1,Kmm) + e3w(:,:,jk,Kmm) … … 1056 1057 END SUBROUTINE sbc_ice_cice 1057 1058 1058 SUBROUTINE cice_sbc_init (ksbc ) ! Dummy routine1059 SUBROUTINE cice_sbc_init (ksbc, Kbb, Kmm) ! Dummy routine 1059 1060 IMPLICIT NONE 1060 1061 INTEGER, INTENT( in ) :: ksbc 1062 INTEGER, INTENT( in ) :: Kbb, Kmm 1061 1063 WRITE(*,*) 'cice_sbc_init: You should not have seen this print! error?', ksbc 1062 1064 END SUBROUTINE cice_sbc_init -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/SBC/sbcisf.F90
r10954 r11053 149 149 DO jj = 1,jpj 150 150 DO ji = 1,jpi 151 zdep(ji,jj)=gdepw _n(ji,jj,misfkt(ji,jj))151 zdep(ji,jj)=gdepw(ji,jj,misfkt(ji,jj),Kmm) 152 152 END DO 153 153 END DO -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/SBC/sbcmod.F90
r10998 r11053 341 341 IF( sbc_ice_alloc() /= 0 ) CALL ctl_stop('STOP', 'sbc_ice_alloc : unable to allocate arrays' ) 342 342 ELSEIF( nn_ice == 2 ) THEN 343 CALL ice_init( Kbb, Kmm, Kaa ) ! ICE initialization343 CALL ice_init( Kbb, Kmm, Kaa ) ! ICE initialization 344 344 ENDIF 345 345 #endif 346 IF( nn_ice == 3 ) CALL cice_sbc_init( nsbc ) ! CICE initialization347 ! 348 IF( ln_wave ) CALL sbc_wave_init ! surface wave initialisation346 IF( nn_ice == 3 ) CALL cice_sbc_init( nsbc, Kbb, Kmm ) ! CICE initialization 347 ! 348 IF( ln_wave ) CALL sbc_wave_init ! surface wave initialisation 349 349 ! 350 350 IF( lwxios ) THEN … … 442 442 CASE( 1 ) ; CALL sbc_ice_if ( kt, Kbb, Kmm ) ! Ice-cover climatology ("Ice-if" model) 443 443 #if defined key_si3 444 CASE( 2 ) ; CALL ice_stp ( kt, Kbb, nsbc )! SI3 ice model444 CASE( 2 ) ; CALL ice_stp ( kt, Kbb, Kmm, nsbc ) ! SI3 ice model 445 445 #endif 446 446 CASE( 3 ) ; CALL sbc_ice_cice ( kt, nsbc ) ! CICE ice model … … 454 454 ENDIF 455 455 456 IF( ln_isf ) CALL sbc_isf( kt, Kmm ) ! compute iceshelves457 458 IF( ln_rnf ) CALL sbc_rnf( kt ) ! add runoffs to fresh water fluxes459 460 IF( ln_ssr ) CALL sbc_ssr( kt ) ! add SST/SSS damping term461 462 IF( nn_fwb /= 0 ) CALL sbc_fwb( kt, nn_fwb, nn_fsbc ) ! control the freshwater budget456 IF( ln_isf ) CALL sbc_isf( kt, Kmm ) ! compute iceshelves 457 458 IF( ln_rnf ) CALL sbc_rnf( kt ) ! add runoffs to fresh water fluxes 459 460 IF( ln_ssr ) CALL sbc_ssr( kt ) ! add SST/SSS damping term 461 462 IF( nn_fwb /= 0 ) CALL sbc_fwb( kt, nn_fwb, nn_fsbc, Kmm ) ! control the freshwater budget 463 463 464 464 ! Special treatment of freshwater fluxes over closed seas in the model domain … … 471 471 IF ( ll_wd ) THEN ! If near WAD point limit the flux for now 472 472 zthscl = atanh(rn_wd_sbcfra) ! taper frac default is .999 473 zwdht(:,:) = ssh n(:,:) + ht_0(:,:) - rn_wdmin1 ! do this calc of water473 zwdht(:,:) = ssh(:,:,Kmm) + ht_0(:,:) - rn_wdmin1 ! do this calc of water 474 474 ! depth above wd limit once 475 475 WHERE( zwdht(:,:) <= 0.0 ) … … 557 557 ! 558 558 IF(ln_ctl) THEN ! print mean trends (used for debugging) 559 CALL prt_ctl(tab2d_1=fr_i , clinfo1=' fr_i - : ', mask1=tmask )560 CALL prt_ctl(tab2d_1=(emp-rnf + fwfisf) , clinfo1=' emp-rnf - : ', mask1=tmask )561 CALL prt_ctl(tab2d_1=(sfx-rnf + fwfisf) , clinfo1=' sfx-rnf - : ', mask1=tmask )562 CALL prt_ctl(tab2d_1=qns , clinfo1=' qns - : ', mask1=tmask )563 CALL prt_ctl(tab2d_1=qsr , clinfo1=' qsr - : ', mask1=tmask )564 CALL prt_ctl(tab3d_1=tmask , clinfo1=' tmask - : ', mask1=tmask, kdim=jpk )565 CALL prt_ctl(tab3d_1=ts n(:,:,:,jp_tem), clinfo1=' sst - : ', mask1=tmask, kdim=1 )566 CALL prt_ctl(tab3d_1=ts n(:,:,:,jp_sal), clinfo1=' sss - : ', mask1=tmask, kdim=1 )567 CALL prt_ctl(tab2d_1=utau , clinfo1=' utau - : ', mask1=umask, &568 & tab2d_2=vtau , clinfo2=' vtau - : ', mask2=vmask )559 CALL prt_ctl(tab2d_1=fr_i , clinfo1=' fr_i - : ' , mask1=tmask ) 560 CALL prt_ctl(tab2d_1=(emp-rnf + fwfisf) , clinfo1=' emp-rnf - : ' , mask1=tmask ) 561 CALL prt_ctl(tab2d_1=(sfx-rnf + fwfisf) , clinfo1=' sfx-rnf - : ' , mask1=tmask ) 562 CALL prt_ctl(tab2d_1=qns , clinfo1=' qns - : ', mask1=tmask ) 563 CALL prt_ctl(tab2d_1=qsr , clinfo1=' qsr - : ', mask1=tmask ) 564 CALL prt_ctl(tab3d_1=tmask , clinfo1=' tmask - : ', mask1=tmask, kdim=jpk ) 565 CALL prt_ctl(tab3d_1=ts(:,:,:,jp_tem,Kmm), clinfo1=' sst - : ', mask1=tmask, kdim=1 ) 566 CALL prt_ctl(tab3d_1=ts(:,:,:,jp_sal,Kmm), clinfo1=' sss - : ', mask1=tmask, kdim=1 ) 567 CALL prt_ctl(tab2d_1=utau , clinfo1=' utau - : ', mask1=umask, & 568 & tab2d_2=vtau , clinfo2=' vtau - : ', mask2=vmask ) 569 569 ENDIF 570 570 -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/SBC/sbcssm.F90
r10922 r11053 77 77 sss_m(:,:) = zts(:,:,jp_sal) 78 78 ! ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 79 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = ssh n(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )80 ELSE ; ssh_m(:,:) = ssh n(:,:)79 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = ssh(:,:,Kmm) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 80 ELSE ; ssh_m(:,:) = ssh(:,:,Kmm) 81 81 ENDIF 82 82 ! … … 100 100 sss_m(:,:) = zcoef * zts(:,:,jp_sal) 101 101 ! ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 102 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = zcoef * ( ssh n(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) )103 ELSE ; ssh_m(:,:) = zcoef * sshn(:,:)102 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = zcoef * ( ssh(:,:,Kmm) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) ) 103 ELSE ; ssh_m(:,:) = zcoef * ssh(:,:,Kmm) 104 104 ENDIF 105 105 ! … … 128 128 sss_m(:,:) = sss_m(:,:) + zts(:,:,jp_sal) 129 129 ! ! removed inverse barometer ssh when Patm forcing is used (for sea-ice dynamics) 130 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = ssh_m(:,:) + ssh n(:,:) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) )131 ELSE ; ssh_m(:,:) = ssh_m(:,:) + ssh n(:,:)130 IF( ln_apr_dyn ) THEN ; ssh_m(:,:) = ssh_m(:,:) + ssh(:,:,Kmm) - 0.5 * ( ssh_ib(:,:) + ssh_ibb(:,:) ) 131 ELSE ; ssh_m(:,:) = ssh_m(:,:) + ssh(:,:,Kmm) 132 132 ENDIF 133 133 ! … … 250 250 ENDIF 251 251 sss_m(:,:) = ts (:,:,1,jp_sal,Kmm) 252 ssh_m(:,:) = ssh n(:,:)252 ssh_m(:,:) = ssh(:,:,Kmm) 253 253 e3t_m(:,:) = e3t (:,:,1,Kmm) 254 254 frq_m(:,:) = 1._wp -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/TRD/trddyn.F90
r10946 r11053 123 123 z3dx(:,:,:) = 0._wp ! U.dxU & V.dyV (approximation) 124 124 z3dy(:,:,:) = 0._wp 125 DO jk = 1, jpkm1 ! no mask as u n,vnare masked125 DO jk = 1, jpkm1 ! no mask as uu, vv are masked 126 126 DO jj = 2, jpjm1 127 127 DO ji = 2, jpim1 -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/TRD/trdvor.F90
r10946 r11053 189 189 190 190 ! Average except for Beta.V 191 zudpvor(:,:) = zudpvor(:,:) * r1_hu _n(:,:)192 zvdpvor(:,:) = zvdpvor(:,:) * r1_hv _n(:,:)191 zudpvor(:,:) = zudpvor(:,:) * r1_hu(:,:,Kmm) 192 zvdpvor(:,:) = zvdpvor(:,:) * r1_hv(:,:,Kmm) 193 193 194 194 ! Curl … … 276 276 END DO 277 277 ! Average of the Curl and Surface mask 278 vortrd(:,:,jpvor_bev) = vortrd(:,:,jpvor_bev) * r1_hu _n(:,:) * fmask(:,:,1)278 vortrd(:,:,jpvor_bev) = vortrd(:,:,jpvor_bev) * r1_hu(:,:,Kmm) * fmask(:,:,1) 279 279 ENDIF 280 280 ! 281 281 ! Average 282 zudpvor(:,:) = zudpvor(:,:) * r1_hu _n(:,:)283 zvdpvor(:,:) = zvdpvor(:,:) * r1_hv _n(:,:)282 zudpvor(:,:) = zudpvor(:,:) * r1_hu(:,:,Kmm) 283 zvdpvor(:,:) = zvdpvor(:,:) * r1_hv(:,:,Kmm) 284 284 ! 285 285 ! Curl … … 342 342 END DO 343 343 344 zuu(:,:) = zuu(:,:) * r1_hu _n(:,:)345 zvv(:,:) = zvv(:,:) * r1_hv _n(:,:)344 zuu(:,:) = zuu(:,:) * r1_hu(:,:,Kmm) 345 zvv(:,:) = zvv(:,:) * r1_hv(:,:,Kmm) 346 346 347 347 ! Curl -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/ZDF/zdfosm.F90
r10955 r11053 489 489 490 490 zhbl_t(:,:) = hbl(:,:) + (zdhdt(:,:) - ww(ji,jj,ibld(ji,jj)))* rn_rdt ! certainly need wb here, so subtract it 491 zhbl_t(:,:) = MIN(zhbl_t(:,:), ht _n(:,:))491 zhbl_t(:,:) = MIN(zhbl_t(:,:), ht(:,:)) 492 492 zdhdt(:,:) = MIN(zdhdt(:,:), (zhbl_t(:,:) - hbl(:,:))/rn_rdt + ww(ji,jj,ibld(ji,jj))) ! adjustment to represent limiting by ocean bottom 493 493 … … 525 525 526 526 zhbl_s = zhbl_s + MIN( - zwb_ent(ji,jj) / zdb * rn_rdt / FLOAT(ibld(ji,jj)-imld(ji,jj) ), e3w(ji,jj,jk,Kmm) ) 527 zhbl_s = MIN(zhbl_s, ht _n(ji,jj))527 zhbl_s = MIN(zhbl_s, ht(ji,jj)) 528 528 529 529 IF ( zhbl_s >= gdepw(ji,jj,jm+1,Kmm) ) jm = jm + 1 … … 546 546 & * zwstrl(ji,jj)**3 / hbli(ji,jj) ) / zdb * e3w(ji,jj,jk,Kmm) / zdhdt(ji,jj) ! ALMG to investigate whether need to include ww here 547 547 548 zhbl_s = MIN(zhbl_s, ht _n(ji,jj))548 zhbl_s = MIN(zhbl_s, ht(ji,jj)) 549 549 IF ( zhbl_s >= gdepw(ji,jj,jm,Kmm) ) jm = jm + 1 550 550 END DO -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/nemogcm.F90
r10998 r11053 137 137 ! !-----------------------! 138 138 #if defined key_agrif 139 Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nrhs ! agrif_oce module copies of time level indices 139 140 CALL Agrif_Declare_Var_dom ! AGRIF: set the meshes for DOM 140 141 CALL Agrif_Declare_Var ! " " " " " DYN/TRA … … 169 170 ! 170 171 ! Recursive update from highest nested level to lowest: 172 Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nnn ! agrif_oce module copies of time level indices 171 173 CALL Agrif_step_child_adj(Agrif_Update_All) 172 174 ! … … 404 406 Nbb = 1; Nnn = 2; Naa = 3; Nrhs = Naa 405 407 406 ! Initialisation of temporary pointers (to be deleted after development finished)407 CALL update_pointers( Nbb, Nnn, Naa )408 408 ! !-------------------------------! 409 409 ! ! NEMO general initialization ! -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/oce.F90
r10919 r11053 17 17 PUBLIC oce_alloc ! routine called by nemo_init in nemogcm.F90 18 18 19 !! dynamics and tracer fields NOTE THAT "TARGET" ATTRIBUTE CAN BE REMOVED AFTER IMMERSE DEVELOPMENT FINISHED19 !! dynamics and tracer fields 20 20 !! -------------------------- 21 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) , TARGET:: uu , vv !: horizontal velocities [m/s]22 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) , TARGET:: ww !: vertical velocity [m/s]23 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) 24 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) , TARGET:: hdiv !: horizontal divergence [s-1]25 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:,:) ,TARGET:: ts !: 4D T-S fields [Celsius,psu]26 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: rab_b, rab_n!: thermal/haline expansion coef. [Celsius-1,psu-1]27 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: rn2b , rn2!: brunt-vaisala frequency**2 [s-2]21 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: uu , vv !: horizontal velocities [m/s] 22 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: ww !: vertical velocity [m/s] 23 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: wi !: vertical vel. (adaptive-implicit) [m/s] 24 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: hdiv !: horizontal divergence [s-1] 25 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:,:) :: ts !: 4D T-S fields [Celsius,psu] 26 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) :: rab_b, rab_n !: thermal/haline expansion coef. [Celsius-1,psu-1] 27 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: rn2b , rn2 !: brunt-vaisala frequency**2 [s-2] 28 28 ! 29 29 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: rhd !: in situ density anomalie rhd=(rho-rau0)/rau0 [no units] … … 33 33 !! free surface ! before ! now ! after ! 34 34 !! ------------ ! fields ! fields ! fields ! 35 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) , TARGET:: ssh, uu_b, vv_b !: SSH [m] and barotropic velocities [m/s]35 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: ssh, uu_b, vv_b !: SSH [m] and barotropic velocities [m/s] 36 36 37 37 !! Arrays at barotropic time step: ! befbefore! before ! now ! after ! … … 64 64 65 65 !! Energy budget of the leads (open water embedded in sea ice) 66 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fraqsr_1lev !: fraction of solar net radiation absorbed in the first ocean level [-] 67 68 !! TEMPORARY POINTERS FOR DEVELOPMENT ONLY 69 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: ub , un , ua !: i-horizontal velocity [m/s] 70 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: vb , vn , va !: j-horizontal velocity [m/s] 71 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: wn !: k-vertical velocity [m/s] 72 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:) :: hdivn !: horizontal divergence [s-1] 73 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:,:,:) :: tsb , tsn , tsa !: 4D T-S fields [Celsius,psu] 74 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: ub_b , un_b , ua_b !: Barotropic velocities at u-point [m/s] 75 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: vb_b , vn_b , va_b !: Barotropic velocities at v-point [m/s] 76 REAL(wp), PUBLIC, POINTER, SAVE, DIMENSION(:,:) :: sshb , sshn , ssha !: sea surface height at t-point [m] 77 !! TEMPORARY POINTERS FOR DEVELOPMENT ONLY 66 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: fraqsr_1lev !: fraction of solar net radiation absorbed in the first ocean level [-] 67 INTEGER, PUBLIC, DIMENSION(2) :: noce_array !: unused array but seems to be needed to prevent agrif from creating an empty module 78 68 79 69 !!---------------------------------------------------------------------- -
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps_rewrite_time_filterswap/src/OCE/step.F90
r11050 r11053 44 44 45 45 PUBLIC stp ! called by nemogcm.F90 46 PUBLIC update_pointers ! called by nemo_init47 46 48 47 !!---------------------------------------------------------------------- … … 253 252 #endif 254 253 CALL tra_adv ( kstp, Nbb, Nnn, ts, Nrhs ) ! hor. + vert. advection ==> RHS 255 IF( ln_zdfosm ) CALL tra_osm ( kstp, Nnn, ts, Nrhs ) ! OSMOSIS non-local tracer fluxes ==> RHS254 IF( ln_zdfosm ) CALL tra_osm ( kstp, Nnn, ts, Nrhs ) ! OSMOSIS non-local tracer fluxes ==> RHS 256 255 IF( lrst_oce .AND. ln_zdfosm ) & 257 & CALL osm_rst ( kstp, Nnn, 'WRITE' )! write OSMOSIS outputs + ww (so must do here) to restarts256 & CALL osm_rst ( kstp, Nnn, 'WRITE' ) ! write OSMOSIS outputs + ww (so must do here) to restarts 258 257 CALL tra_ldf ( kstp, Nbb, Nnn, ts, Nrhs ) ! lateral mixing 259 258 260 259 !!gm : why CALL to dia_ptr has been moved here??? (use trends info?) 261 IF( ln_diaptr ) CALL dia_ptr( Nnn ) ! Poleward adv/ldf TRansports diagnostics260 IF( ln_diaptr ) CALL dia_ptr( Nnn ) ! Poleward adv/ldf TRansports diagnostics 262 261 !!gm 263 262 CALL tra_zdf ( kstp, Nbb, Nnn, Nrhs, ts, Naa ) ! vert. mixing & after tracer ==> after … … 282 281 !!jc2: dynnxt must be the latest call. e3t(:,:,:,Nbb) are indeed updated in that routine 283 282 CALL tra_nxt ( kstp, Nbb, Nnn, Nrhs, Naa ) ! finalize (bcs) tracer fields at next time step and swap 284 CALL dyn_atf ( kstp, Nbb, Nnn, Naa, uu, vv, e3t, e3u, e3v ) ! time swapping of "now" arrays283 CALL dyn_atf ( kstp, Nbb, Nnn, Naa, uu, vv, e3t, e3u, e3v ) ! time filtering of "now" arrays 285 284 CALL ssh_swp ( kstp, Nbb, Nnn, Naa ) ! swap of sea surface height 286 285 ! … … 291 290 Naa = Nrhs 292 291 ! 293 ! Update temporary pointers294 CALL update_pointers( Nbb, Nnn, Naa )295 296 292 IF(.NOT.ln_linssh) CALL dom_vvl_sf_swp( kstp, Nbb, Nnn, Naa ) ! swap of vertical scale factors 297 293 ! … … 310 306 ! AGRIF 311 307 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 312 CALL Agrif_Integrate_ChildGrids( stp ) ! allows to finish all the Child Grids before updating 313 314 IF( Agrif_NbStepint() == 0 ) CALL Agrif_update_all( ) ! Update all components 308 CALL Agrif_Integrate_ChildGrids( stp ) ! allows to finish all the Child Grids before updating 309 310 IF( Agrif_NbStepint() == 0 ) THEN 311 Kbb_a = Nbb; Kmm_a = Nnn; Krhs_a = Nrhs ! agrif_oce module copies of time level indices 312 CALL Agrif_update_all( ) ! Update all components 313 ENDIF 315 314 #endif 316 315 IF( ln_diaobs ) CALL dia_obs ( kstp, Nnn ) ! obs-minus-model (assimilation) diagnostics (call after dynamics update) … … 331 330 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 332 331 !!gm why lk_oasis and not lk_cpl ???? 333 IF( lk_oasis ) CALL sbc_cpl_snd( kstp, N nn )! coupled mode : field exchanges332 IF( lk_oasis ) CALL sbc_cpl_snd( kstp, Nbb, Nnn ) ! coupled mode : field exchanges 334 333 ! 335 334 #if defined key_iomput … … 344 343 ! 345 344 END SUBROUTINE stp 346 347 SUBROUTINE update_pointers( Kbb, Kmm, Kaa ) 348 !!---------------------------------------------------------------------- 349 !! *** ROUTINE update_pointers *** 350 !! 351 !! ** Purpose : Associate temporary pointer arrays. 352 !! For IMMERSE development phase only - to be deleted 353 !! 354 !! ** Method : 355 !!---------------------------------------------------------------------- 356 INTEGER, INTENT( in ) :: Kbb, Kmm, Kaa ! time level indices 357 358 ub => uu(:,:,:,Kbb); un => uu(:,:,:,Kmm); ua => uu(:,:,:,Kaa) 359 vb => vv(:,:,:,Kbb); vn => vv(:,:,:,Kmm); va => vv(:,:,:,Kaa) 360 wn => ww(:,:,:) 361 hdivn => hdiv(:,:,:) 362 363 sshb => ssh(:,:,Kbb); sshn => ssh(:,:,Kmm); ssha => ssh(:,:,Kaa) 364 ub_b => uu_b(:,:,Kbb); un_b => uu_b(:,:,Kmm); ua_b => uu_b(:,:,Kaa) 365 vb_b => vv_b(:,:,Kbb); vn_b => vv_b(:,:,Kmm); va_b => vv_b(:,:,Kaa) 366 367 tsb => ts(:,:,:,:,Kbb); tsn => ts(:,:,:,:,Kmm); tsa => ts(:,:,:,:,Kaa) 368 369 e3t_b => e3t(:,:,:,Kbb); e3t_n => e3t(:,:,:,Kmm); e3t_a => e3t(:,:,:,Kaa) 370 e3u_b => e3u(:,:,:,Kbb); e3u_n => e3u(:,:,:,Kmm); e3u_a => e3u(:,:,:,Kaa) 371 e3v_b => e3v(:,:,:,Kbb); e3v_n => e3v(:,:,:,Kmm); e3v_a => e3v(:,:,:,Kaa) 372 373 e3f_n => e3f(:,:,:) 374 375 e3w_b => e3w (:,:,:,Kbb); e3w_n => e3w (:,:,:,Kmm) 376 e3uw_b => e3uw(:,:,:,Kbb); e3uw_n => e3uw(:,:,:,Kmm) 377 e3vw_b => e3vw(:,:,:,Kbb); e3vw_n => e3vw(:,:,:,Kmm) 378 379 gdept_b => gdept(:,:,:,Kbb); gdept_n => gdept(:,:,:,Kmm) 380 gdepw_b => gdepw(:,:,:,Kbb); gdepw_n => gdepw(:,:,:,Kmm) 381 gde3w_n => gde3w(:,:,:) 382 383 ht_n => ht(:,:) 384 385 hu_b => hu(:,:,Kbb); hu_n => hu(:,:,Kmm); hu_a => hu(:,:,Kaa) 386 hv_b => hv(:,:,Kbb); hv_n => hv(:,:,Kmm); hv_a => hv(:,:,Kaa) 387 388 r1_hu_b => r1_hu(:,:,Kbb); r1_hu_n => r1_hu(:,:,Kmm); r1_hu_a => r1_hu(:,:,Kaa) 389 r1_hv_b => r1_hv(:,:,Kbb); r1_hv_n => r1_hv(:,:,Kmm); r1_hv_a => r1_hv(:,:,Kaa) 390 391 392 END SUBROUTINE update_pointers 393 345 ! 394 346 !!====================================================================== 395 347 END MODULE step
Note: See TracChangeset
for help on using the changeset viewer.