- Timestamp:
- 2020-03-05T12:21:05+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/OCE/DIA/diawri.F90 (modified) (16 diffs)
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/src/OCE/DIA/diawri.F90
r12377 r12511 173 173 174 174 IF ( iom_use("taubot") ) THEN ! bottom stress 175 zztmp = r au0 * 0.25175 zztmp = rho0 * 0.25 176 176 z2d(:,:) = 0._wp 177 177 DO_2D_00_00 … … 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(:,:) … … 249 249 z2d(ji,jj) = z2d(ji,jj) + e3t(ji,jj,jk,Kmm) * ts(ji,jj,jk,jp_tem,Kmm) * tmask(ji,jj,jk) 250 250 END_3D 251 CALL iom_put( "heatc", r au0_rcp * z2d ) ! vertically integrated heat content (J/m2)251 CALL iom_put( "heatc", rho0_rcp * z2d ) ! vertically integrated heat content (J/m2) 252 252 ENDIF 253 253 … … 257 257 z2d(ji,jj) = z2d(ji,jj) + e3t(ji,jj,jk,Kmm) * ts(ji,jj,jk,jp_sal,Kmm) * tmask(ji,jj,jk) 258 258 END_3D 259 CALL iom_put( "saltc", r au0 * z2d ) ! vertically integrated salt content (PSU*kg/m2)259 CALL iom_put( "saltc", rho0 * z2d ) ! vertically integrated salt content (PSU*kg/m2) 260 260 ENDIF 261 261 ! … … 279 279 z2d(:,:) = 0.e0 280 280 DO jk = 1, jpkm1 281 z3d(:,:,jk) = r au0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk)281 z3d(:,:,jk) = rho0 * uu(:,:,jk,Kmm) * e2u(:,:) * e3u(:,:,jk,Kmm) * umask(:,:,jk) 282 282 z2d(:,:) = z2d(:,:) + z3d(:,:,jk) 283 283 END DO … … 308 308 z3d(:,:,jpk) = 0.e0 309 309 DO jk = 1, jpkm1 310 z3d(:,:,jk) = r au0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk)310 z3d(:,:,jk) = rho0 * vv(:,:,jk,Kmm) * e1v(:,:) * e3v(:,:,jk,Kmm) * vmask(:,:,jk) 311 311 END DO 312 312 CALL iom_put( "v_masstr", z3d ) ! mass transport in j-direction … … 337 337 END_3D 338 338 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 339 CALL iom_put( "tosmint", r au0 * z2d ) ! Vertical integral of temperature339 CALL iom_put( "tosmint", rho0 * z2d ) ! Vertical integral of temperature 340 340 ENDIF 341 341 IF( iom_use("somint") ) THEN … … 345 345 END_3D 346 346 CALL lbc_lnk( 'diawri', z2d, 'T', -1. ) 347 CALL iom_put( "somint", r au0 * z2d ) ! Vertical integral of salinity347 CALL iom_put( "somint", rho0 * z2d ) ! Vertical integral of salinity 348 348 ENDIF 349 349 … … 366 366 INTEGER, DIMENSION(2) :: ierr 367 367 !!---------------------------------------------------------------------- 368 ierr = 0 369 ALLOCATE( ndex_hT(jpi*jpj) , ndex_T(jpi*jpj*jpk) , & 370 & ndex_hU(jpi*jpj) , ndex_U(jpi*jpj*jpk) , & 371 & ndex_hV(jpi*jpj) , ndex_V(jpi*jpj*jpk) , STAT=ierr(1) ) 368 IF( nn_write == -1 ) THEN 369 dia_wri_alloc = 0 370 ELSE 371 ierr = 0 372 ALLOCATE( ndex_hT(jpi*jpj) , ndex_T(jpi*jpj*jpk) , & 373 & ndex_hU(jpi*jpj) , ndex_U(jpi*jpj*jpk) , & 374 & ndex_hV(jpi*jpj) , ndex_V(jpi*jpj*jpk) , STAT=ierr(1) ) 372 375 ! 373 dia_wri_alloc = MAXVAL(ierr) 374 CALL mpp_sum( 'diawri', dia_wri_alloc ) 376 dia_wri_alloc = MAXVAL(ierr) 377 CALL mpp_sum( 'diawri', dia_wri_alloc ) 378 ! 379 ENDIF 375 380 ! 376 381 END FUNCTION dia_wri_alloc … … 432 437 clop = "x" ! no use of the mask value (require less cpu time and otherwise the model crashes) 433 438 #if defined key_diainstant 434 zsto = nn_write * r dt439 zsto = nn_write * rn_Dt 435 440 clop = "inst("//TRIM(clop)//")" 436 441 #else 437 zsto=r dt442 zsto=rn_Dt 438 443 clop = "ave("//TRIM(clop)//")" 439 444 #endif 440 zout = nn_write * r dt441 zmax = ( nitend - nit000 + 1 ) * r dt445 zout = nn_write * rn_Dt 446 zmax = ( nitend - nit000 + 1 ) * rn_Dt 442 447 443 448 ! Define indices of the horizontal output zoom and vertical limit storage … … 460 465 461 466 ! Compute julian date from starting date of the run 462 CALL ymds2ju( nyear, nmonth, nday, r dt, zjulian )467 CALL ymds2ju( nyear, nmonth, nday, rn_Dt, zjulian ) 463 468 zjulian = zjulian - adatrj ! set calendar origin to the beginning of the experiment 464 469 IF(lwp)WRITE(numout,*) … … 482 487 CALL histbeg( clhstnam, jpi, glamt, jpj, gphit, & ! Horizontal grid: glamt and gphit 483 488 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 484 & nit000-1, zjulian, r dt, nh_T, nid_T, domain_id=nidom, snc4chunks=snc4set )489 & nit000-1, zjulian, rn_Dt, nh_T, nid_T, domain_id=nidom, snc4chunks=snc4set ) 485 490 CALL histvert( nid_T, "deptht", "Vertical T levels", & ! Vertical grid: gdept 486 491 & "m", ipk, gdept_1d, nz_T, "down" ) … … 518 523 CALL histbeg( clhstnam, jpi, glamu, jpj, gphiu, & ! Horizontal grid: glamu and gphiu 519 524 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 520 & nit000-1, zjulian, r dt, nh_U, nid_U, domain_id=nidom, snc4chunks=snc4set )525 & nit000-1, zjulian, rn_Dt, nh_U, nid_U, domain_id=nidom, snc4chunks=snc4set ) 521 526 CALL histvert( nid_U, "depthu", "Vertical U levels", & ! Vertical grid: gdept 522 527 & "m", ipk, gdept_1d, nz_U, "down" ) … … 531 536 CALL histbeg( clhstnam, jpi, glamv, jpj, gphiv, & ! Horizontal grid: glamv and gphiv 532 537 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 533 & nit000-1, zjulian, r dt, nh_V, nid_V, domain_id=nidom, snc4chunks=snc4set )538 & nit000-1, zjulian, rn_Dt, nh_V, nid_V, domain_id=nidom, snc4chunks=snc4set ) 534 539 CALL histvert( nid_V, "depthv", "Vertical V levels", & ! Vertical grid : gdept 535 540 & "m", ipk, gdept_1d, nz_V, "down" ) … … 544 549 CALL histbeg( clhstnam, jpi, glamt, jpj, gphit, & ! Horizontal grid: glamt and gphit 545 550 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 546 & nit000-1, zjulian, r dt, nh_W, nid_W, domain_id=nidom, snc4chunks=snc4set )551 & nit000-1, zjulian, rn_Dt, nh_W, nid_W, domain_id=nidom, snc4chunks=snc4set ) 547 552 CALL histvert( nid_W, "depthw", "Vertical W levels", & ! Vertical grid: gdepw 548 553 & "m", ipk, gdepw_1d, nz_W, "down" ) … … 554 559 CALL histbeg( clhstnam, jpi, glamt, jpj, gphit, & ! Horizontal grid: glamt and gphit 555 560 & iimi, iima-iimi+1, ijmi, ijma-ijmi+1, & 556 & nit000-1, zjulian, r dt, nh_A, nid_A, domain_id=nidom, snc4chunks=snc4set )561 & nit000-1, zjulian, rn_Dt, nh_A, nid_A, domain_id=nidom, snc4chunks=snc4set ) 557 562 CALL histvert( nid_A, "ght_abl", "Vertical T levels", & ! Vertical grid: gdept 558 563 & "m", ipka, ght_abl(2:jpka), nz_A, "up" )
Note: See TracChangeset
for help on using the changeset viewer.
