Changeset 9440
- Timestamp:
- 2018-03-27T15:52:54+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM/NEMO
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r9212 r9440 174 174 ! 175 175 IF(ln_ctl) THEN ! print control 176 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' tn - : ', mask1=tmask, ovlap=1,kdim=jpk )177 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_sal), clinfo1=' sn - : ', mask1=tmask, ovlap=1,kdim=jpk )178 CALL prt_ctl(tab3d_1=un , clinfo1=' un - : ', mask1=umask, ovlap=1,kdim=jpk )179 CALL prt_ctl(tab3d_1=vn , clinfo1=' vn - : ', mask1=vmask, ovlap=1,kdim=jpk )180 CALL prt_ctl(tab3d_1=wn , clinfo1=' wn - : ', mask1=tmask, ovlap=1,kdim=jpk )181 CALL prt_ctl(tab3d_1=avt , clinfo1=' kz - : ', mask1=tmask, ovlap=1,kdim=jpk )176 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_tem), clinfo1=' tn - : ', mask1=tmask, kdim=jpk ) 177 CALL prt_ctl(tab3d_1=tsn(:,:,:,jp_sal), clinfo1=' sn - : ', mask1=tmask, kdim=jpk ) 178 CALL prt_ctl(tab3d_1=un , clinfo1=' un - : ', mask1=umask, kdim=jpk ) 179 CALL prt_ctl(tab3d_1=vn , clinfo1=' vn - : ', mask1=vmask, kdim=jpk ) 180 CALL prt_ctl(tab3d_1=wn , clinfo1=' wn - : ', mask1=tmask, kdim=jpk ) 181 CALL prt_ctl(tab3d_1=avt , clinfo1=' kz - : ', mask1=tmask, kdim=jpk ) 182 182 CALL prt_ctl(tab3d_1=uslp , clinfo1=' slp - u : ', tab3d_2=vslp, clinfo2=' v : ', kdim=jpk) 183 183 CALL prt_ctl(tab3d_1=wslpi , clinfo1=' slp - wi: ', tab3d_2=wslpj, clinfo2=' wj: ', kdim=jpk) 184 ! CALL prt_ctl(tab2d_1=fr_i , clinfo1=' fr_i - : ', mask1=tmask , ovlap=1)185 ! CALL prt_ctl(tab2d_1=hmld , clinfo1=' hmld - : ', mask1=tmask , ovlap=1)186 ! CALL prt_ctl(tab2d_1=fmmflx , clinfo1=' fmmflx - : ', mask1=tmask , ovlap=1)187 ! CALL prt_ctl(tab2d_1=emp , clinfo1=' emp - : ', mask1=tmask , ovlap=1)188 ! CALL prt_ctl(tab2d_1=wndm , clinfo1=' wspd - : ', mask1=tmask , ovlap=1)189 ! CALL prt_ctl(tab2d_1=qsr , clinfo1=' qsr - : ', mask1=tmask , ovlap=1)184 ! CALL prt_ctl(tab2d_1=fr_i , clinfo1=' fr_i - : ', mask1=tmask ) 185 ! CALL prt_ctl(tab2d_1=hmld , clinfo1=' hmld - : ', mask1=tmask ) 186 ! CALL prt_ctl(tab2d_1=fmmflx , clinfo1=' fmmflx - : ', mask1=tmask ) 187 ! CALL prt_ctl(tab2d_1=emp , clinfo1=' emp - : ', mask1=tmask ) 188 ! CALL prt_ctl(tab2d_1=wndm , clinfo1=' wspd - : ', mask1=tmask ) 189 ! CALL prt_ctl(tab2d_1=qsr , clinfo1=' qsr - : ', mask1=tmask ) 190 190 ENDIF 191 191 ! -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/sshwzv.F90
r9239 r9440 118 118 ! !------------------------------! 119 119 ! 120 IF(ln_ctl) CALL prt_ctl( tab2d_1=ssha, clinfo1=' ssha - : ', mask1=tmask , ovlap=1)120 IF(ln_ctl) CALL prt_ctl( tab2d_1=ssha, clinfo1=' ssha - : ', mask1=tmask ) 121 121 ! 122 122 IF( ln_timing ) CALL timing_stop('ssh_nxt') … … 259 259 ENDIF 260 260 ! 261 IF(ln_ctl) CALL prt_ctl( tab2d_1=sshb, clinfo1=' sshb - : ', mask1=tmask , ovlap=1)261 IF(ln_ctl) CALL prt_ctl( tab2d_1=sshb, clinfo1=' sshb - : ', mask1=tmask ) 262 262 ! 263 263 IF( ln_timing ) CALL timing_stop('ssh_swp') -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90
r9125 r9440 42 42 43 43 SUBROUTINE prt_ctl (tab2d_1, tab3d_1, mask1, clinfo1, tab2d_2, tab3d_2, & 44 & mask2, clinfo2, ovlap,kdim, clinfo3 )44 & mask2, clinfo2, kdim, clinfo3 ) 45 45 !!---------------------------------------------------------------------- 46 46 !! *** ROUTINE prt_ctl *** … … 74 74 !! mask2 : mask (3D) to apply to the tab[23]d_2 array 75 75 !! clinfo2 : information about the tab[23]d_2 array 76 !! ovlap : overlap value77 76 !! kdim : k- direction for 3D arrays 78 77 !! clinfo3 : additional information … … 86 85 REAL(wp), DIMENSION(:,:,:), INTENT(in), OPTIONAL :: mask2 87 86 CHARACTER (len=*) , INTENT(in), OPTIONAL :: clinfo2 88 INTEGER , INTENT(in), OPTIONAL :: ovlap89 87 INTEGER , INTENT(in), OPTIONAL :: kdim 90 88 CHARACTER (len=*) , INTENT(in), OPTIONAL :: clinfo3 91 89 ! 92 90 CHARACTER (len=15) :: cl2 93 INTEGER :: overlap,jn, sind, eind, kdir,j_id91 INTEGER :: jn, sind, eind, kdir,j_id 94 92 REAL(wp) :: zsum1, zsum2, zvctl1, zvctl2 95 93 REAL(wp), DIMENSION(jpi,jpj) :: ztab2d_1, ztab2d_2 … … 98 96 99 97 ! Arrays, scalars initialization 100 overlap = 0101 98 kdir = jpkm1 102 99 cl2 = '' … … 114 111 ! Control of optional arguments 115 112 IF( PRESENT(clinfo2) ) cl2 = clinfo2 116 IF( PRESENT(ovlap) ) overlap = ovlap117 113 IF( PRESENT(kdim) ) kdir = kdim 118 114 IF( PRESENT(tab2d_1) ) ztab2d_1(:,:) = tab2d_1(:,:) … … 138 134 IF( .NOT. lsp_area ) THEN 139 135 IF (lk_mpp .AND. jpnij > 1) THEN 140 nictls = MAX( 1, nlditl(jn) - overlap)141 nictle = nleitl(jn) + overlap * MIN( 1, nlcitl(jn) - nleitl(jn))142 njctls = MAX( 1, nldjtl(jn) - overlap)143 njctle = nlejtl(jn) + overlap * MIN( 1, nlcjtl(jn) - nlejtl(jn))136 nictls = MAX( 1, nlditl(jn) ) 137 nictle = MIN(jpi, nleitl(jn) ) 138 njctls = MAX( 1, nldjtl(jn) ) 139 njctle = MIN(jpj, nlejtl(jn) ) 144 140 ! Do not take into account the bound of the domain 145 141 IF( ibonitl(jn) == -1 .OR. ibonitl(jn) == 2 ) nictls = MAX(2, nictls) … … 148 144 IF( ibonjtl(jn) == 1 .OR. ibonjtl(jn) == 2 ) njctle = MIN(njctle, nlejtl(jn) - 1) 149 145 ELSE 150 nictls = MAX( 1, nimpptl(jn) + nlditl(jn) - 1 - overlap)151 nictle = nimpptl(jn) + nleitl(jn) - 1 + overlap * MIN( 1, nlcitl(jn) - nleitl(jn) )152 njctls = MAX( 1, njmpptl(jn) + nldjtl(jn) - 1 - overlap)153 njctle = njmpptl(jn) + nlejtl(jn) - 1 + overlap * MIN( 1, nlcjtl(jn) - nlejtl(jn) )146 nictls = MAX( 1, nimpptl(jn) - 1 + nlditl(jn) ) 147 nictle = MIN(jpi, nimpptl(jn) - 1 + nleitl(jn) ) 148 njctls = MAX( 1, njmpptl(jn) - 1 + nldjtl(jn) ) 149 njctle = MIN(jpj, njmpptl(jn) - 1 + nlejtl(jn) ) 154 150 ! Do not take into account the bound of the domain 155 151 IF( ibonitl(jn) == -1 .OR. ibonitl(jn) == 2 ) nictls = MAX(2, nictls) … … 420 416 INTEGER, DIMENSION(jpi,jpj) :: iimpptl, ijmpptl, ilcitl, ilcjtl ! workspace 421 417 REAL(wp) :: zidom, zjdom ! temporary scalars 418 INTEGER :: inum ! local logical unit 422 419 !!---------------------------------------------------------------------- 423 420 … … 569 566 END DO 570 567 ! 568 ! Save processor layout in layout_prtctl.dat file 569 IF(lwp) THEN 570 CALL ctl_opn( inum, 'layout_prtctl.dat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., narea ) 571 WRITE(inum,'(a)') 'nproc nlcil nlcjl nldil nldjl nleil nlejl nimpptl njmpptl ibonitl ibonjtl' 572 ! 573 DO jn = 1, ijsplt 574 WRITE(inum,'(i5,6i6,4i8)') jn-1,nlcitl(jn), nlcjtl(jn), & 575 & nlditl(jn), nldjtl(jn), & 576 & nleitl(jn), nlejtl(jn), & 577 & nimpptl(jn), njmpptl(jn), & 578 & ibonitl(jn), ibonjtl(jn) 579 END DO 580 CLOSE(inum) 581 END IF 571 582 ! 572 583 ! -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
r9169 r9440 295 295 END SELECT 296 296 ! 297 IF(ln_ctl) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-insitu : ', ovlap=1,kdim=jpk )297 IF(ln_ctl) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-insitu : ', kdim=jpk ) 298 298 ! 299 299 IF( ln_timing ) CALL timing_stop('eos-insitu') … … 462 462 END SELECT 463 463 ! 464 IF(ln_ctl) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-pot: ', tab3d_2=prhop, clinfo2=' pot : ', ovlap=1,kdim=jpk )464 IF(ln_ctl) CALL prt_ctl( tab3d_1=prd, clinfo1=' eos-pot: ', tab3d_2=prhop, clinfo2=' pot : ', kdim=jpk ) 465 465 ! 466 466 IF( ln_timing ) CALL timing_stop('eos-pot') … … 671 671 ! 672 672 IF(ln_ctl) CALL prt_ctl( tab3d_1=pab(:,:,:,jp_tem), clinfo1=' rab_3d_t: ', & 673 & tab3d_2=pab(:,:,:,jp_sal), clinfo2=' rab_3d_s : ', ovlap=1,kdim=jpk )673 & tab3d_2=pab(:,:,:,jp_sal), clinfo2=' rab_3d_s : ', kdim=jpk ) 674 674 ! 675 675 IF( ln_timing ) CALL timing_stop('rab_3d') … … 930 930 END DO 931 931 ! 932 IF(ln_ctl) CALL prt_ctl( tab3d_1=pn2, clinfo1=' bn2 : ', ovlap=1,kdim=jpk )932 IF(ln_ctl) CALL prt_ctl( tab3d_1=pn2, clinfo1=' bn2 : ', kdim=jpk ) 933 933 ! 934 934 IF( ln_timing ) CALL timing_stop('bn2') -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRD/trdmxl.F90
r9256 r9440 373 373 IF( ln_ctl ) THEN 374 374 WRITE(numout,*) ' we reach kt == nit000 + 1 = ', nit000+1 375 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask , ovlap=1)376 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask , ovlap=1)377 CALL prt_ctl(tab2d_1=tmlatfb , clinfo1=' tmlatfb - : ', mask1=tmask , ovlap=1)375 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask) 376 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask) 377 CALL prt_ctl(tab2d_1=tmlatfb , clinfo1=' tmlatfb - : ', mask1=tmask) 378 378 END IF 379 379 ! … … 383 383 IF( ln_trdmxl_instant ) THEN 384 384 WRITE(numout,*) ' restart from kt == nit000 = ', nit000 385 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask , ovlap=1)386 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask , ovlap=1)387 CALL prt_ctl(tab2d_1=tmlatfb , clinfo1=' tmlatfb - : ', mask1=tmask , ovlap=1)385 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask) 386 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask) 387 CALL prt_ctl(tab2d_1=tmlatfb , clinfo1=' tmlatfb - : ', mask1=tmask) 388 388 ELSE 389 389 WRITE(numout,*) ' restart from kt == nit000 = ', nit000 390 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask , ovlap=1)391 CALL prt_ctl(tab2d_1=hmxlbn , clinfo1=' hmxlbn - : ', mask1=tmask , ovlap=1)392 CALL prt_ctl(tab2d_1=tml_sumb , clinfo1=' tml_sumb - : ', mask1=tmask , ovlap=1)393 CALL prt_ctl(tab2d_1=tmltrd_atf_sumb, clinfo1=' tmltrd_atf_sumb - : ', mask1=tmask , ovlap=1)394 CALL prt_ctl(tab3d_1=tmltrd_csum_ub , clinfo1=' tmltrd_csum_ub - : ', mask1=tmask, ovlap=1,kdim=1)390 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask) 391 CALL prt_ctl(tab2d_1=hmxlbn , clinfo1=' hmxlbn - : ', mask1=tmask) 392 CALL prt_ctl(tab2d_1=tml_sumb , clinfo1=' tml_sumb - : ', mask1=tmask) 393 CALL prt_ctl(tab2d_1=tmltrd_atf_sumb, clinfo1=' tmltrd_atf_sumb - : ', mask1=tmask) 394 CALL prt_ctl(tab3d_1=tmltrd_csum_ub , clinfo1=' tmltrd_csum_ub - : ', mask1=tmask, kdim=1) 395 395 END IF 396 396 END IF … … 550 550 IF( ln_ctl ) THEN 551 551 IF( ln_trdmxl_instant ) THEN 552 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask , ovlap=1)553 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask , ovlap=1)554 CALL prt_ctl(tab2d_1=tmlatfb , clinfo1=' tmlatfb - : ', mask1=tmask , ovlap=1)552 CALL prt_ctl(tab2d_1=tmlbb , clinfo1=' tmlbb - : ', mask1=tmask) 553 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask) 554 CALL prt_ctl(tab2d_1=tmlatfb , clinfo1=' tmlatfb - : ', mask1=tmask) 555 555 ELSE 556 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask , ovlap=1)557 CALL prt_ctl(tab2d_1=hmxlbn , clinfo1=' hmxlbn - : ', mask1=tmask , ovlap=1)558 CALL prt_ctl(tab2d_1=tml_sumb , clinfo1=' tml_sumb - : ', mask1=tmask , ovlap=1)559 CALL prt_ctl(tab2d_1=tmltrd_atf_sumb, clinfo1=' tmltrd_atf_sumb - : ', mask1=tmask , ovlap=1)560 CALL prt_ctl(tab3d_1=tmltrd_csum_ub , clinfo1=' tmltrd_csum_ub - : ', mask1=tmask, ovlap=1,kdim=1)556 CALL prt_ctl(tab2d_1=tmlbn , clinfo1=' tmlbn - : ', mask1=tmask) 557 CALL prt_ctl(tab2d_1=hmxlbn , clinfo1=' hmxlbn - : ', mask1=tmask) 558 CALL prt_ctl(tab2d_1=tml_sumb , clinfo1=' tml_sumb - : ', mask1=tmask) 559 CALL prt_ctl(tab2d_1=tmltrd_atf_sumb, clinfo1=' tmltrd_atf_sumb - : ', mask1=tmask) 560 CALL prt_ctl(tab3d_1=tmltrd_csum_ub , clinfo1=' tmltrd_csum_ub - : ', mask1=tmask, kdim=1) 561 561 END IF 562 562 END IF -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfddm.F90
r9104 r9440 164 164 ! 165 165 IF(ln_ctl) THEN 166 CALL prt_ctl(tab3d_1=avt , clinfo1=' ddm - t: ', tab3d_2=avs , clinfo2=' s: ', ovlap=1,kdim=jpk)166 CALL prt_ctl(tab3d_1=avt , clinfo1=' ddm - t: ', tab3d_2=avs , clinfo2=' s: ', kdim=jpk) 167 167 ENDIF 168 168 ! -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90
r9367 r9440 816 816 ! 817 817 IF(ln_ctl) THEN 818 CALL prt_ctl( tab3d_1=en , clinfo1=' gls - e: ', tab3d_2=p_avt, clinfo2=' t: ', ovlap=1,kdim=jpk)819 CALL prt_ctl( tab3d_1=p_avm, clinfo1=' gls - m: ', ovlap=1,kdim=jpk )818 CALL prt_ctl( tab3d_1=en , clinfo1=' gls - e: ', tab3d_2=p_avt, clinfo2=' t: ', kdim=jpk) 819 CALL prt_ctl( tab3d_1=p_avm, clinfo1=' gls - m: ', kdim=jpk ) 820 820 ENDIF 821 821 ! -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfiwm.F90
r9343 r9440 365 365 CALL iom_put( "emix_iwm", zemx_iwm ) 366 366 367 IF(ln_ctl) CALL prt_ctl(tab3d_1=zav_wave , clinfo1=' iwm - av_wave: ', tab3d_2=avt, clinfo2=' avt: ', ovlap=1,kdim=jpk)367 IF(ln_ctl) CALL prt_ctl(tab3d_1=zav_wave , clinfo1=' iwm - av_wave: ', tab3d_2=avt, clinfo2=' avt: ', kdim=jpk) 368 368 ! 369 369 END SUBROUTINE zdf_iwm -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
r9104 r9440 137 137 ENDIF 138 138 ! 139 IF(ln_ctl) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmlp, clinfo2=' hmlp : ' , ovlap=1)139 IF(ln_ctl) CALL prt_ctl( tab2d_1=REAL(nmln,wp), clinfo1=' nmln : ', tab2d_2=hmlp, clinfo2=' hmlp : ' ) 140 140 ! 141 141 END SUBROUTINE zdf_mxl -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftke.F90
r9367 r9440 619 619 ! 620 620 IF(ln_ctl) THEN 621 CALL prt_ctl( tab3d_1=en , clinfo1=' tke - e: ', tab3d_2=p_avt, clinfo2=' t: ', ovlap=1,kdim=jpk)622 CALL prt_ctl( tab3d_1=p_avm, clinfo1=' tke - m: ', ovlap=1,kdim=jpk )621 CALL prt_ctl( tab3d_1=en , clinfo1=' tke - e: ', tab3d_2=p_avt, clinfo2=' t: ', kdim=jpk) 622 CALL prt_ctl( tab3d_1=p_avm, clinfo1=' tke - m: ', kdim=jpk ) 623 623 ENDIF 624 624 ! -
branches/2017/dev_merge_2017/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90
r9195 r9440 132 132 133 133 IF(ln_ctl) THEN ! print control 134 CALL prt_ctl(tab2d_1=sst_m, clinfo1=' sst_m - : ', mask1=tmask , ovlap=1)135 CALL prt_ctl(tab2d_1=sss_m, clinfo1=' sss_m - : ', mask1=tmask , ovlap=1)136 CALL prt_ctl(tab2d_1=ssu_m, clinfo1=' ssu_m - : ', mask1=umask , ovlap=1)137 CALL prt_ctl(tab2d_1=ssv_m, clinfo1=' ssv_m - : ', mask1=vmask , ovlap=1)138 CALL prt_ctl(tab2d_1=ssh_m, clinfo1=' ssh_m - : ', mask1=tmask , ovlap=1)139 IF( .NOT.ln_linssh ) CALL prt_ctl(tab2d_1=ssh_m, clinfo1=' e3t_m - : ', mask1=tmask , ovlap=1)140 IF( ln_read_frq ) CALL prt_ctl(tab2d_1=frq_m, clinfo1=' frq_m - : ', mask1=tmask , ovlap=1)134 CALL prt_ctl(tab2d_1=sst_m, clinfo1=' sst_m - : ', mask1=tmask ) 135 CALL prt_ctl(tab2d_1=sss_m, clinfo1=' sss_m - : ', mask1=tmask ) 136 CALL prt_ctl(tab2d_1=ssu_m, clinfo1=' ssu_m - : ', mask1=umask ) 137 CALL prt_ctl(tab2d_1=ssv_m, clinfo1=' ssv_m - : ', mask1=vmask ) 138 CALL prt_ctl(tab2d_1=ssh_m, clinfo1=' ssh_m - : ', mask1=tmask ) 139 IF( .NOT.ln_linssh ) CALL prt_ctl(tab2d_1=ssh_m, clinfo1=' e3t_m - : ', mask1=tmask ) 140 IF( ln_read_frq ) CALL prt_ctl(tab2d_1=frq_m, clinfo1=' frq_m - : ', mask1=tmask ) 141 141 ENDIF 142 142 !
Note: See TracChangeset
for help on using the changeset viewer.