Changeset 9124 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA
- Timestamp:
- 2017-12-19T09:26:25+01:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_cen.F90
r9094 r9124 23 23 USE trc_oce ! share passive tracers/Ocean variables 24 24 USE lib_mpp ! MPP library 25 USE timing ! Timing26 25 27 26 IMPLICIT NONE … … 81 80 !!---------------------------------------------------------------------- 82 81 ! 83 IF( ln_timing ) CALL timing_start('tra_adv_cen')84 !85 82 IF( kt == kit000 ) THEN 86 83 IF(lwp) WRITE(numout,*) … … 205 202 END DO 206 203 ! 207 IF( ln_timing ) CALL timing_stop('tra_adv_cen')208 !209 204 END SUBROUTINE tra_adv_cen 210 205 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_fct.F90
r9094 r9124 27 27 USE lbclnk ! ocean lateral boundary condition (or mpp link) 28 28 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined) 29 USE timing ! Timing30 29 31 30 IMPLICIT NONE … … 88 87 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: ztrdx, ztrdy, ztrdz, zptry 89 88 !!---------------------------------------------------------------------- 90 !91 IF( ln_timing ) CALL timing_start('tra_adv_fct')92 89 ! 93 90 IF( kt == kit000 ) THEN … … 324 321 END DO ! end of tracer loop 325 322 ! 326 IF( ln_timing ) CALL timing_stop('tra_adv_fct')327 !328 323 END SUBROUTINE tra_adv_fct 329 324 … … 353 348 !!---------------------------------------------------------------------- 354 349 ! 355 IF( ln_timing ) CALL timing_start('nonosc')356 !357 350 zbig = 1.e+40_wp 358 351 zrtrn = 1.e-15_wp … … 428 421 END DO 429 422 CALL lbc_lnk_multi( paa, 'U', -1. , pbb, 'V', -1. ) ! lateral boundary condition (changed sign) 430 !431 IF( ln_timing ) CALL timing_stop('nonosc')432 423 ! 433 424 END SUBROUTINE nonosc -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mle.F90
r9094 r9124 16 16 USE zdfmxl ! mixed layer depth 17 17 ! 18 USE lbclnk ! lateral boundary condition / mpp link19 18 USE in_out_manager ! I/O manager 20 19 USE iom ! IOM library 21 20 USE lib_mpp ! MPP library 22 USE timing ! Timing21 USE lbclnk ! lateral boundary condition / mpp link 23 22 24 23 IMPLICIT NONE … … 95 94 !!---------------------------------------------------------------------- 96 95 ! 97 IF( ln_timing ) CALL timing_start('tra_adv_mle')98 !99 96 ! !== MLD used for MLE ==! 100 97 ! ! compute from the 10m density to deal with the diurnal cycle … … 248 245 CALL iom_put( "psiv_mle", zpsi_vw ) ! j-mle streamfunction 249 246 ENDIF 250 !251 IF( ln_timing ) CALL timing_stop('tra_adv_mle')252 247 ! 253 248 END SUBROUTINE tra_adv_mle -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_mus.F90
r9094 r9124 27 27 ! 28 28 USE iom ! XIOS library 29 USE timing ! Timing30 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)31 29 USE in_out_manager ! I/O manager 32 30 USE lib_mpp ! distribued memory computing 33 31 USE lbclnk ! ocean lateral boundary condition (or mpp link) 32 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined) 34 33 35 34 IMPLICIT NONE … … 91 90 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zwy, zslpy ! - - 92 91 !!---------------------------------------------------------------------- 93 !94 IF( ln_timing ) CALL timing_start('tra_adv_mus')95 92 ! 96 93 IF( kt == kit000 ) THEN … … 275 272 END DO ! end of tracer loop 276 273 ! 277 IF( ln_timing ) CALL timing_stop('tra_adv_mus')278 !279 274 END SUBROUTINE tra_adv_mus 280 275 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_qck.F90
r9094 r9124 22 22 USE diaptr ! poleward transport diagnostics 23 23 ! 24 USE in_out_manager ! I/O manager 24 25 USE lib_mpp ! distribued memory computing 25 26 USE lbclnk ! ocean lateral boundary condition (or mpp link) 26 USE in_out_manager ! I/O manager27 USE timing ! Timing28 27 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined) 29 28 … … 95 94 !!---------------------------------------------------------------------- 96 95 ! 97 IF( ln_timing ) CALL timing_start('tra_adv_qck')98 !99 96 IF( kt == kit000 ) THEN 100 97 IF(lwp) WRITE(numout,*) … … 116 113 ! ! vertical fluxes are computed with the 2nd order centered scheme 117 114 CALL tra_adv_cen2_k( kt, cdtype, pwn, ptn, pta, kjpt ) 118 !119 IF( ln_timing ) CALL timing_stop('tra_adv_qck')120 115 ! 121 116 END SUBROUTINE tra_adv_qck … … 427 422 REAL(wp) :: zc, zcurv, zfho ! - - 428 423 !---------------------------------------------------------------------- 429 !430 IF( ln_timing ) CALL timing_start('quickest')431 424 ! 432 425 DO jk = 1, jpkm1 … … 460 453 END DO 461 454 ! 462 IF( ln_timing ) CALL timing_stop('quickest')463 !464 455 END SUBROUTINE quickest 465 456 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_ubs.F90
r9019 r9124 22 22 ! 23 23 USE iom ! I/O library 24 USE in_out_manager ! I/O manager 24 25 USE lib_mpp ! massively parallel library 25 26 USE lbclnk ! ocean lateral boundary condition (or mpp link) 26 USE in_out_manager ! I/O manager27 USE timing ! Timing28 27 USE lib_fortran ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined) 29 28 … … 102 101 !!---------------------------------------------------------------------- 103 102 ! 104 IF( ln_timing ) CALL timing_start('tra_adv_ubs')105 !106 103 IF( kt == kit000 ) THEN 107 104 IF(lwp) WRITE(numout,*) … … 281 278 END DO 282 279 ! 283 IF( ln_timing ) CALL timing_stop('tra_adv_ubs')284 !285 280 END SUBROUTINE tra_adv_ubs 286 281 … … 310 305 !!---------------------------------------------------------------------- 311 306 ! 312 IF( ln_timing ) CALL timing_start('nonosc_z')313 !314 307 zbig = 1.e+40_wp 315 308 zrtrn = 1.e-15_wp … … 379 372 END DO 380 373 ! 381 IF( ln_timing ) CALL timing_stop('nonosc_z')382 !383 374 END SUBROUTINE nonosc_z 384 375 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trabbl.F90
r9099 r9124 42 42 43 43 PUBLIC tra_bbl ! routine called by step.F90 44 PUBLIC tra_bbl_init ! routine called by opa.F9044 PUBLIC tra_bbl_init ! routine called by nemogcm.F90 45 45 PUBLIC tra_bbl_dif ! routine called by trcbbl.F90 46 PUBLIC tra_bbl_adv ! - - --46 PUBLIC tra_bbl_adv ! - - - 47 47 PUBLIC bbl ! routine called by trcbbl.F90 and dtadyn.F90 48 48 … … 185 185 REAL(wp), DIMENSION(jpi,jpj) :: zptb ! workspace 186 186 !!---------------------------------------------------------------------- 187 !188 IF( ln_timing ) CALL timing_start('tra_bbl_dif')189 187 ! 190 188 DO jn = 1, kjpt ! tracer loop … … 211 209 END DO ! end tracer 212 210 ! ! =========== 213 !214 IF( ln_timing ) CALL timing_stop('tra_bbl_dif')215 !216 211 END SUBROUTINE tra_bbl_dif 217 212 … … 243 238 !!---------------------------------------------------------------------- 244 239 ! 245 IF( ln_timing ) CALL timing_start( 'tra_bbl_adv')246 240 ! ! =========== 247 241 DO jn = 1, kjpt ! tracer loop … … 298 292 END DO ! end tracer 299 293 ! ! =========== 300 !301 IF( ln_timing ) CALL timing_stop( 'tra_bbl_adv')302 !303 294 END SUBROUTINE tra_bbl_adv 304 295 … … 343 334 REAL(wp), DIMENSION(jpi,jpj) :: zub, zvb, zdep ! 2D workspace 344 335 !!---------------------------------------------------------------------- 345 !346 IF( ln_timing ) CALL timing_start( 'bbl')347 336 ! 348 337 IF( kt == kit000 ) THEN … … 475 464 ENDIF 476 465 ! 477 IF( ln_timing ) CALL timing_stop( 'bbl')478 !479 466 END SUBROUTINE bbl 480 467 … … 495 482 NAMELIST/nambbl/ ln_trabbl, nn_bbl_ldf, nn_bbl_adv, rn_ahtbbl, rn_gambbl 496 483 !!---------------------------------------------------------------------- 497 !498 IF( ln_timing ) CALL timing_start( 'tra_bbl_init')499 484 ! 500 485 REWIND( numnam_ref ) ! Namelist nambbl in reference namelist : Bottom boundary layer scheme … … 569 554 ahv_bbl_0(:,:) = rn_ahtbbl * e1_e2v(:,:) * e3v_bbl_0(:,:) * vmask(:,:,1) 570 555 ! 571 IF( ln_timing ) CALL timing_stop( 'tra_bbl_init')572 !573 556 END SUBROUTINE tra_bbl_init 574 557 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso.F90
r9019 r9124 30 30 USE phycst ! physical constants 31 31 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 32 USE timing ! Timing33 32 34 33 IMPLICIT NONE … … 113 112 REAL(wp), DIMENSION(jpi,jpj,jpk) :: zdit, zdjt, zftu, zftv, ztfw 114 113 !!---------------------------------------------------------------------- 115 !116 IF( ln_timing ) CALL timing_start('tra_ldf_iso')117 114 ! 118 115 IF( kt == kit000 ) THEN … … 383 380 END DO ! end tracer loop 384 381 ! 385 IF( ln_timing ) CALL timing_stop('tra_ldf_iso')386 !387 382 END SUBROUTINE tra_ldf_iso 388 383 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap_blp.F90
r9094 r9124 89 89 !!---------------------------------------------------------------------- 90 90 ! 91 IF( ln_timing ) CALL timing_start('tra_ldf_lap')92 !93 91 IF( kt == nit000 .AND. lwp ) THEN 94 92 WRITE(numout,*) … … 165 163 END DO ! end of tracer loop 166 164 ! ! ================== 167 !168 IF( ln_timing ) CALL timing_stop('tra_ldf_lap')169 165 ! 170 166 END SUBROUTINE tra_ldf_lap … … 203 199 !!--------------------------------------------------------------------- 204 200 ! 205 IF( ln_timing ) CALL timing_start('tra_ldf_blp')206 !207 201 IF( kt == kit000 .AND. lwp ) THEN 208 202 WRITE(numout,*) … … 243 237 END SELECT 244 238 ! 245 IF( ln_timing ) CALL timing_stop('tra_ldf_blp')246 !247 239 END SUBROUTINE tra_ldf_blp 248 240 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_triad.F90
r9019 r9124 27 27 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 28 28 USE lib_mpp ! MPP library 29 USE timing ! Timing30 29 31 30 IMPLICIT NONE … … 97 96 !!---------------------------------------------------------------------- 98 97 ! 99 IF( ln_timing ) CALL timing_start('tra_ldf_triad')100 !101 98 IF( .NOT.ALLOCATED(zdkt3d) ) THEN 102 99 ALLOCATE( zdkt3d(jpi,jpj,0:1) , STAT=ierr ) … … 430 427 END DO ! end tracer loop 431 428 ! ! =============== 432 IF( ln_timing ) CALL timing_stop('tra_ldf_triad')433 !434 429 END SUBROUTINE tra_ldf_triad 435 430 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90
r9019 r9124 334 334 !!---------------------------------------------------------------------- 335 335 ! 336 IF( ln_timing ) CALL timing_start('tra_qsr_init')337 !338 336 REWIND( numnam_ref ) ! Namelist namtra_qsr in reference namelist 339 337 READ ( numnam_ref, namtra_qsr, IOSTAT = ios, ERR = 901) … … 428 426 ENDIF 429 427 ! 430 IF( ln_timing ) CALL timing_stop('tra_qsr_init')431 !432 428 END SUBROUTINE tra_qsr_init 433 429 -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90
r9119 r9124 27 27 USE trd_oce ! trends: ocean variables 28 28 USE trdtra ! trends manager: tracers 29 USE wet_dry, ONLY : ll_wd, rn_wdmin1, r_rn_wdmin1 ! Wetting and drying 29 30 #if defined key_asminc 30 31 USE asminc ! Assimilation increment … … 36 37 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 37 38 USE timing ! Timing 38 USE wet_dry, ONLY : ll_wd, rn_wdmin1, r_rn_wdmin1 ! Wetting and drying39 39 40 40 IMPLICIT NONE … … 252 252 ! 253 253 #endif 254 255 254 ! 256 255 !---------------------------------------- … … 263 262 DO ji = fs_2, fs_jpim1 264 263 zdep = 1._wp / e3t_n(ji,jj,jk) 265 tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) - htsc_iscpl(ji,jj,jk,jp_tem) & 266 & * zdep 267 tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal) - htsc_iscpl(ji,jj,jk,jp_sal) & 268 & * zdep 264 tsa(ji,jj,jk,jp_tem) = tsa(ji,jj,jk,jp_tem) - htsc_iscpl(ji,jj,jk,jp_tem) * zdep 265 tsa(ji,jj,jk,jp_sal) = tsa(ji,jj,jk,jp_sal) - htsc_iscpl(ji,jj,jk,jp_sal) * zdep 269 266 END DO 270 267 END DO -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/trazdf.F90
r9094 r9124 58 58 IF( ln_timing ) CALL timing_start('tra_zdf') 59 59 ! 60 IF( kt == nit000 ) THEN 61 IF(lwp)WRITE(numout,*) 62 IF(lwp)WRITE(numout,*) 'tra_zdf : implicit vertical mixing on T & S' 63 IF(lwp)WRITE(numout,*) '~~~~~~~ ' 64 ENDIF 65 ! 60 66 IF( neuler == 0 .AND. kt == nit000 ) THEN ; r2dt = rdt ! at nit000, = rdt (restarting with Euler time stepping) 61 67 ELSEIF( kt <= nit000 + 1 ) THEN ; r2dt = 2. * rdt ! otherwise, = 2 rdt (leapfrog) … … 134 140 !!--------------------------------------------------------------------- 135 141 ! 136 IF( ln_timing ) CALL timing_start('tra_zdf_imp')137 !138 IF( kt == kit000 ) THEN139 IF(lwp)WRITE(numout,*)140 IF(lwp)WRITE(numout,*) 'tra_zdf_imp : implicit vertical mixing on ', cdtype141 IF(lwp)WRITE(numout,*) '~~~~~~~~~~~ '142 ENDIF143 142 ! ! ============= ! 144 143 DO jn = 1, kjpt ! tracer loop ! … … 253 252 END DO ! end tracer loop ! 254 253 ! ! ================= ! 255 !256 IF( ln_timing ) CALL timing_stop('tra_zdf_imp')257 !258 254 END SUBROUTINE tra_zdf_imp 259 255
Note: See TracChangeset
for help on using the changeset viewer.