Changeset 11782 for NEMO/branches/2019/dev_r11756_text_output/src/OCE/ICB

Timestamp:

2019-10-24T10:30:30+02:00 (5 years ago)

Author:

andmirek

Message:

Ticket #2320 print levels in ICE/OCE

Location:

NEMO/branches/2019/dev_r11756_text_output/src/OCE/ICB

Files:

• icbini.F90 (modified) (1 diff)
• icbrst.F90 (modified) (5 diffs)
• icbstp.F90 (modified) (1 diff)
• icbtrj.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r11756_text_output/src/OCE/ICB/icbini.F90

@@ -410 +410 @@
       READ  ( numnam_cfg, namberg, IOSTAT = ios, ERR = 902 )
 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namberg in configuration namelist' )
-      IF(lwm) WRITE ( numond, namberg )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namberg )
       !
       IF(lwp) WRITE(numout,*)

NEMO/branches/2019/dev_r11756_text_output/src/OCE/ICB/icbrst.F90

@@ -211 +211 @@
             WRITE(cl_filename,'(A,"_icebergs_",I8.8,"_restart.nc")') TRIM(cexper), kt
          ENDIF
-         IF ( lwp .AND. nn_verbose_level >= 0) WRITE(numout,'(2a)') 'icebergs, write_restart: creating ',  &
+         IF ( lwp .AND. nprint > 0) WRITE(numout,'(2a)') 'icebergs, write_restart: creating ',  &
            &                                                         TRIM(cl_path)//TRIM(cl_filename)
    
@@ -346 +346 @@
             ENDIF
          ENDDO
-         IF( lwp ) WRITE(numout,*) 'file: ',TRIM(cl_path)//TRIM(cl_filename),' var: stored_ice  written'
+         IF( lwp .AND. nprint > 0 ) WRITE(numout,*) 'file: ',TRIM(cl_path)//TRIM(cl_filename),' var: stored_ice  written'
    
          nret = NF90_PUT_VAR( ncid, nkountid, num_bergs(:) )
@@ -353 +353 @@
          nret = NF90_PUT_VAR( ncid, nsheatid, berg_grid%stored_heat(:,:) )
          IF (nret .ne. NF90_NOERR) CALL ctl_stop('icebergs, write_restart: nf_put_var stored_heat failed')
-         IF( lwp ) WRITE(numout,*) 'file: ',TRIM(cl_path)//TRIM(cl_filename),' var: stored_heat written'
+         IF( lwp .AND. nprint > 0 ) WRITE(numout,*) 'file: ',TRIM(cl_path)//TRIM(cl_filename),' var: stored_heat written'
    
          nret = NF90_PUT_VAR( ncid, ncalvid , src_calving(:,:) )
@@ -359 +359 @@
          nret = NF90_PUT_VAR( ncid, ncalvhid, src_calving_hflx(:,:) )
          IF (nret .ne. NF90_NOERR) CALL ctl_stop('icebergs, write_restart: nf_put_var calving_hflx failed')
-         IF( lwp ) WRITE(numout,*) 'file: ',TRIM(cl_path)//TRIM(cl_filename),' var: calving written'
+         IF( lwp .AND. nprint > 0 ) WRITE(numout,*) 'file: ',TRIM(cl_path)//TRIM(cl_filename),' var: calving written'
    
          IF ( ASSOCIATED(first_berg) ) THEN
@@ -401 +401 @@
          ! Sanity check
          jn = icb_utl_count()
-         IF ( lwp .AND. nn_verbose_level >= 0)   &
+         IF ( lwp .AND. nprint > 0)   &
             WRITE(numout,'(2(a,i5))') 'icebergs, icb_rst_write: # bergs =',jn,' on PE',narea-1
          IF( lk_mpp ) THEN
             CALL mpp_sum('icbrst', jn)
          ENDIF
-         IF(lwp)   WRITE(numout,'(a,i5,a,i5,a)') 'icebergs, icb_rst_write: ', jn,   &
+         IF(lwp .AND. nprint > 0)   WRITE(numout,'(a,i5,a,i5,a)') 'icebergs, icb_rst_write: ', jn,   &
             &                                    ' bergs in total have been written at timestep ', kt
          !

NEMO/branches/2019/dev_r11756_text_output/src/OCE/ICB/icbstp.F90

@@ -161 +161 @@
       IF( nn_sample_rate > 0 )   CALL icb_trj_end()
 
-      IF(lwp) WRITE(numout,'(a,i6)') 'icebergs: icb_end complete', narea
+      IF(lwp .AND. nprint > 0) WRITE(numout,'(a,i6)') 'icebergs: icb_end complete', narea
       !
       IF( nn_verbose_level > 0 ) THEN

NEMO/branches/2019/dev_r11756_text_output/src/OCE/ICB/icbtrj.F90

@@ -85 +85 @@
          &                        TRIM(ADJUSTL(cldate_ini)), TRIM(ADJUSTL(cldate_end))
       ENDIF
-      IF( lwp .AND. nn_verbose_level >= 0 )   WRITE(numout,'(2a)') 'icebergs, icb_trj_init: creating ',TRIM(cl_filename)
+      IF( lwp .AND. nprint > 0 )   WRITE(numout,'(2a)') 'icebergs, icb_trj_init: creating ',TRIM(cl_filename)
 
       iret = NF90_CREATE( TRIM(cl_filename), NF90_CLOBBER, ntrajid )
@@ -248 +248 @@
          this => this%next
       END DO
-      IF( lwp .AND. nn_verbose_level > 0 )   WRITE(numout,*) 'trajectory write to frame ', jn
+      IF( lwp .AND. nprint > 0 )   WRITE(numout,*) 'trajectory write to frame ', jn
       num_traj = jn
       !