Changeset 14822 for NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/SWE/stprk3.F90
- Timestamp:
- 2021-05-10T13:32:16+02:00 (3 years ago)
- Location:
- NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining
- Property svn:externals
-
old new 1 ^/utils/build/arch@ 14122arch2 ^/utils/build/makenemo@ 14122makenemo3 ^/utils/build/mk@ 14122mk4 ^/utils/tools@ 14122tools5 ^/vendors/AGRIF/dev@ 14122ext/AGRIF6 ^/vendors/FCM@ 14122ext/FCM7 ^/vendors/IOIPSL@ 14122ext/IOIPSL8 ^/vendors/PPR@ 14122ext/PPR1 ^/utils/build/arch@HEAD arch 2 ^/utils/build/makenemo@HEAD makenemo 3 ^/utils/build/mk@HEAD mk 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev@HEAD ext/AGRIF 6 ^/vendors/FCM@HEAD ext/FCM 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 ^/vendors/PPR@HEAD ext/PPR 9 9 10 10 # SETTE 11 ^/utils/CI/sette _wave@13990sette11 ^/utils/CI/sette@14244 sette
-
- Property svn:externals
-
NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/SWE/stprk3.F90
r14053 r14822 129 129 CALL dyn_ldf( kstp, Nbb, Nbb, uu, vv, Nrhs ) ! lateral mixing 130 130 #endif 131 !!st !132 !!st DO_3D( 0,0, 0,0, 1,jpkm1 )133 !!st ! ! horizontal pressure gradient134 !!st uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) - grav * ( ssh(ji+1,jj,Nbb) - ssh(ji,jj,Nbb) ) * r1_e1u(ji,jj)135 !!st vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) - grav * ( ssh(ji,jj+1,Nbb) - ssh(ji,jj,Nbb) ) * r1_e2v(ji,jj)136 !!st END_3D137 !!st !138 !!st #if defined key_RK3all139 !!st ! ! wind stress and layer friction140 !!st z5_6 = 5._wp/6._wp141 !!st DO_3D( 0, 0, 0, 0,1,jpkm1)142 !!st uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) + r1_rho0 * ( z5_6*utau_b(ji,jj) + (1._wp - z5_6)*utau(ji,jj) ) / e3u(ji,jj,jk,Nbb) &143 !!st & - rn_rfr * uu(ji,jj,jk,Nbb)144 !!st vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) + r1_rho0 * ( z5_6*vtau_b(ji,jj) + (1._wp - z5_6)*vtau(ji,jj) ) / e3v(ji,jj,jk,Nbb) &145 !!st & - rn_rfr * vv(ji,jj,jk,Nbb)146 !!st END_3D147 !!st #endif148 !!st why not ?149 131 z5_6 = 5._wp/6._wp 150 132 DO_3D( 0, 0, 0, 0, 1, jpkm1 ) … … 163 145 vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) + zrhs_v 164 146 END_3D 165 !!st end166 147 ! 167 148 ! !== Time stepping of ssh Eq. ==! (and update r3_Naa) … … 190 171 ENDIF 191 172 ! 192 CALL lbc_lnk _multi( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. )173 CALL lbc_lnk( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. ) 193 174 ! 194 175 ! !== Swap time levels ==! … … 229 210 vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) + zrhs_v 230 211 END_3D 231 !!st !232 !!st DO_3D( 0, 0, 0, 0, 1, jpkm1 )233 !!st ! ! horizontal pressure gradient234 !!st uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) - grav * ( ssh(ji+1,jj,Nnn) - ssh(ji,jj,Nnn) ) * r1_e1u(ji,jj)235 !!st vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) - grav * ( ssh(ji,jj+1,Nnn) - ssh(ji,jj,Nnn) ) * r1_e2v(ji,jj)236 !!st END_3D237 !!st !238 !!st #if defined key_RK3all239 !!st ! ! wind stress and layer friction240 !!st z3_4 = 3._wp/4._wp241 !!st DO_3D( 0, 0, 0, 0,1,jpkm1)242 !!st uu(ji,jj,jk,Nrhs) = uu(ji,jj,jk,Nrhs) + r1_rho0 * ( z3_4*utau_b(ji,jj) + (1._wp - z3_4)*utau(ji,jj) ) / e3u(ji,jj,jk,Nbb) &243 !!st & - rn_rfr * uu(ji,jj,jk,Nbb)244 !!st vv(ji,jj,jk,Nrhs) = vv(ji,jj,jk,Nrhs) + r1_rho0 * ( z3_4*vtau_b(ji,jj) + (1._wp - z3_4)*vtau(ji,jj) ) / e3v(ji,jj,jk,Nbb) &245 !!st & - rn_rfr * vv(ji,jj,jk,Nbb)246 !!st END_3D247 !!st #endif248 212 ! 249 213 ! !== Time stepping of ssh Eq. ==! (and update r3_Naa) … … 272 236 ENDIF 273 237 ! 274 CALL lbc_lnk _multi( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. )238 CALL lbc_lnk( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. ) 275 239 ! 276 240 ! !== Swap time levels ==! … … 335 299 ENDIF 336 300 ! 337 CALL lbc_lnk _multi( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. )301 CALL lbc_lnk( 'stp_RK3', uu(:,:,:,Naa), 'U', -1., vv(:,:,:,Naa), 'V', -1. ) 338 302 ! 339 303 ! !== Swap time levels ==! … … 344 308 345 309 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 346 ! diagnostics and outputs 310 ! diagnostics and outputs at Nbb (i.e. the just computed time step) 347 311 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 348 312 349 IF( ln_diacfl ) CALL dia_cfl ( kstp, Nnn) ! Courant number diagnostics350 CALL dia_wri ( kstp, Nnn) ! ocean model: outputs351 ! 352 IF( lrst_oce ) CALL rst_write ( kstp, Nbb, N nn) ! write output ocean restart file313 IF( ln_diacfl ) CALL dia_cfl ( kstp, Nbb ) ! Courant number diagnostics 314 CALL dia_wri ( kstp, Nbb ) ! ocean model: outputs 315 ! 316 IF( lrst_oce ) CALL rst_write ( kstp, Nbb, Nbb ) ! write output ocean restart file 353 317 354 318 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 355 319 ! Control 356 320 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 357 CALL stp_ctl ( kstp , Nnn)321 CALL stp_ctl ( kstp , Nbb ) 358 322 359 323 IF( kstp == nit000 ) THEN ! 1st time step only … … 364 328 365 329 ! 366 #if defined key_ iomput330 #if defined key_xios 367 331 IF( kstp == nitend .OR. indic < 0 ) THEN 368 332 CALL iom_context_finalize( cxios_context )
Note: See TracChangeset
for help on using the changeset viewer.