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

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -136 +136 @@
          IF(lwp) THEN 
          WRITE(numout,*) " ! restore original density"
+         IF(lflush) CALL flush(numout)
          ENDIF
          rhd(:,:,:) = z_rhd_st(:,:,:)     ! restore original density
@@ -176 +177 @@
       READ  ( numnam_cfg, namdyn_hpg, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_hpg in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namdyn_hpg )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namdyn_hpg )
       !
       IF(lwp) THEN                   ! Control print
@@ -190 +191 @@
          WRITE(numout,*) '      s-coord. (Pressure Jacobian: Cubic polynomial)    ln_hpg_prj    = ', ln_hpg_prj
          WRITE(numout,*) '      time stepping: centered (F) or semi-implicit (T)  ln_dynhpg_imp = ', ln_dynhpg_imp
+         IF(lflush) CALL flush(numout)
       ENDIF
       !
@@ -260 +262 @@
          IF(lwp) WRITE(numout,*) 'dyn:hpg_zco : hydrostatic pressure gradient trend'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   z-coordinate case '
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF
 
@@ -325 +328 @@
          IF(lwp) WRITE(numout,*) 'dyn:hpg_zps : hydrostatic pressure gradient trend'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   z-coordinate with partial steps - vector optimization'
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF
 
@@ -423 +427 @@
          IF(lwp) WRITE(numout,*) 'dyn:hpg_sco : hydrostatic pressure gradient trend'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, OPA original scheme used'
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF
 
@@ -514 +519 @@
          IF(lwp) WRITE(numout,*) 'dyn:hpg_isf : hydrostatic pressure gradient trend for ice shelf'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, OPA original scheme used'
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF
 
@@ -768 +774 @@
          IF(lwp) WRITE(numout,*) 'dyn:hpg_djc : hydrostatic pressure gradient trend'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, density Jacobian with cubic polynomial scheme'
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF
 
@@ -1001 +1008 @@
          IF(lwp) WRITE(numout,*) 'dyn:hpg_prj : hydrostatic pressure gradient trend'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   s-coordinate case, cubic spline pressure Jacobian'
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF