Changeset 12555 for branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/BDY

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

Location:

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/BDY

Files:

• bdydta.F90 (modified) (2 diffs)
• bdyini.F90 (modified) (6 diffs)
• bdytides.F90 (modified) (4 diffs)
• bdyvol.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/BDY/bdydta.F90

@@ -532 +532 @@
             READ  ( numnam_cfg, nambdy_dta, IOSTAT = ios, ERR = 902 )
 902         IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_dta in configuration namelist', lwp )
-            IF(lwm) WRITE ( numond, nambdy_dta )
+            IF(lwm .AND. nprint > 2) WRITE ( numond, nambdy_dta )
 
             cn_dir_array(ib_bdy) = cn_dir
@@ -893 +893 @@
 
       ENDDO ! ib_bdy 
+
+      IF(lwp .AND. lflush) CALL flush(numout)
 
       IF( nn_timing == 1 ) CALL timing_stop('bdy_dta_init')

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -110 +110 @@
       IF( nn_timing == 1 ) CALL timing_start('bdy_init')
 
-      IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'bdy_init : initialization of open boundaries'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~'
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'bdy_init : initialization of open boundaries'
+         WRITE(numout,*) '~~~~~~~~'
+         IF(lflush) CALL flush(numout)
+      ENDIF
       !
 
@@ -131 +134 @@
       READ  ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, nambdy )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, nambdy )
 
       ! -----------------------------------------
@@ -420 +423 @@
             READ  ( numnam_cfg, nambdy_index, IOSTAT = ios, ERR = 904 )
 904         IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_index in configuration namelist', lwp )
-            IF(lwm) WRITE ( numond, nambdy_index )
+            IF(lwm .AND. nprint > 2) WRITE ( numond, nambdy_index )
 
             SELECT CASE ( TRIM(ctypebdy) )
@@ -1348 +1351 @@
       ENDIF
 
+      IF(lwp .AND. lflush) CALL flush(numout)
+
       CALL wrk_dealloc(jpi,jpj,zfmask) 
 
@@ -1722 +1727 @@
       IF ((itest==0).AND.(lwp)) WRITE(numout,*) 'NO open boundary corner found'
       !
+      IF(lwp. AND. lflush) CALL flush(numout)
+      !
       ! Other tests TBD: 
       ! segments completly on land
@@ -1757 +1764 @@
          IF(lwp) WRITE(numout,*) ' ==========  have different open bdy schemes'                                                  
          IF(lwp) WRITE(numout,*)
+         IF(lflush) CALL flush(numout)
          nstop = nstop + 1
       ENDIF

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90

@@ -99 +99 @@
          IF(lwp) WRITE(numout,*) 'bdytide_init : initialization of tidal harmonic forcing at open boundaries'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -118 +119 @@
             READ  ( numnam_cfg, nambdy_tide, IOSTAT = ios, ERR = 902 )
 902         IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_tide in configuration namelist', lwp )
-            IF(lwm) WRITE ( numond, nambdy_tide )
+            IF(lwm .AND. nprint > 2) WRITE ( numond, nambdy_tide )
             !                                               ! Parameter control and print
-            IF(lwp) WRITE(numout,*) '  '
-            IF(lwp) WRITE(numout,*) '          Namelist nambdy_tide : tidal harmonic forcing at open boundaries'
-            IF(lwp) WRITE(numout,*) '             read tidal data in 2d files: ', ln_bdytide_2ddta
-            IF(lwp) WRITE(numout,*) '             assume complex conjugate   : ', ln_bdytide_conj
-            IF(lwp) WRITE(numout,*) '             Number of tidal components to read: ', nb_harmo
-            IF(lwp) THEN 
-                    WRITE(numout,*) '             Tidal components: ' 
+            IF(lwp) THEN
+               WRITE(numout,*) '  '
+               WRITE(numout,*) '          Namelist nambdy_tide : tidal harmonic forcing at open boundaries'
+               WRITE(numout,*) '             read tidal data in 2d files: ', ln_bdytide_2ddta
+               WRITE(numout,*) '             assume complex conjugate   : ', ln_bdytide_conj
+               WRITE(numout,*) '             Number of tidal components to read: ', nb_harmo
+               WRITE(numout,*) '             Tidal components: ' 
                DO itide = 1, nb_harmo
                   WRITE(numout,*)  '                 ', Wave(ntide(itide))%cname_tide 
                END DO
-            ENDIF 
-            IF(lwp) WRITE(numout,*) ' '
+               WRITE(numout,*) ' '
+               IF(lflush) CALL flush(numout)
+            ENDIF
 
             ! Allocate space for tidal harmonics data - get size from OBC data arrays
@@ -333 +335 @@
            WRITE(numout,*) 'bdytide_update : (re)Initialization of the tidal bdy forcing at kt=',kt
            WRITE(numout,*) '~~~~~~~~~~~~~~ '
+           IF(lflush) CALL flush(numout)
         ENDIF
         !
@@ -448 +451 @@
                WRITE(numout,*) 'bdy_tide_dta : Refresh nodal factors for tidal open bdy data at kt=',kt
                WRITE(numout,*) '~~~~~~~~~~~~~~ '
+               IF(lflush) CALL flush(numout)
                ENDIF
                !

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/BDY/bdyvol.F90

@@ -87 +87 @@
          IF(lwp) WRITE(numout,*)'bdy_vol : Correction of velocities along unstructured OBC'
          IF(lwp) WRITE(numout,*)'~~~~~~~'
+         IF(lflush) CALL flush(numout)
       END IF 
 
@@ -164 +165 @@
          IF(lwp) WRITE(numout,*)'          correction velocity zubtpecor =', zubtpecor , '(m/s)'
          IF(lwp) WRITE(numout,*)'          cumulated transport ztranst   =', ztranst   , '(m3/s)'
+         IF(lflush) CALL flush(numout)
       END IF 
       !