- Timestamp:
- 2020-10-22T20:49:56+02:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11842_SI3-10_EAP
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11842_SI3-10_EAP
- Property svn:externals
-
old new 1 ^/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 1 ^/utils/build/arch@12130 arch 2 ^/utils/build/makenemo@12191 makenemo 3 ^/utils/build/mk@11662 mk 4 ^/utils/tools_r4.0-HEAD@12672 tools 5 ^/vendors/AGRIF/dev@10586 ext/AGRIF 6 ^/vendors/FCM@10134 ext/FCM 7 ^/vendors/IOIPSL@9655 ext/IOIPSL 8 9 # SETTE mapping (inactive) 10 #^/utils/CI/sette@12135 sette
-
- Property svn:externals
-
NEMO/branches/2019/dev_r11842_SI3-10_EAP/tests/CANAL/MY_SRC/diawri.F90
r11536 r13662 46 46 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 47 47 USE in_out_manager ! I/O manager 48 USE diatmb ! Top,middle,bottom output49 48 USE dia25h ! 25h Mean output 50 49 USE iom ! … … 231 230 IF( iom_use('logavs') ) CALL iom_put( "logavs", LOG( MAX( 1.e-20_wp, avs(:,:,:) ) ) ) 232 231 233 IF ( iom_use("s algrad") .OR. iom_use("salgrad2") ) THEN232 IF ( iom_use("socegrad") .OR. iom_use("socegrad2") ) THEN 234 233 z3d(:,:,jpk) = 0. 235 234 DO jk = 1, jpkm1 … … 245 244 END DO 246 245 CALL lbc_lnk( 'diawri', z3d, 'T', 1. ) 247 CALL iom_put( "s algrad2", z3d ) ! square of module of sal gradient246 CALL iom_put( "socegrad2", z3d ) ! square of module of sal gradient 248 247 z3d(:,:,:) = SQRT( z3d(:,:,:) ) 249 CALL iom_put( "s algrad" , z3d ) ! module of sal gradient248 CALL iom_put( "socegrad" , z3d ) ! module of sal gradient 250 249 ENDIF 251 250 … … 300 299 END DO 301 300 END DO 302 CALL iom_put( "salt2c", rau0 * z2d ) ! vertically integrated s alt content (PSU*kg/m2)303 ENDIF 304 ! 305 IF ( iom_use("eken") ) THEN301 CALL iom_put( "salt2c", rau0 * z2d ) ! vertically integrated squared salt content (PSU*kg/m2) 302 ENDIF 303 ! 304 IF ( iom_use("eken") .OR. iom_use("eken_int") ) THEN 306 305 z3d(:,:,jpk) = 0._wp 307 306 DO jk = 1, jpkm1 308 DO jj = 2, jpj 309 DO ji = 2, jpi 307 DO jj = 2, jpjm1 308 DO ji = 2, jpim1 310 309 zztmpx = 0.5 * ( un(ji-1,jj ,jk) + un(ji,jj,jk) ) 311 310 zztmpy = 0.5 * ( vn(ji ,jj-1,jk) + vn(ji,jj,jk) ) … … 316 315 CALL lbc_lnk( 'diawri', z3d, 'T', 1. ) 317 316 CALL iom_put( "eken", z3d ) ! kinetic energy 318 ENDIF319 320 IF ( iom_use("ke") .or. iom_use("ke_zint") ) THEN321 !322 z3d(:,:,jpk) = 0._wp323 z3d(1,:, : ) = 0._wp324 z3d(:,1, : ) = 0._wp325 DO jk = 1, jpkm1326 DO jj = 2, jpj327 DO ji = 2, jpi328 z3d(ji,jj,jk) = 0.25_wp * ( un(ji ,jj,jk) * un(ji ,jj,jk) * e1e2u(ji ,jj) * e3u_n(ji ,jj,jk) &329 & + un(ji-1,jj,jk) * un(ji-1,jj,jk) * e1e2u(ji-1,jj) * e3u_n(ji-1,jj,jk) &330 & + vn(ji,jj ,jk) * vn(ji,jj ,jk) * e1e2v(ji,jj ) * e3v_n(ji,jj ,jk) &331 & + vn(ji,jj-1,jk) * vn(ji,jj-1,jk) * e1e2v(ji,jj-1) * e3v_n(ji,jj-1,jk) ) &332 & * r1_e1e2t(ji,jj) / e3t_n(ji,jj,jk) * tmask(ji,jj,jk)333 END DO334 END DO335 END DO336 337 CALL lbc_lnk( 'diawri', z3d, 'T', 1. )338 CALL iom_put( "ke", z3d ) ! kinetic energy339 317 340 318 z2d(:,:) = 0._wp … … 342 320 DO jj = 1, jpj 343 321 DO ji = 1, jpi 344 z2d(ji,jj) = z2d(ji,jj) + e3t_n(ji,jj,jk) * z3d(ji,jj,jk) * tmask(ji,jj,jk) 345 END DO 346 END DO 347 END DO 348 CALL iom_put( "ke_zint", z2d ) ! vertically integrated kinetic energy 349 322 z2d(ji,jj) = z2d(ji,jj) + e3t_n(ji,jj,jk) * z3d(ji,jj,jk) * e1e2t(ji,jj) * tmask(ji,jj,jk) 323 END DO 324 END DO 325 END DO 326 CALL iom_put( "eken_int", z2d ) ! vertically integrated kinetic energy 350 327 ENDIF 351 328 ! … … 359 336 DO ji = 1, fs_jpim1 ! vector opt. 360 337 z3d(ji,jj,jk) = ( e2v(ji+1,jj ) * vn(ji+1,jj ,jk) - e2v(ji,jj) * vn(ji,jj,jk) & 361 & 338 & - e1u(ji ,jj+1) * un(ji ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk) ) * r1_e1e2f(ji,jj) 362 339 END DO 363 340 END DO … … 492 469 CALL iom_put( "bn2", rn2 ) ! Brunt-Vaisala buoyancy frequency (N^2) 493 470 ! 494 495 IF (ln_diatmb) CALL dia_tmb ! tmb values496 471 497 472 IF (ln_dia25h) CALL dia_25h( kt ) ! 25h averaging
Note: See TracChangeset
for help on using the changeset viewer.