- Timestamp:
- 2020-03-05T12:21:05+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r12377_ticket2386
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev _r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD ext/AGRIF5 ^/vendors/AGRIF/dev@HEAD ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 9 # SETTE 10 ^/utils/CI/sette@HEAD sette
-
- Property svn:externals
-
NEMO/branches/2020/r12377_ticket2386/tests/CANAL/MY_SRC/diawri.F90
r12377 r12511 169 169 170 170 IF ( iom_use("taubot") ) THEN ! bottom stress 171 zztmp = r au0 * 0.25171 zztmp = rho0 * 0.25 172 172 z2d(:,:) = 0._wp 173 173 DO jj = 2, jpjm1 … … 212 212 IF( iom_use('w_masstr') .OR. iom_use('w_masstr2') ) THEN ! vertical mass transport & its square value 213 213 ! Caution: in the VVL case, it only correponds to the baroclinic mass transport. 214 z2d(:,:) = r au0 * e1e2t(:,:)214 z2d(:,:) = rho0 * e1e2t(:,:) 215 215 DO jk = 1, jpk 216 216 z3d(:,:,jk) = ww(:,:,jk) * z2d(:,:) … … 272 272 END DO 273 273 END DO 274 CALL iom_put( "heatc", r au0_rcp * z2d ) ! vertically integrated heat content (J/m2)274 CALL iom_put( "heatc", rho0_rcp * z2d ) ! vertically integrated heat content (J/m2) 275 275 ENDIF 276 276 … … 284 284 END DO 285 285 END DO 286 CALL iom_put( "saltc", r au0 * z2d ) ! vertically integrated salt content (PSU*kg/m2)286 CALL iom_put( "saltc", rho0 * z2d ) ! vertically integrated salt content (PSU*kg/m2) 287 287 ENDIF 288 288 ! … … 296 296 END DO 297 297 END DO 298 CALL iom_put( "salt2c", r au0 * z2d ) ! vertically integrated salt content (PSU*kg/m2)298 CALL iom_put( "salt2c", rho0 * z2d ) ! vertically integrated salt content (PSU*kg/m2) 299 299 ENDIF 300 300 ! … … 395 395 z2d(:,:) = 0.e0 396 396 DO jk = 1, jpkm1 397 z3d(:,:,jk) = r au0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk)397 z3d(:,:,jk) = rho0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk) 398 398 z2d(:,:) = z2d(:,:) + z3d(:,:,jk) 399 399 END DO … … 432 432 z3d(:,:,jpk) = 0.e0 433 433 DO jk = 1, jpkm1 434 z3d(:,:,jk) = r au0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk)434 z3d(:,:,jk) = rho0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk) 435 435 END DO 436 436 CALL iom_put( "v_masstr", z3d ) ! mass transport in j-direction … … 473 473 END DO 474 474 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 475 CALL iom_put( "tosmint", r au0 * z2d ) ! Vertical integral of temperature475 CALL iom_put( "tosmint", rho0 * z2d ) ! Vertical integral of temperature 476 476 ENDIF 477 477 IF( iom_use("somint") ) THEN … … 485 485 END DO 486 486 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 487 CALL iom_put( "somint", r au0 * z2d ) ! Vertical integral of salinity487 CALL iom_put( "somint", rho0 * z2d ) ! Vertical integral of salinity 488 488 ENDIF 489 489 … … 563 563 clop = "x" ! no use of the mask value (require less cpu time and otherwise the model crashes) 564 564 #if defined key_diainstant 565 zsto = nn_write * r dt565 zsto = nn_write * rn_Dt 566 566 clop = "inst("//TRIM(clop)//")" 567 567 #else 568 zsto=r dt568 zsto=rn_Dt 569 569 clop = "ave("//TRIM(clop)//")" 570 570 #endif 571 zout = nn_write * r dt572 zmax = ( nitend - nit000 + 1 ) * r dt571 zout = nn_write * rn_Dt 572 zmax = ( nitend - nit000 + 1 ) * rn_Dt 573 573 574 574 ! Define indices of the horizontal output zoom and vertical limit storage … … 590 590 591 591 ! Compute julian date from starting date of the run 592 CALL ymds2ju( nyear, nmonth, nday, r dt, zjulian )592 CALL ymds2ju( nyear, nmonth, nday, rn_Dt, zjulian ) 593 593 zjulian = zjulian - adatrj ! set calendar origin to the beginning of the experiment 594 594 IF(lwp)WRITE(numout,*) … … 612 612 CALL histbeg( clhstnam, jpi, glamt, jpj, gphit, & ! Horizontal grid: glamt and gphit 613 613 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 614 & nit000-1, zjulian, r dt, nh_T, nid_T, domain_id=nidom, snc4chunks=snc4set )614 & nit000-1, zjulian, rn_Dt, nh_T, nid_T, domain_id=nidom, snc4chunks=snc4set ) 615 615 CALL histvert( nid_T, "deptht", "Vertical T levels", & ! Vertical grid: gdept 616 616 & "m", ipk, gdept_1d, nz_T, "down" ) … … 648 648 CALL histbeg( clhstnam, jpi, glamu, jpj, gphiu, & ! Horizontal grid: glamu and gphiu 649 649 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 650 & nit000-1, zjulian, r dt, nh_U, nid_U, domain_id=nidom, snc4chunks=snc4set )650 & nit000-1, zjulian, rn_Dt, nh_U, nid_U, domain_id=nidom, snc4chunks=snc4set ) 651 651 CALL histvert( nid_U, "depthu", "Vertical U levels", & ! Vertical grid: gdept 652 652 & "m", ipk, gdept_1d, nz_U, "down" ) … … 661 661 CALL histbeg( clhstnam, jpi, glamv, jpj, gphiv, & ! Horizontal grid: glamv and gphiv 662 662 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 663 & nit000-1, zjulian, r dt, nh_V, nid_V, domain_id=nidom, snc4chunks=snc4set )663 & nit000-1, zjulian, rn_Dt, nh_V, nid_V, domain_id=nidom, snc4chunks=snc4set ) 664 664 CALL histvert( nid_V, "depthv", "Vertical V levels", & ! Vertical grid : gdept 665 665 & "m", ipk, gdept_1d, nz_V, "down" ) … … 674 674 CALL histbeg( clhstnam, jpi, glamt, jpj, gphit, & ! Horizontal grid: glamt and gphit 675 675 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 676 & nit000-1, zjulian, r dt, nh_W, nid_W, domain_id=nidom, snc4chunks=snc4set )676 & nit000-1, zjulian, rn_Dt, nh_W, nid_W, domain_id=nidom, snc4chunks=snc4set ) 677 677 CALL histvert( nid_W, "depthw", "Vertical W levels", & ! Vertical grid: gdepw 678 678 & "m", ipk, gdepw_1d, nz_W, "down" )
Note: See TracChangeset
for help on using the changeset viewer.