Changeset 11869 for NEMO/branches
- Timestamp:
- 2019-11-06T17:01:36+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/fix_sn_cfctl_ticket2328
- Files:
-
- 87 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/fix_sn_cfctl_ticket2328/cfgs/SHARED/namelist_ref
r11814 r11869 1330 1330 sn_cfctl%l_mppout = .FALSE. ! 1331 1331 sn_cfctl%l_mpptop = .FALSE. ! 1332 sn_cfctl%l_oasout = .FALSE. ! 1332 1333 sn_cfctl%procmin = 0 ! Minimum area number for reporting [default:0] 1333 1334 sn_cfctl%procmax = 1000000 ! Maximum area number for reporting [default:1000000] -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/doc/namelists/namctl
r10601 r11869 10 10 sn_cfctl%l_mppout = .FALSE. ! 11 11 sn_cfctl%l_mpptop = .FALSE. ! 12 sn_cfctl%l_oasout = .FALSE. ! 12 13 sn_cfctl%procmin = 0 ! Minimum area number for reporting [default:0] 13 14 sn_cfctl%procmax = 1000000 ! Maximum area number for reporting [default:1000000] -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/ICE/icecor.F90
r11536 r11869 165 165 ! 166 166 ! controls 167 IF( ln_ctl ) CALL ice_prt3D ('icecor') ! prints 167 IF( ln_ctl .OR. sn_cfctl%l_mppout ) & 168 & CALL ice_prt3D ('icecor') ! prints 168 169 IF( ln_icectl .AND. kn == 2 ) & 169 170 & CALL ice_prt ( kt, iiceprt, jiceprt, 2, ' - Final state - ' ) ! prints -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/ICE/icedyn_rdgrft.F90
r11732 r11869 268 268 269 269 ! controls 270 IF( ln_ctl ) CALL ice_prt3D ('icedyn_rdgrft')! prints270 IF( ln_ctl .OR. sn_cfctl%l_mppout ) CALL ice_prt3D ('icedyn_rdgrft') ! prints 271 271 IF( ln_icectl ) CALL ice_prt (kt, iiceprt, jiceprt,-1, ' - ice dyn rdgrft - ') ! prints 272 272 IF( ln_icediachk ) CALL ice_cons_hsm(1, 'icedyn_rdgrft', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/ICE/icedyn_rhg.F90
r11536 r11869 88 88 ! 89 89 ! controls 90 IF( ln_ctl ) CALL ice_prt3D ('icedyn_rhg') ! prints 90 IF( ln_ctl .OR. sn_cfctl%l_mppout ) & 91 & CALL ice_prt3D ('icedyn_rhg') ! prints 91 92 IF( ln_icediachk ) CALL ice_cons_hsm(1, 'icedyn_rhg', rdiag_v, rdiag_s, rdiag_t, rdiag_fv, rdiag_fs, rdiag_ft) ! conservation 92 93 IF( ln_icediachk ) CALL ice_cons2D (1, 'icedyn_rhg', diag_v, diag_s, diag_t, diag_fv, diag_fs, diag_ft) ! conservation -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/ICE/icedyn_rhg_evp.F90
r11536 r11869 345 345 l_full_nf_update = jter == nn_nevp ! false: disable full North fold update (performances) for iter = 1 to nn_nevp-1 346 346 ! 347 !!$ IF(ln_ctl ) THEN ! Convergence test347 !!$ IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN ! Convergence test 348 348 !!$ DO jj = 1, jpjm1 349 349 !!$ zu_ice(:,jj) = u_ice(:,jj) ! velocity at previous time step … … 667 667 ENDIF 668 668 669 !!$ IF(ln_ctl ) THEN ! Convergence test669 !!$ IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN ! Convergence test 670 670 !!$ DO jj = 2 , jpjm1 671 671 !!$ zresr(:,jj) = MAX( ABS( u_ice(:,jj) - zu_ice(:,jj) ), ABS( v_ice(:,jj) - zv_ice(:,jj) ) ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/ICE/icethd.F90
r11536 r11869 252 252 ! controls 253 253 IF( ln_icectl ) CALL ice_prt (kt, iiceprt, jiceprt, 1, ' - ice thermodyn. - ') ! prints 254 IF( ln_ctl ) CALL ice_prt3D ('icethd') ! prints 254 IF( ln_ctl .OR. sn_cfctl%l_mppout ) & 255 & CALL ice_prt3D ('icethd') ! prints 255 256 IF( ln_timing ) CALL timing_stop('icethd') ! timing 256 257 ! -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/ICE/iceupdate.F90
r11536 r11869 286 286 #endif 287 287 IF( ln_icectl ) CALL ice_prt (kt, iiceprt, jiceprt, 3, 'Final state ice_update') ! prints 288 IF( ln_ctl 288 IF( ln_ctl .OR. sn_cfctl%l_mppout ) CALL ice_prt3D ('iceupdate') ! prints 289 289 IF( ln_timing ) CALL timing_stop ('ice_update') ! timing 290 290 ! -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/C1D/dyncor_c1d.F90
r10068 r11869 95 95 96 96 ! 97 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' cor - Ua: ', mask1=umask, &97 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' cor - Ua: ', mask1=umask, & 98 98 & tab3d_2=va, clinfo2=' Va: ' , mask2=vmask ) 99 99 ! -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/C1D/dyndmp.F90
r11536 r11869 219 219 ! 220 220 ! ! Control print 221 IF( ln_ctl ) CALL prt_ctl( tab3d_1=ua(:,:,:), clinfo1=' dmp - Ua: ', mask1=umask, &222 & tab3d_2=va(:,:,:), clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )221 IF( ln_ctl .OR. sn_cfctl%l_mppout ) CALL prt_ctl( tab3d_1=ua(:,:,:), clinfo1=' dmp - Ua: ', mask1=umask, & 222 & tab3d_2=va(:,:,:), clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 223 223 ! 224 224 ! -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DOM/daymod.F90
r10068 r11869 277 277 IF( nsec_week > 7*nsecd ) nsec_week = ndt05 ! New week 278 278 279 IF(ln_ctl ) THEN279 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 280 280 WRITE(charout,FMT="('kt =', I4,' d/m/y =',I2,I2,I4)") kt, nday, nmonth, nyear 281 281 CALL prt_ctl_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynadv_cen2.F90
r10068 r11869 139 139 ENDIF 140 140 ! ! Control print 141 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' cen2 adv - Ua: ', mask1=umask, &142 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )141 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' cen2 adv - Ua: ', mask1=umask, & 142 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 143 143 ! 144 144 END SUBROUTINE dyn_adv_cen2 -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynadv_ubs.F90
r10425 r11869 232 232 ENDIF 233 233 ! ! Control print 234 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' ubs2 adv - Ua: ', mask1=umask, &235 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )234 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' ubs2 adv - Ua: ', mask1=umask, & 235 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 236 236 ! 237 237 END SUBROUTINE dyn_adv_ubs -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynhpg.F90
r11536 r11869 119 119 ENDIF 120 120 ! 121 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' hpg - Ua: ', mask1=umask, &122 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )121 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' hpg - Ua: ', mask1=umask, & 122 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 123 123 ! 124 124 IF( ln_timing ) CALL timing_stop('dyn_hpg') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynkeg.F90
r11536 r11869 147 147 ENDIF 148 148 ! 149 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' keg - Ua: ', mask1=umask, &150 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )149 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' keg - Ua: ', mask1=umask, & 150 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 151 151 ! 152 152 IF( ln_timing ) CALL timing_stop('dyn_keg') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynldf.F90
r10068 r11869 77 77 ENDIF 78 78 ! ! print sum trends (used for debugging) 79 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' ldf - Ua: ', mask1=umask, &80 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )79 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' ldf - Ua: ', mask1=umask, & 80 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 81 81 ! 82 82 IF( ln_timing ) CALL timing_stop('dyn_ldf') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynldf_iso.F90
r10425 r11869 286 286 287 287 ! print sum trends (used for debugging) 288 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' ldfh - Ua: ', mask1=umask, &289 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )288 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' ldfh - Ua: ', mask1=umask, & 289 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 290 290 291 291 -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynnxt.F90
r10425 r11869 368 368 ENDIF 369 369 ! 370 IF(ln_ctl ) CALL prt_ctl( tab3d_1=un, clinfo1=' nxt - Un: ', mask1=umask, &371 & tab3d_2=vn, clinfo2=' Vn: ' , mask2=vmask )370 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=un, clinfo1=' nxt - Un: ', mask1=umask, & 371 & tab3d_2=vn, clinfo2=' Vn: ' , mask2=vmask ) 372 372 ! 373 373 IF( ln_dynspg_ts ) DEALLOCATE( zue, zve ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynspg.F90
r11536 r11869 172 172 ENDIF 173 173 ! ! print mean trends (used for debugging) 174 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' spg - Ua: ', mask1=umask, &175 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )174 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' spg - Ua: ', mask1=umask, & 175 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 176 176 ! 177 177 IF( ln_timing ) CALL timing_stop('dyn_spg') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynvor.F90
r11536 r11869 179 179 ! 180 180 ! ! print sum trends (used for debugging) 181 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' vor - Ua: ', mask1=umask, &182 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )181 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' vor - Ua: ', mask1=umask, & 182 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 183 183 ! 184 184 IF( ln_timing ) CALL timing_stop('dyn_vor') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynzad.F90
r10068 r11869 114 114 ENDIF 115 115 ! ! Control print 116 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' zad - Ua: ', mask1=umask, &117 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )116 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' zad - Ua: ', mask1=umask, & 117 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 118 118 ! 119 119 IF( ln_timing ) CALL timing_stop('dyn_zad') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/dynzdf.F90
r11281 r11869 492 492 ENDIF 493 493 ! ! print mean trends (used for debugging) 494 IF(ln_ctl ) CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf - Ua: ', mask1=umask, &495 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )494 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=ua, clinfo1=' zdf - Ua: ', mask1=umask, & 495 & tab3d_2=va, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 496 496 ! 497 497 IF( ln_timing ) CALL timing_stop('dyn_zdf') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/DYN/sshwzv.F90
r11414 r11869 121 121 ! !------------------------------! 122 122 ! 123 IF(ln_ctl ) CALL prt_ctl( tab2d_1=ssha, clinfo1=' ssha - : ', mask1=tmask )123 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab2d_1=ssha, clinfo1=' ssha - : ', mask1=tmask ) 124 124 ! 125 125 IF( ln_timing ) CALL timing_stop('ssh_nxt') … … 262 262 ENDIF 263 263 ! 264 IF(ln_ctl ) CALL prt_ctl( tab2d_1=sshb, clinfo1=' sshb - : ', mask1=tmask )264 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab2d_1=sshb, clinfo1=' sshb - : ', mask1=tmask ) 265 265 ! 266 266 IF( ln_timing ) CALL timing_stop('ssh_swp') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/IOM/in_out_manager.F90
r11536 r11869 108 108 LOGICAL :: l_mppout = .FALSE. !: Produce/do not produce mpp.output_XXXX files (T/F) 109 109 LOGICAL :: l_mpptop = .FALSE. !: Produce/do not produce mpp.top.output_XXXX files (T/F) 110 LOGICAL :: l_oasout = .FALSE. !: Produce/do not write oasis setup info to ocean.output (T/F) 110 111 ! Optional subsetting of processor report files 111 112 ! Default settings of 0/1000000/1 should ensure all areas report. -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/LDF/ldfslp.F90
r10425 r11869 365 365 CALL lbc_lnk_multi( 'ldfslp', uslp , 'U', -1. , vslp , 'V', -1. , wslpi, 'W', -1., wslpj, 'W', -1. ) 366 366 367 IF(ln_ctl ) THEN367 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 368 368 CALL prt_ctl(tab3d_1=uslp , clinfo1=' slp - u : ', tab3d_2=vslp, clinfo2=' v : ', kdim=jpk) 369 369 CALL prt_ctl(tab3d_1=wslpi, clinfo1=' slp - wi: ', tab3d_2=wslpj, clinfo2=' wj: ', kdim=jpk) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/SBC/cpl_oasis3.F90
r10582 r11869 203 203 paral(5) = jpiglo ! global extent in x 204 204 205 IF( ln_ctl) THEN205 IF( sn_cfctl%l_oasout ) THEN 206 206 WRITE(numout,*) ' multiexchg: paral (1:5)', paral 207 207 WRITE(numout,*) ' multiexchg: jpi, jpj =', jpi, jpj … … 243 243 END IF 244 244 #endif 245 IF( ln_ctl) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_Out245 IF( sn_cfctl%l_oasout ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_Out 246 246 CALL oasis_def_var (ssnd(ji)%nid(jc,jm), zclname, id_part , (/ 2, 1 /), & 247 247 & OASIS_Out , ishape , OASIS_REAL, nerror ) … … 250 250 CALL oasis_abort ( ssnd(ji)%nid(jc,jm), 'cpl_define', 'Failure in oasis_def_var' ) 251 251 ENDIF 252 IF( ln_ctl.AND. ssnd(ji)%nid(jc,jm) /= -1 ) WRITE(numout,*) "variable defined in the namcouple"253 IF( ln_ctl.AND. ssnd(ji)%nid(jc,jm) == -1 ) WRITE(numout,*) "variable NOT defined in the namcouple"252 IF( sn_cfctl%l_oasout .AND. ssnd(ji)%nid(jc,jm) /= -1 ) WRITE(numout,*) "variable defined in the namcouple" 253 IF( sn_cfctl%l_oasout .AND. ssnd(ji)%nid(jc,jm) == -1 ) WRITE(numout,*) "variable NOT defined in the namcouple" 254 254 END DO 255 255 END DO … … 288 288 END IF 289 289 #endif 290 IF( ln_ctl) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_In290 IF( sn_cfctl%l_oasout ) WRITE(numout,*) "Define", ji, jc, jm, " "//TRIM(zclname), " for ", OASIS_In 291 291 CALL oasis_def_var (srcv(ji)%nid(jc,jm), zclname, id_part , (/ 2, 1 /), & 292 292 & OASIS_In , ishape , OASIS_REAL, nerror ) … … 295 295 CALL oasis_abort ( srcv(ji)%nid(jc,jm), 'cpl_define', 'Failure in oasis_def_var' ) 296 296 ENDIF 297 IF( ln_ctl.AND. srcv(ji)%nid(jc,jm) /= -1 ) WRITE(numout,*) "variable defined in the namcouple"298 IF( ln_ctl.AND. srcv(ji)%nid(jc,jm) == -1 ) WRITE(numout,*) "variable NOT defined in the namcouple"297 IF( sn_cfctl%l_oasout .AND. srcv(ji)%nid(jc,jm) /= -1 ) WRITE(numout,*) "variable defined in the namcouple" 298 IF( sn_cfctl%l_oasout .AND. srcv(ji)%nid(jc,jm) == -1 ) WRITE(numout,*) "variable NOT defined in the namcouple" 299 299 300 300 END DO … … 349 349 CALL oasis_put ( ssnd(kid)%nid(jc,jm), kstep, pdata(nldi:nlei, nldj:nlej,jc), kinfo ) 350 350 351 IF ( ln_ctl) THEN351 IF ( sn_cfctl%l_oasout ) THEN 352 352 IF ( kinfo == OASIS_Sent .OR. kinfo == OASIS_ToRest .OR. & 353 353 & kinfo == OASIS_SentOut .OR. kinfo == OASIS_ToRestOut ) THEN … … 420 420 & kinfo == OASIS_RecvOut .OR. kinfo == OASIS_FromRestOut 421 421 422 IF ( ln_ctl) WRITE(numout,*) "llaction, kinfo, kstep, ivarid: " , llaction, kinfo, kstep, srcv(kid)%nid(jc,jm)422 IF ( sn_cfctl%l_oasout ) WRITE(numout,*) "llaction, kinfo, kstep, ivarid: " , llaction, kinfo, kstep, srcv(kid)%nid(jc,jm) 423 423 424 424 IF ( llaction ) THEN … … 432 432 ENDIF 433 433 434 IF ( ln_ctl) THEN434 IF ( sn_cfctl%l_oasout ) THEN 435 435 WRITE(numout,*) '****************' 436 436 WRITE(numout,*) 'oasis_get: Incoming ', srcv(kid)%clname -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/SBC/sbcblk.F90
r11536 r11869 507 507 508 508 509 IF(ln_ctl ) THEN509 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 510 510 CALL prt_ctl( tab2d_1=zqla , clinfo1=' blk_oce: zqla : ', tab2d_2=Ce_atm , clinfo2=' Ce_oce : ' ) 511 511 CALL prt_ctl( tab2d_1=zqsb , clinfo1=' blk_oce: zqsb : ', tab2d_2=Ch_atm , clinfo2=' Ch_oce : ' ) … … 553 553 ENDIF 554 554 ! 555 IF(ln_ctl ) THEN555 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 556 556 CALL prt_ctl(tab2d_1=zqsb , clinfo1=' blk_oce: zqsb : ', tab2d_2=zqlw , clinfo2=' zqlw : ') 557 557 CALL prt_ctl(tab2d_1=zqla , clinfo1=' blk_oce: zqla : ', tab2d_2=qsr , clinfo2=' qsr : ') … … 764 764 ! 765 765 ! 766 IF(ln_ctl ) THEN766 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 767 767 CALL prt_ctl(tab2d_1=utau_ice , clinfo1=' blk_ice: utau_ice : ', tab2d_2=vtau_ice , clinfo2=' vtau_ice : ') 768 768 CALL prt_ctl(tab2d_1=wndm_ice , clinfo1=' blk_ice: wndm_ice : ') … … 914 914 END WHERE 915 915 ! 916 IF(ln_ctl ) THEN916 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 917 917 CALL prt_ctl(tab3d_1=qla_ice , clinfo1=' blk_ice: qla_ice : ', tab3d_2=z_qsb , clinfo2=' z_qsb : ', kdim=jpl) 918 918 CALL prt_ctl(tab3d_1=z_qlw , clinfo1=' blk_ice: z_qlw : ', tab3d_2=dqla_ice, clinfo2=' dqla_ice : ', kdim=jpl) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/SBC/sbcmod.F90
r11536 r11869 557 557 CALL iom_put( "vtau", vtau ) ! j-wind stress 558 558 ! 559 IF(ln_ctl ) THEN ! print mean trends (used for debugging)559 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN ! print mean trends (used for debugging) 560 560 CALL prt_ctl(tab2d_1=fr_i , clinfo1=' fr_i - : ', mask1=tmask ) 561 561 CALL prt_ctl(tab2d_1=(emp-rnf + fwfisf), clinfo1=' emp-rnf - : ', mask1=tmask ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/eosbn2.F90
r11536 r11869 297 297 END SELECT 298 298 ! 299 IF(ln_ctl ) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-insitu : ', kdim=jpk )299 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-insitu : ', kdim=jpk ) 300 300 ! 301 301 IF( ln_timing ) CALL timing_stop('eos-insitu') … … 464 464 END SELECT 465 465 ! 466 IF(ln_ctl ) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-pot: ', tab3d_2=prhop, clinfo2=' pot : ', kdim=jpk )466 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-pot: ', tab3d_2=prhop, clinfo2=' pot : ', kdim=jpk ) 467 467 ! 468 468 IF( ln_timing ) CALL timing_stop('eos-pot') … … 559 559 END SELECT 560 560 ! 561 IF(ln_ctl ) CALL prt_ctl( tab2d_1=prd, clinfo1=' eos2d: ' )561 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab2d_1=prd, clinfo1=' eos2d: ' ) 562 562 ! 563 563 IF( ln_timing ) CALL timing_stop('eos2d') … … 671 671 END SELECT 672 672 ! 673 IF(ln_ctl ) CALL prt_ctl( tab3d_1=pab(:,:,:,jp_tem), clinfo1=' rab_3d_t: ', &674 & tab3d_2=pab(:,:,:,jp_sal), clinfo2=' rab_3d_s : ', kdim=jpk )673 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=pab(:,:,:,jp_tem), clinfo1=' rab_3d_t: ', & 674 & tab3d_2=pab(:,:,:,jp_sal), clinfo2=' rab_3d_s : ', kdim=jpk ) 675 675 ! 676 676 IF( ln_timing ) CALL timing_stop('rab_3d') … … 785 785 END SELECT 786 786 ! 787 IF(ln_ctl ) CALL prt_ctl( tab2d_1=pab(:,:,jp_tem), clinfo1=' rab_2d_t: ', &788 & tab2d_2=pab(:,:,jp_sal), clinfo2=' rab_2d_s : ' )787 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab2d_1=pab(:,:,jp_tem), clinfo1=' rab_2d_t: ', & 788 & tab2d_2=pab(:,:,jp_sal), clinfo2=' rab_2d_s : ' ) 789 789 ! 790 790 IF( ln_timing ) CALL timing_stop('rab_2d') … … 929 929 END DO 930 930 ! 931 IF(ln_ctl ) CALL prt_ctl( tab3d_1=pn2, clinfo1=' bn2 : ', kdim=jpk )931 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=pn2, clinfo1=' bn2 : ', kdim=jpk ) 932 932 ! 933 933 IF( ln_timing ) CALL timing_stop('bn2') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/traadv.F90
r11536 r11869 168 168 ENDIF 169 169 ! ! print mean trends (used for debugging) 170 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv - Ta: ', mask1=tmask, &171 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' )170 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' adv - Ta: ', mask1=tmask, & 171 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 172 172 ! 173 173 IF( ln_timing ) CALL timing_stop( 'tra_adv' ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/trabbc.F90
r11536 r11869 100 100 ENDIF 101 101 ! 102 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' bbc - Ta: ', mask1=tmask, clinfo3='tra-ta' )102 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' bbc - Ta: ', mask1=tmask, clinfo3='tra-ta' ) 103 103 ! 104 104 IF( ln_timing ) CALL timing_stop('tra_bbc') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/trabbl.F90
r11536 r11869 119 119 ! 120 120 CALL tra_bbl_dif( tsb, tsa, jpts ) 121 IF( ln_ctl ) &121 IF( ln_ctl .OR. sn_cfctl%l_mppout ) & 122 122 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' bbl_ldf - Ta: ', mask1=tmask, & 123 123 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) … … 132 132 ! 133 133 CALL tra_bbl_adv( tsb, tsa, jpts ) 134 IF(ln_ctl ) &134 IF(ln_ctl .OR. sn_cfctl%l_mppout) & 135 135 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' bbl_adv - Ta: ', mask1=tmask, & 136 136 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/tradmp.F90
r11536 r11869 156 156 ENDIF 157 157 ! ! Control print 158 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' dmp - Ta: ', mask1=tmask, &159 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' )158 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' dmp - Ta: ', mask1=tmask, & 159 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 160 160 ! 161 161 IF( ln_timing ) CALL timing_stop('tra_dmp') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/traldf.F90
r10068 r11869 85 85 ENDIF 86 86 ! !* print mean trends (used for debugging) 87 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' ldf - Ta: ', mask1=tmask, &88 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' )87 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' ldf - Ta: ', mask1=tmask, & 88 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 89 89 ! 90 90 IF( ln_timing ) CALL timing_stop('tra_ldf') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/tranxt.F90
r10425 r11869 181 181 ! 182 182 ! ! control print 183 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' nxt - Tn: ', mask1=tmask, &184 & tab3d_2=tsn(:,:,:,jp_sal), clinfo2= ' Sn: ', mask2=tmask )183 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' nxt - Tn: ', mask1=tmask, & 184 & tab3d_2=tsn(:,:,:,jp_sal), clinfo2= ' Sn: ', mask2=tmask ) 185 185 ! 186 186 IF( ln_timing ) CALL timing_stop('tra_nxt') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/traqsr.F90
r11536 r11869 300 300 ENDIF 301 301 ! ! print mean trends (used for debugging) 302 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' qsr - Ta: ', mask1=tmask, clinfo3='tra-ta' )302 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' qsr - Ta: ', mask1=tmask, clinfo3='tra-ta' ) 303 303 ! 304 304 IF( ln_timing ) CALL timing_stop('tra_qsr') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/trasbc.F90
r10499 r11869 266 266 ENDIF 267 267 ! 268 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' sbc - Ta: ', mask1=tmask, &269 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' )268 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' sbc - Ta: ', mask1=tmask, & 269 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 270 270 ! 271 271 IF( ln_timing ) CALL timing_stop('tra_sbc') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRA/trazdf.F90
r10425 r11869 99 99 ENDIF 100 100 ! ! print mean trends (used for debugging) 101 IF(ln_ctl ) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' zdf - Ta: ', mask1=tmask, &102 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' )101 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' zdf - Ta: ', mask1=tmask, & 102 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 103 103 ! 104 104 IF( ln_timing ) CALL timing_stop('tra_zdf') -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/TRD/trdmxl.F90
r11536 r11869 371 371 hmxlbn(:,:) = hmxl(:,:) 372 372 373 IF( ln_ctl ) THEN373 IF( ln_ctl .OR. sn_cfctl%l_mppout ) THEN 374 374 WRITE(numout,*) ' we reach kt == nit000 + 1 = ', nit000+1 375 375 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask) … … 380 380 END IF 381 381 382 IF( ( ln_rstart ) .AND. ( kt == nit000 ) .AND. ( ln_ctl ) ) THEN382 IF( ( ln_rstart ) .AND. ( kt == nit000 ) .AND. ( ln_ctl .OR. sn_cfctl%l_mppout ) ) THEN 383 383 IF( ln_trdmxl_instant ) THEN 384 384 WRITE(numout,*) ' restart from kt == nit000 = ', nit000 … … 548 548 hmxlbn (:,:) = hmxl (:,:) 549 549 550 IF( ln_ctl ) THEN550 IF( ln_ctl .OR. sn_cfctl%l_mppout ) THEN 551 551 IF( ln_trdmxl_instant ) THEN 552 552 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/ZDF/zdfddm.F90
r10068 r11869 163 163 ! ! =============== 164 164 ! 165 IF(ln_ctl ) THEN165 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 166 166 CALL prt_ctl(tab3d_1=avt , clinfo1=' ddm - t: ', tab3d_2=avs , clinfo2=' s: ', kdim=jpk) 167 167 ENDIF -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/ZDF/zdfdrg.F90
r11536 r11869 139 139 ENDIF 140 140 ! 141 IF(ln_ctl ) CALL prt_ctl( tab2d_1=pCdU, clinfo1=' Cd*U ')141 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab2d_1=pCdU, clinfo1=' Cd*U ') 142 142 ! 143 143 END SUBROUTINE zdf_drg … … 213 213 ENDIF 214 214 ! ! print mean trends (used for debugging) 215 IF(ln_ctl ) CALL prt_ctl( tab3d_1=pua, clinfo1=' bfr - Ua: ', mask1=umask, &216 & tab3d_2=pva, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' )215 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab3d_1=pua, clinfo1=' bfr - Ua: ', mask1=umask, & 216 & tab3d_2=pva, clinfo2= ' Va: ', mask2=vmask, clinfo3='dyn' ) 217 217 ! 218 218 END SUBROUTINE zdf_drg_exp -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/ZDF/zdfgls.F90
r11536 r11869 824 824 p_avt(:,:,1) = 0._wp 825 825 ! 826 IF(ln_ctl ) THEN826 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 827 827 CALL prt_ctl( tab3d_1=en , clinfo1=' gls - e: ', tab3d_2=p_avt, clinfo2=' t: ', kdim=jpk) 828 828 CALL prt_ctl( tab3d_1=p_avm, clinfo1=' gls - m: ', kdim=jpk ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/ZDF/zdfiwm.F90
r11536 r11869 383 383 CALL iom_put( "emix_iwm", zemx_iwm ) 384 384 385 IF(ln_ctl ) CALL prt_ctl(tab3d_1=zav_wave , clinfo1=' iwm - av_wave: ', tab3d_2=avt, clinfo2=' avt: ', kdim=jpk)385 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl(tab3d_1=zav_wave , clinfo1=' iwm - av_wave: ', tab3d_2=avt, clinfo2=' avt: ', kdim=jpk) 386 386 ! 387 387 END SUBROUTINE zdf_iwm -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/ZDF/zdfmxl.F90
r10425 r11869 137 137 ENDIF 138 138 ! 139 IF(ln_ctl ) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmlp, clinfo2=' hmlp : ' )139 IF(ln_ctl .OR. sn_cfctl%l_mppout) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmlp, clinfo2=' hmlp : ' ) 140 140 ! 141 141 END SUBROUTINE zdf_mxl -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/ZDF/zdfosm.F90
r11536 r11869 1659 1659 ENDIF 1660 1660 1661 IF(ln_ctl ) THEN1661 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 1662 1662 CALL prt_ctl( tab3d_1=tsa(:,:,:,jp_tem), clinfo1=' osm - Ta: ', mask1=tmask, & 1663 1663 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/ZDF/zdftke.F90
r11536 r11869 623 623 ENDIF 624 624 ! 625 IF(ln_ctl ) THEN625 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 626 626 CALL prt_ctl( tab3d_1=en , clinfo1=' tke - e: ', tab3d_2=p_avt, clinfo2=' t: ', kdim=jpk) 627 627 CALL prt_ctl( tab3d_1=p_avm, clinfo1=' tke - m: ', kdim=jpk ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OCE/nemogcm.F90
r11866 r11869 559 559 ! ! Parameter control 560 560 ! 561 IF( ln_ctl ) THEN! sub-domain area indices for the control prints561 IF( ln_ctl .OR. sn_cfctl%l_mppout .OR. sn_cfctl%l_mpptop ) THEN ! sub-domain area indices for the control prints 562 562 IF( lk_mpp .AND. jpnij > 1 ) THEN 563 563 isplt = jpni ; jsplt = jpnj ; ijsplt = jpni*jpnj ! the domain is forced to the real split domain … … 691 691 sn_cfctl%l_mppout = setto 692 692 sn_cfctl%l_mpptop = setto 693 sn_cfctl%l_oasout = setto 693 694 END SUBROUTINE nemo_set_cfctl 694 695 -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OFF/dtadyn.F90
r11536 r11869 176 176 CALL eos( tsn, rhd, rhop, gdept_0(:,:,:) ) ! In any case, we need rhop 177 177 ! 178 IF(ln_ctl ) THEN! print control178 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN ! print control 179 179 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' tn - : ', mask1=tmask, kdim=jpk ) 180 180 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_sal), clinfo1=' sn - : ', mask1=tmask, kdim=jpk ) … … 444 444 CALL eos ( tsn, rhd, rhop, gdept_0(:,:,:) ) ! In any case, we need rhop 445 445 446 IF(ln_ctl ) THEN ! print control446 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN ! print control 447 447 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' tn - : ', mask1=tmask, kdim=jpk ) 448 448 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_sal), clinfo1=' sn - : ', mask1=tmask, kdim=jpk ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OFF/nemogcm.F90
r11866 r11869 392 392 ! ! Parameter control 393 393 ! 394 IF( ln_ctl ) THEN! sub-domain area indices for the control prints394 IF( ln_ctl .OR. sn_cfctl%l_mppout ) THEN ! sub-domain area indices for the control prints 395 395 IF( lk_mpp .AND. jpnij > 1 ) THEN 396 396 isplt = jpni ; jsplt = jpnj ; ijsplt = jpni*jpnj ! the domain is forced to the real split domain … … 509 509 sn_cfctl%l_mppout = setto 510 510 sn_cfctl%l_mpptop = setto 511 sn_cfctl%l_oasout = setto 511 512 END SUBROUTINE nemo_set_cfctl 512 513 -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/SAO/nemogcm.F90
r11866 r11869 242 242 243 243 IF( ln_ctl .OR. sn_cfctl%l_mppout ) & 244 & CALL prt_ctl_init 245 246 CALL istate_init ! ocean initial state (Dynamics and tracers)244 & CALL prt_ctl_init ! Print control 245 246 CALL istate_init ! ocean initial state (Dynamics and tracers) 247 247 END SUBROUTINE nemo_init 248 248 … … 307 307 ! ! Parameter control 308 308 ! 309 IF( ln_ctl ) THEN! sub-domain area indices for the control prints309 IF( ln_ctl .OR. sn_cfctl%l_mppout ) THEN ! sub-domain area indices for the control prints 310 310 IF( lk_mpp .AND. jpnij > 1 ) THEN 311 311 isplt = jpni ; jsplt = jpnj ; ijsplt = jpni*jpnj ! the domain is forced to the real split domain … … 429 429 sn_cfctl%l_mppout = setto 430 430 sn_cfctl%l_mpptop = setto 431 sn_cfctl%l_oasout = setto 431 432 END SUBROUTINE nemo_set_cfctl 432 433 -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/SAS/daymod.F90
r10068 r11869 275 275 IF( nsec_week > 7*nsecd ) nsec_week = ndt05 ! New week 276 276 277 IF(ln_ctl ) THEN277 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN 278 278 WRITE(charout,FMT="('kt =', I4,' d/m/y =',I2,I2,I4)") kt, nday, nmonth, nyear 279 279 CALL prt_ctl_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/SAS/nemogcm.F90
r11866 r11869 429 429 ! ! Parameter control 430 430 ! 431 IF( ln_ctl ) THEN ! sub-domain area indices for the control prints431 IF( ln_ctl .OR. sn_cfctl%l_mppout ) THEN ! sub-domain area indices for the control prints 432 432 IF( lk_mpp .AND. jpnij > 1 ) THEN 433 433 isplt = jpni ; jsplt = jpnj ; ijsplt = jpni*jpnj ! the domain is forced to the real split domain … … 555 555 sn_cfctl%l_mppout = setto 556 556 sn_cfctl%l_mpptop = setto 557 sn_cfctl%l_oasout = setto 557 558 END SUBROUTINE nemo_set_cfctl 558 559 -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/SAS/sbcssm.F90
r11536 r11869 131 131 vb (:,:,1) = ssv_m(:,:) 132 132 133 IF(ln_ctl ) THEN! print control133 IF(ln_ctl .OR. sn_cfctl%l_mppout) THEN ! print control 134 134 CALL prt_ctl(tab2d_1=sst_m, clinfo1=' sst_m - : ', mask1=tmask ) 135 135 CALL prt_ctl(tab2d_1=sss_m, clinfo1=' sss_m - : ', mask1=tmask ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P2Z/p2zbio.F90
r11536 r11869 367 367 ENDIF 368 368 369 IF(ln_ctl ) THEN ! print mean trends (used for debugging)369 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 370 370 WRITE(charout, FMT="('bio')") 371 371 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P2Z/p2zexp.F90
r10425 r11869 146 146 ENDIF 147 147 ! 148 IF(ln_ctl ) THEN ! print mean trends (used for debugging)148 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 149 149 WRITE(charout, FMT="('exp')") 150 150 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P2Z/p2zopt.F90
r11536 r11869 133 133 134 134 135 IF(ln_ctl ) THEN ! print mean trends (used for debugging)135 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 136 136 WRITE(charout, FMT="('opt')") 137 137 CALL prt_ctl_trc_info( charout ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P2Z/p2zsed.F90
r11536 r11869 107 107 ! 108 108 109 IF(ln_ctl ) THEN ! print mean trends (used for debugging)109 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 110 110 WRITE(charout, FMT="('sed')") 111 111 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zagg.F90
r10069 r11869 173 173 ENDIF 174 174 ! 175 IF(ln_ctl ) THEN ! print mean trends (used for debugging)175 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 176 176 WRITE(charout, FMT="('agg')") 177 177 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zbio.F90
r10227 r11869 106 106 & CALL p4z_ligand( kt, knt ) 107 107 ! ! 108 IF(ln_ctl ) THEN ! print mean trends (used for debugging)108 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 109 109 WRITE(charout, FMT="('bio ')") 110 110 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zfechem.F90
r11536 r11869 220 220 ENDIF 221 221 222 IF(ln_ctl ) THEN ! print mean trends (used for debugging)222 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 223 223 WRITE(charout, FMT="('fechem')") 224 224 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zflx.F90
r11536 r11869 179 179 t_atm_co2_flx = atcco2 ! Total atmospheric pCO2 180 180 181 IF(ln_ctl ) THEN ! print mean trends (used for debugging)181 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 182 182 WRITE(charout, FMT="('flx ')") 183 183 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zligand.F90
r11536 r11869 94 94 ENDIF 95 95 ! 96 IF(ln_ctl ) THEN ! print mean trends (used for debugging)96 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 97 97 WRITE(charout, FMT="('ligand1')") 98 98 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zlys.F90
r11536 r11869 129 129 ENDIF 130 130 ! 131 IF(ln_ctl ) THEN ! print mean trends (used for debugging)131 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 132 132 WRITE(charout, FMT="('lys ')") 133 133 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zmeso.F90
r11536 r11869 255 255 IF (ln_ligand) DEALLOCATE( zz2ligprod ) 256 256 ! 257 IF(ln_ctl ) THEN ! print mean trends (used for debugging)257 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 258 258 WRITE(charout, FMT="('meso')") 259 259 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zmicro.F90
r11536 r11869 207 207 IF (ln_ligand) DEALLOCATE( zzligprod ) 208 208 ! 209 IF(ln_ctl ) THEN ! print mean trends (used for debugging)209 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 210 210 WRITE(charout, FMT="('micro')") 211 211 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zmort.F90
r11536 r11869 118 118 END DO 119 119 ! 120 IF(ln_ctl ) THEN ! print mean trends (used for debugging)120 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 121 121 WRITE(charout, FMT="('nano')") 122 122 CALL prt_ctl_trc_info(charout) … … 193 193 END DO 194 194 ! 195 IF(ln_ctl ) THEN ! print mean trends (used for debugging)195 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 196 196 WRITE(charout, FMT="('diat')") 197 197 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zpoc.F90
r11536 r11869 248 248 ENDIF 249 249 250 IF(ln_ctl ) THEN ! print mean trends (used for debugging)250 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 251 251 WRITE(charout, FMT="('poc1')") 252 252 CALL prt_ctl_trc_info(charout) … … 460 460 ENDIF 461 461 462 IF(ln_ctl ) THEN ! print mean trends (used for debugging)462 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 463 463 WRITE(charout, FMT="('poc2')") 464 464 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zprod.F90
r11536 r11869 456 456 ENDIF 457 457 458 IF(ln_ctl ) THEN ! print mean trends (used for debugging)458 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 459 459 WRITE(charout, FMT="('prod')") 460 460 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zrem.F90
r11536 r11869 207 207 END DO 208 208 209 IF(ln_ctl ) THEN ! print mean trends (used for debugging)209 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 210 210 WRITE(charout, FMT="('rem1')") 211 211 CALL prt_ctl_trc_info(charout) … … 233 233 END DO 234 234 235 IF(ln_ctl ) THEN ! print mean trends (used for debugging)235 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 236 236 WRITE(charout, FMT="('rem2')") 237 237 CALL prt_ctl_trc_info(charout) … … 268 268 END DO 269 269 270 IF(ln_ctl ) THEN ! print mean trends (used for debugging)270 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 271 271 WRITE(charout, FMT="('rem3')") 272 272 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zsed.F90
r10788 r11869 482 482 ENDIF 483 483 ! 484 IF(ln_ctl ) THEN ! print mean trends (USEd for debugging)484 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (USEd for debugging) 485 485 WRITE(charout, fmt="('sed ')") 486 486 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p4zsink.F90
r10425 r11869 172 172 ENDIF 173 173 ! 174 IF(ln_ctl ) THEN ! print mean trends (used for debugging)174 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 175 175 WRITE(charout, FMT="('sink')") 176 176 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p5zmeso.F90
r11536 r11869 376 376 ENDIF 377 377 ! 378 IF(ln_ctl ) THEN ! print mean trends (used for debugging)378 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 379 379 WRITE(charout, FMT="('meso')") 380 380 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p5zmicro.F90
r11536 r11869 318 318 ENDIF 319 319 ! 320 IF(ln_ctl ) THEN ! print mean trends (used for debugging)320 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 321 321 WRITE(charout, FMT="('micro')") 322 322 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p5zmort.F90
r11536 r11869 119 119 END DO 120 120 ! 121 IF(ln_ctl ) THEN ! print mean trends (used for debugging)121 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 122 122 WRITE(charout, FMT="('nano')") 123 123 CALL prt_ctl_trc_info(charout) … … 180 180 END DO 181 181 ! 182 IF(ln_ctl ) THEN ! print mean trends (used for debugging)182 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 183 183 WRITE(charout, FMT="('pico')") 184 184 CALL prt_ctl_trc_info(charout) … … 258 258 END DO 259 259 ! 260 IF(ln_ctl ) THEN ! print mean trends (used for debugging)260 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 261 261 WRITE(charout, FMT="('diat')") 262 262 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/P4Z/p5zprod.F90
r11536 r11869 554 554 ENDIF 555 555 556 IF(ln_ctl ) THEN ! print mean trends (used for debugging)556 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 557 557 WRITE(charout, FMT="('prod')") 558 558 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/PISCES/SED/trcdmp_sed.F90
r10225 r11869 106 106 ! 107 107 ! ! print mean trends (used for debugging) 108 IF( ln_ctl ) THEN108 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN 109 109 WRITE(charout, FMT="('dmp ')") 110 110 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trcadv.F90
r11536 r11869 135 135 END SELECT 136 136 ! 137 IF( ln_ctl ) THEN!== print mean trends (used for debugging)137 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN !== print mean trends (used for debugging) 138 138 WRITE(charout, FMT="('adv ')") 139 139 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trcbbl.F90
r10068 r11869 67 67 ! 68 68 CALL tra_bbl_dif( trb, tra, jptra ) 69 IF( ln_ctl ) THEN69 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN 70 70 WRITE(charout, FMT="(' bbl_dif')") ; CALL prt_ctl_trc_info(charout) 71 71 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) … … 78 78 ! 79 79 CALL tra_bbl_adv( trb, tra, jptra ) 80 IF( ln_ctl ) THEN80 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN 81 81 WRITE(charout, FMT="(' bbl_adv')") ; CALL prt_ctl_trc_info(charout) 82 82 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trcdmp.F90
r11536 r11869 156 156 IF( l_trdtrc ) DEALLOCATE( ztrtrd ) 157 157 ! ! print mean trends (used for debugging) 158 IF( ln_ctl ) THEN158 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN 159 159 WRITE(charout, FMT="('dmp ')") 160 160 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trcldf.F90
r11536 r11869 110 110 ENDIF 111 111 ! 112 IF( ln_ctl ) THEN! print mean trends (used for debugging)112 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN ! print mean trends (used for debugging) 113 113 WRITE(charout, FMT="('ldf ')") 114 114 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trcnxt.F90
r10425 r11869 178 178 IF( l_trdtrc ) DEALLOCATE( ztrdt ) 179 179 ! 180 IF(ln_ctl ) THEN ! print mean trends (used for debugging)180 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 181 181 WRITE(charout, FMT="('nxt')") 182 182 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trcrad.F90
r11536 r11869 65 65 IF( ln_my_trc ) CALL trc_rad_sms( kt, trb, trn, jp_myt0, jp_myt1 ) ! MY_TRC model 66 66 ! 67 IF(ln_ctl ) THEN ! print mean trends (used for debugging)67 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 68 68 WRITE(charout, FMT="('rad')") 69 69 CALL prt_ctl_trc_info( charout ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trcsbc.F90
r10788 r11869 191 191 ENDIF 192 192 ! 193 IF( ln_ctl ) THEN193 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN 194 194 WRITE(charout, FMT="('sbc ')") ; CALL prt_ctl_trc_info(charout) 195 195 CALL prt_ctl_trc( tab4d=tra, mask=tmask, clinfo=ctrcnm, clinfo2='trd' ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/TRP/trczdf.F90
r10068 r11869 65 65 ENDIF 66 66 ! ! print mean trends (used for debugging) 67 IF( ln_ctl ) THEN67 IF( ln_ctl .OR. sn_cfctl%l_mpptop ) THEN 68 68 WRITE(charout, FMT="('zdf ')") 69 69 CALL prt_ctl_trc_info(charout) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/trcini.F90
r10817 r11869 140 140 ENDIF 141 141 IF(lwp) WRITE(numout,*) 142 IF(ln_ctl ) THEN ! print mean trends (used for debugging)142 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 143 143 CALL prt_ctl_trc_init 144 144 WRITE(charout, FMT="('ini ')") -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/trcsms.F90
r10068 r11869 55 55 IF( ln_my_trc ) CALL trc_sms_my_trc ( kt ) ! MY_TRC tracers 56 56 57 IF(ln_ctl ) THEN! print mean trends (used for debugging)57 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN ! print mean trends (used for debugging) 58 58 WRITE(charout, FMT="('sms ')") 59 59 CALL prt_ctl_trc_info( charout ) -
NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/TOP/trcstp.F90
r10570 r11869 77 77 cvol(:,:,jk) = e1e2t(:,:) * e3t_n(:,:,jk) * tmask(:,:,jk) 78 78 END DO 79 IF ( l n_ctl .OR. kt == nitrst .OR. ( ln_check_mass .AND. kt == nitend )&79 IF ( ll_trcstat .OR. kt == nitrst .OR. ( ln_check_mass .AND. kt == nitend ) & 80 80 & .OR. iom_use( "pno3tot" ) .OR. iom_use( "ppo4tot" ) .OR. iom_use( "psiltot" ) & 81 81 & .OR. iom_use( "palktot" ) .OR. iom_use( "pfertot" ) ) & … … 89 89 IF( MOD( kt , nn_dttrc ) == 0 ) THEN ! only every nn_dttrc time step 90 90 ! 91 IF(ln_ctl ) THEN91 IF(ln_ctl .OR. sn_cfctl%l_mpptop) THEN 92 92 WRITE(charout,FMT="('kt =', I4,' d/m/y =',I2,I2,I4)") kt, nday, nmonth, nyear 93 93 CALL prt_ctl_trc_info(charout)
Note: See TracChangeset
for help on using the changeset viewer.