- Timestamp:
- 2020-09-29T12:41:06+02:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/OCE/SBC/sbcrnf.F90 (modified) (11 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 @HEADext/AGRIF5 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 8 9 9 # SETTE 10 ^/utils/CI/sette@ HEADsette10 ^/utils/CI/sette@13507 sette
-
- Property svn:externals
-
NEMO/branches/2020/r12377_ticket2386/src/OCE/SBC/sbcrnf.F90
r12511 r13540 72 72 !! * Substitutions 73 73 # include "do_loop_substitute.h90" 74 # include "domzgr_substitute.h90" 74 75 !!---------------------------------------------------------------------- 75 76 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 159 160 & iom_varid( numror, 'rnf_b', ldstop = .FALSE. ) > 0 ) THEN 160 161 IF(lwp) WRITE(numout,*) ' nit000-1 runoff forcing fields red in the restart file', lrxios 161 CALL iom_get( numror, jpdom_auto glo, 'rnf_b', rnf_b, ldxios = lrxios ) ! before runoff162 CALL iom_get( numror, jpdom_auto glo, 'rnf_hc_b', rnf_tsc_b(:,:,jp_tem), ldxios = lrxios ) ! before heat content of runoff163 CALL iom_get( numror, jpdom_auto glo, 'rnf_sc_b', rnf_tsc_b(:,:,jp_sal), ldxios = lrxios ) ! before salinity content of runoff162 CALL iom_get( numror, jpdom_auto, 'rnf_b', rnf_b, ldxios = lrxios ) ! before runoff 163 CALL iom_get( numror, jpdom_auto, 'rnf_hc_b', rnf_tsc_b(:,:,jp_tem), ldxios = lrxios ) ! before heat content of runoff 164 CALL iom_get( numror, jpdom_auto, 'rnf_sc_b', rnf_tsc_b(:,:,jp_sal), ldxios = lrxios ) ! before salinity content of runoff 164 165 ELSE !* no restart: set from nit000 values 165 166 IF(lwp) WRITE(numout,*) ' nit000-1 runoff forcing fields set to nit000' … … 208 209 IF( ln_rnf_depth .OR. ln_rnf_depth_ini ) THEN !== runoff distributed over several levels ==! 209 210 IF( ln_linssh ) THEN !* constant volume case : just apply the runoff input flow 210 DO_2D _11_11211 DO_2D( 1, 1, 1, 1 ) 211 212 DO jk = 1, nk_rnf(ji,jj) 212 213 phdivn(ji,jj,jk) = phdivn(ji,jj,jk) - ( rnf(ji,jj) + rnf_b(ji,jj) ) * zfact * r1_rho0 / h_rnf(ji,jj) … … 214 215 END_2D 215 216 ELSE !* variable volume case 216 DO_2D _11_11217 DO_2D( 1, 1, 1, 1 ) ! update the depth over which runoffs are distributed 217 218 h_rnf(ji,jj) = 0._wp 218 DO jk = 1, nk_rnf(ji,jj) ! recalculates h_rnf to be the depth in metres219 DO jk = 1, nk_rnf(ji,jj) ! recalculates h_rnf to be the depth in metres 219 220 h_rnf(ji,jj) = h_rnf(ji,jj) + e3t(ji,jj,jk,Kmm) ! to the bottom of the relevant grid box 220 221 END DO … … 353 354 rn_dep_file = TRIM( cn_dir )//TRIM( sn_dep_rnf%clname ) 354 355 IF( .NOT. sn_dep_rnf%ln_clim ) THEN ; WRITE(rn_dep_file, '(a,"_y",i4)' ) TRIM( rn_dep_file ), nyear ! add year 355 IF( sn_dep_rnf%cl type== 'monthly' ) WRITE(rn_dep_file, '(a,"m",i2)' ) TRIM( rn_dep_file ), nmonth ! add month356 ENDIF 357 CALL iom_open ( rn_dep_file, inum ) ! open file358 CALL iom_get ( inum, jpdom_ data, sn_dep_rnf%clvar, h_rnf ) ! read the river mouth array359 CALL iom_close( inum ) ! close file356 IF( sn_dep_rnf%clftyp == 'monthly' ) WRITE(rn_dep_file, '(a,"m",i2)' ) TRIM( rn_dep_file ), nmonth ! add month 357 ENDIF 358 CALL iom_open ( rn_dep_file, inum ) ! open file 359 CALL iom_get ( inum, jpdom_global, sn_dep_rnf%clvar, h_rnf ) ! read the river mouth array 360 CALL iom_close( inum ) ! close file 360 361 ! 361 362 nk_rnf(:,:) = 0 ! set the number of level over which river runoffs are applied 362 DO_2D _11_11363 DO_2D( 1, 1, 1, 1 ) 363 364 IF( h_rnf(ji,jj) > 0._wp ) THEN 364 365 jk = 2 … … 373 374 ENDIF 374 375 END_2D 375 DO_2D _11_11376 DO_2D( 1, 1, 1, 1 ) ! set the associated depth 376 377 h_rnf(ji,jj) = 0._wp 377 378 DO jk = 1, nk_rnf(ji,jj) … … 390 391 CALL iom_open( TRIM( sn_rnf%clname ), inum ) ! open runoff file 391 392 nbrec = iom_getszuld( inum ) 392 zrnfcl(:,:,1) = 0._wp ! init the max to 0. in 1393 zrnfcl(:,:,1) = 0._wp ! init the max to 0. in 1 393 394 DO jm = 1, nbrec 394 CALL iom_get( inum, jpdom_ data, TRIM( sn_rnf%clvar ), zrnfcl(:,:,2), jm ) ! read the value in 2395 zrnfcl(:,:,1) = MAXVAL( zrnfcl(:,:,:), DIM=3 ) ! store the maximum value in time in 1395 CALL iom_get( inum, jpdom_global, TRIM( sn_rnf%clvar ), zrnfcl(:,:,2), jm ) ! read the value in 2 396 zrnfcl(:,:,1) = MAXVAL( zrnfcl(:,:,:), DIM=3 ) ! store the maximum value in time in 1 396 397 END DO 397 398 CALL iom_close( inum ) … … 403 404 WHERE( zrnfcl(:,:,1) > 0._wp ) h_rnf(:,:) = zacoef * zrnfcl(:,:,1) ! compute depth for all runoffs 404 405 ! 405 DO_2D _11_11406 DO_2D( 1, 1, 1, 1 ) ! take in account min depth of ocean rn_hmin 406 407 IF( zrnfcl(ji,jj,1) > 0._wp ) THEN 407 408 jk = mbkt(ji,jj) … … 411 412 ! 412 413 nk_rnf(:,:) = 0 ! number of levels on which runoffs are distributed 413 DO_2D _11_11414 DO_2D( 1, 1, 1, 1 ) 414 415 IF( zrnfcl(ji,jj,1) > 0._wp ) THEN 415 416 jk = 2 … … 422 423 END_2D 423 424 ! 424 DO_2D _11_11425 DO_2D( 1, 1, 1, 1 ) ! set the associated depth 425 426 h_rnf(ji,jj) = 0._wp 426 427 DO jk = 1, nk_rnf(ji,jj) … … 518 519 cl_rnfile = TRIM( cn_dir )//TRIM( sn_cnf%clname ) 519 520 IF( .NOT. sn_cnf%ln_clim ) THEN ; WRITE(cl_rnfile, '(a,"_y",i4)' ) TRIM( cl_rnfile ), nyear ! add year 520 IF( sn_cnf%cl type== 'monthly' ) WRITE(cl_rnfile, '(a,"m",i2)' ) TRIM( cl_rnfile ), nmonth ! add month521 IF( sn_cnf%clftyp == 'monthly' ) WRITE(cl_rnfile, '(a,"m",i2)' ) TRIM( cl_rnfile ), nmonth ! add month 521 522 ENDIF 522 523 ! 523 524 ! horizontal mask (read in NetCDF file) 524 CALL iom_open ( cl_rnfile, inum ) ! open file525 CALL iom_get ( inum, jpdom_ data, sn_cnf%clvar, rnfmsk ) ! read the river mouth array526 CALL iom_close( inum ) ! close file525 CALL iom_open ( cl_rnfile, inum ) ! open file 526 CALL iom_get ( inum, jpdom_global, sn_cnf%clvar, rnfmsk ) ! read the river mouth array 527 CALL iom_close( inum ) ! close file 527 528 ! 528 529 IF( l_clo_rnf ) CALL clo_rnf( rnfmsk ) ! closed sea inflow set as river mouth
Note: See TracChangeset
for help on using the changeset viewer.
