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

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfgls.F90

@@ -881 +881 @@
       READ  ( numnam_cfg, namzdf_gls, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzdf_gls in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namzdf_gls )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namzdf_gls )
 
       IF(lwp) THEN                     !* Control print
@@ -903 +903 @@
          WRITE(numout,*) '      Surface roughness (m)                         rn_hsro        = ', rn_hsro
          WRITE(numout,*) '      Bottom roughness (m) (nambfr namelist)        rn_bfrz0       = ', rn_bfrz0
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -990 +991 @@
          !
       END SELECT
-
+      !
+      IF(lwp .AND. lflush) CALL flush(numout)
       !
       SELECT CASE ( nn_stab_func )     !* set the parameters of the stability functions
@@ -1066 +1068 @@
          !
       END SELECT
-    
+      !
+      IF(lwp .AND. lflush) CALL flush(numout) 
       !                                !* Set Schmidt number for psi diffusion in the wave breaking case
       !                                     ! See Eq. (13) of Carniel et al, OM, 30, 225-239, 2009
@@ -1118 +1121 @@
          WRITE(numout,*) 'rl_sf   = ',rl_sf
          WRITE(numout,*)
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -1194 +1198 @@
             ELSE                        
                IF(lwp) WRITE(numout,*) ' ===>>>> : previous run without gls scheme, en and mxln computed by iterative loop'
+               IF(lwp .AND. lflush) CALL flush(numout)
                en  (:,:,:) = rn_emin
                mxln(:,:,:) = 0.05        
@@ -1204 +1209 @@
          ELSE                                   !* Start from rest
             IF(lwp) WRITE(numout,*) ' ===>>>> : Initialisation of en and mxln by background values'
+            IF(lwp .AND. lflush) CALL flush(numout)
             en  (:,:,:) = rn_emin
             mxln(:,:,:) = 0.05       
@@ -1211 +1217 @@
          !                                   ! -------------------
          IF(lwp) WRITE(numout,*) '---- gls-rst ----'
+         IF(lwp .AND. lflush) CALL flush(numout)
          IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'en'   , en     )