Changeset 12756
- Timestamp:
- 2020-04-16T15:34:34+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/tests/CANAL
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/tests/CANAL/EXPREF/file_def_nemo-oce.xml
r9572 r12756 15 15 <field field_ref="soce" /> 16 16 <field field_ref="ssh" /> 17 <field field_ref="s algrad" />18 <field field_ref=" ke_zint" />17 <field field_ref="socegrad" /> 18 <field field_ref="eken_int" /> 19 19 <field field_ref="relvor" /> 20 20 <field field_ref="potvor" /> -
NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/tests/CANAL/MY_SRC/diawri.F90
r12206 r12756 230 230 IF( iom_use('logavs') ) CALL iom_put( "logavs", LOG( MAX( 1.e-20_wp, avs(:,:,:) ) ) ) 231 231 232 IF ( iom_use("s algrad") .OR. iom_use("salgrad2") ) THEN232 IF ( iom_use("socegrad") .OR. iom_use("socegrad2") ) THEN 233 233 z3d(:,:,jpk) = 0. 234 234 DO jk = 1, jpkm1 … … 244 244 END DO 245 245 CALL lbc_lnk( 'diawri', z3d, 'T', 1. ) 246 CALL iom_put( "s algrad2", z3d ) ! square of module of sal gradient246 CALL iom_put( "socegrad2", z3d ) ! square of module of sal gradient 247 247 z3d(:,:,:) = SQRT( z3d(:,:,:) ) 248 CALL iom_put( "s algrad" , z3d ) ! module of sal gradient248 CALL iom_put( "socegrad" , z3d ) ! module of sal gradient 249 249 ENDIF 250 250 … … 299 299 END DO 300 300 END DO 301 CALL iom_put( "salt2c", rau0 * z2d ) ! vertically integrated s alt content (PSU*kg/m2)302 ENDIF 303 ! 304 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 305 305 z3d(:,:,jpk) = 0._wp 306 306 DO jk = 1, jpkm1 307 DO jj = 2, jpj 308 DO ji = 2, jpi 307 DO jj = 2, jpjm1 308 DO ji = 2, jpim1 309 309 zztmpx = 0.5 * ( un(ji-1,jj ,jk) + un(ji,jj,jk) ) 310 310 zztmpy = 0.5 * ( vn(ji ,jj-1,jk) + vn(ji,jj,jk) ) … … 315 315 CALL lbc_lnk( 'diawri', z3d, 'T', 1. ) 316 316 CALL iom_put( "eken", z3d ) ! kinetic energy 317 ENDIF318 319 IF ( iom_use("ke") .or. iom_use("ke_zint") ) THEN320 !321 z3d(:,:,jpk) = 0._wp322 z3d(1,:, : ) = 0._wp323 z3d(:,1, : ) = 0._wp324 DO jk = 1, jpkm1325 DO jj = 2, jpj326 DO ji = 2, jpi327 z3d(ji,jj,jk) = 0.25_wp * ( un(ji ,jj,jk) * un(ji ,jj,jk) * e1e2u(ji ,jj) * e3u_n(ji ,jj,jk) &328 & + un(ji-1,jj,jk) * un(ji-1,jj,jk) * e1e2u(ji-1,jj) * e3u_n(ji-1,jj,jk) &329 & + vn(ji,jj ,jk) * vn(ji,jj ,jk) * e1e2v(ji,jj ) * e3v_n(ji,jj ,jk) &330 & + vn(ji,jj-1,jk) * vn(ji,jj-1,jk) * e1e2v(ji,jj-1) * e3v_n(ji,jj-1,jk) ) &331 & * r1_e1e2t(ji,jj) / e3t_n(ji,jj,jk) * tmask(ji,jj,jk)332 END DO333 END DO334 END DO335 336 CALL lbc_lnk( 'diawri', z3d, 'T', 1. )337 CALL iom_put( "ke", z3d ) ! kinetic energy338 317 339 318 z2d(:,:) = 0._wp … … 341 320 DO jj = 1, jpj 342 321 DO ji = 1, jpi 343 z2d(ji,jj) = z2d(ji,jj) + e3t_n(ji,jj,jk) * z3d(ji,jj,jk) * tmask(ji,jj,jk) 344 END DO 345 END DO 346 END DO 347 CALL iom_put( "ke_zint", z2d ) ! vertically integrated kinetic energy 348 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 349 327 ENDIF 350 328 ! … … 358 336 DO ji = 1, fs_jpim1 ! vector opt. 359 337 z3d(ji,jj,jk) = ( e2v(ji+1,jj ) * vn(ji+1,jj ,jk) - e2v(ji,jj) * vn(ji,jj,jk) & 360 & 338 & - e1u(ji ,jj+1) * un(ji ,jj+1,jk) + e1u(ji,jj) * un(ji,jj,jk) ) * r1_e1e2f(ji,jj) 361 339 END DO 362 340 END DO
Note: See TracChangeset
for help on using the changeset viewer.