Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.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/SBC/sbcrnf.F90 (modified) (13 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -148 +148 @@
          IF( ln_rstart .AND.    &                               !* Restart: read in restart file
             & iom_varid( numror, 'rnf_b', ldstop = .FALSE. ) > 0 ) THEN
-            IF(lwp) WRITE(numout,*) '          nit000-1 runoff forcing fields red in the restart file'
+            IF(lwp .AND. nprint > 0) WRITE(numout,*) '          nit000-1 runoff forcing fields red in the restart file'
             IF(nn_timing == 2)  CALL timing_start('iom_rstget')
             CALL iom_get( numror, jpdom_autoglo, 'rnf_b', rnf_b )     ! before runoff
@@ -159 +159 @@
             rnf_tsc_b(:,:,:) = rnf_tsc(:,:,:)
          ENDIF
+ 
+         IF(lwp .AND. lflush) CALL flush(numout)
+
       ENDIF
       !                                                ! ---------------------------------------- !
       IF( lrst_oce ) THEN                              !      Write in the ocean restart file     !
          !                                             ! ---------------------------------------- !
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'sbcrnf : runoff forcing fields written in ocean restart file ',   &
+         IF(lwp .AND. nprint > 0) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) 'sbcrnf : runoff forcing fields written in ocean restart file ',   &
             &                    'at it= ', kt,' date= ', ndastp
-         IF(lwp) WRITE(numout,*) '~~~~'
+            WRITE(numout,*) '~~~~'
+            IF(lflush) CALL flush(numout)
+         ENDIF
          IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'rnf_b' , rnf )
@@ -282 +288 @@
       READ  ( numnam_cfg, namsbc_rnf, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_rnf in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namsbc_rnf )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namsbc_rnf )
       !
       !                                         ! Control print
@@ -294 +300 @@
          WRITE(numout,*) '      depth of river mouth additional mixing     rn_hrnf      = ', rn_hrnf
          WRITE(numout,*) '      multiplicative factor for runoff           rn_rfact     = ', rn_rfact
+         IF(lflush) CALL flush(numout)
       ENDIF
       !                                   ! ==================
@@ -303 +310 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          runoffs inflow read in a file'
+         IF(lwp .AND. lflush) CALL flush(numout)
          IF( ierror > 0 ) THEN
             CALL ctl_stop( 'sbc_rnf: unable to allocate sf_rnf structure' )   ;   RETURN
@@ -314 +322 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          runoffs temperatures read in a file'
+         IF(lwp .AND. lflush) CALL flush(numout)
          ALLOCATE( sf_t_rnf(1), STAT=ierror  )
          IF( ierror > 0 ) THEN
@@ -326 +335 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          runoffs salinities read in a file'
+         IF(lwp .AND. lflush) CALL flush(numout)
          ALLOCATE( sf_s_rnf(1), STAT=ierror  )
          IF( ierror > 0 ) THEN
@@ -338 +348 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          runoffs depth read in a file'
+         IF(lwp .AND. lflush) CALL flush(numout)
          rn_dep_file = TRIM( cn_dir )//TRIM( sn_dep_rnf%clname )
          IF( .NOT. sn_dep_rnf%ln_clim ) THEN   ;   WRITE(rn_dep_file, '(a,"_y",i4)' ) TRIM( rn_dep_file ), nyear    ! add year 
@@ -378 +389 @@
          IF(lwp) WRITE(numout,*) '    depth over which runoffs is spread                        rn_dep_max = ', rn_dep_max
          IF(lwp) WRITE(numout,*) '     create (=1) a runoff depth file or not (=0)      nn_rnf_depth_file  = ', nn_rnf_depth_file
+         IF(lwp .AND. lflush) CALL flush(numout)
 
          CALL iom_open( TRIM( sn_rnf%clname ), inum )    !  open runoff file
@@ -431 +443 @@
          IF( nn_rnf_depth_file == 1 ) THEN      !  save  output nb levels for runoff
             IF(lwp) WRITE(numout,*) '              create runoff depht file'
+            IF(lwp .AND. lflush) CALL flush(numout)
             CALL iom_open  ( TRIM( sn_dep_rnf%clname ), inum, ldwrt = .TRUE., kiolib = jprstlib )
             CALL iom_rstput( 0, 0, inum, 'rodepth', h_rnf )
@@ -468 +481 @@
          IF(lwp) WRITE(numout,*) '             - set to zero SSS damping       (if ln_ssr=T)'
          IF(lwp) WRITE(numout,*) '             - mixed upstream-centered       (if ln_traadv_cen2=T)'
+         IF(lwp .AND. lflush) CALL flush(numout)
          !
          CALL rnf_mouth                             ! set river mouth mask
@@ -474 +488 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          No specific treatment at river mouths'
+         IF(lwp .AND. lflush) CALL flush(numout)
          rnfmsk  (:,:) = 0._wp
          rnfmsk_z(:)   = 0._wp
@@ -509 +524 @@
       IF(lwp) WRITE(numout,*) 'rnf_mouth : river mouth mask'
       IF(lwp) WRITE(numout,*) '~~~~~~~~~ '
+      IF(lwp .AND. lflush) CALL flush(numout)
       !
       cl_rnfile = TRIM( cn_dir )//TRIM( sn_cnf%clname )