Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

Timestamp:

2020-03-13T17:33:02+01:00 (4 years ago)

Author:

charris

Message:

Changes from GO6 package branch (GMED ticket 450):

svn merge -r 11035:11101 ​svn+ssh://charris@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_package

File:

• branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90 (modified) (7 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -157 +157 @@
       READ  ( numnam_cfg, namlbc, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namlbc in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namlbc )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namlbc )
       
       IF(lwp) THEN                  ! control print
@@ -514 +514 @@
       ! CAUTION : The fmask may be further modified in dyn_vor_init ( dynvor.F90 )
             
-      IF( nprint == 1 .AND. lwp ) THEN      ! Control print
+      IF( nprint > 3 .AND. lwp ) THEN      ! Control print
          imsk(:,:) = INT( tmask_i(:,:) )
          WRITE(numout,*) ' tmask_i : '
@@ -561 +561 @@
       CALL wrk_dealloc( jpi, jpj, imsk )
       CALL wrk_dealloc( jpi, jpj, zwf  )
+      !
+      IF(lwp .AND. lflush) CALL flush(numout)
       !
       IF( nn_timing == 1 )  CALL timing_stop('dom_msk')
@@ -640 +642 @@
                   nicoa(inw,1,jk) = ji
                   njcoa(inw,1,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' west  : ', jk, inw, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' west  : ', jk, inw, ji, jj
                ENDIF
                zaa = tmask(ji,jj,jk) + tmask(ji,jj+1,jk)
@@ -647 +649 @@
                   nicoa(ine,2,jk) = ji
                   njcoa(ine,2,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' east  : ', jk, ine, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' east  : ', jk, ine, ji, jj
                ENDIF
             END DO
@@ -667 +669 @@
                   nicoa(ins,3,jk) = ji
                   njcoa(ins,3,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' south : ', jk, ins, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' south : ', jk, ins, ji, jj
                ENDIF
                zaa = tmask(ji+1,jj,jk) + tmask(ji,jj,jk)
@@ -674 +676 @@
                   nicoa(inn,4,jk) = ji
                   njcoa(inn,4,jk) = jj
-                  IF( nprint == 1 ) WRITE(numout,*) ' north : ', jk, inn, ji, jj
+                  IF( nprint > 3 ) WRITE(numout,*) ' north : ', jk, inn, ji, jj
                ENDIF
             END DO