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

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/LBC

Files:

• cla.F90 (modified) (4 diffs)
• lib_mpp.F90 (modified) (2 diffs)
• mppini.F90 (modified) (11 diffs)
• mppini_2.h90 (modified) (6 diffs)

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/LBC/cla.F90

@@ -83 +83 @@
          IF(lwp) WRITE(numout,*) 'div_cla : cross land advection on hdiv '
          IF(lwp) WRITE(numout,*) '~~~~~~~~'
+         IF(lflush) CALL flush(numout) 
          !
          IF( nbab == 1 )   CALL cla_bab_el_mandeb('ini')    ! Bab el Mandeb ( Red Sea - Indian ocean )
@@ -120 +121 @@
          IF(lwp) WRITE(numout,*) 'tra_cla : cross land advection on tracers '
          IF(lwp) WRITE(numout,*) '~~~~~~~~'
+         IF(lflush) CALL flush(numout)
       ENDIF
       !
@@ -147 +149 @@
          IF(lwp) WRITE(numout,*) 'cla_dynspg : cross land advection on (ua,va) '
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~'
+         IF(lflush) CALL flush(numout)
       ENDIF
       !
@@ -181 +184 @@
       IF(lwp) WRITE(numout,*) 'cla_init : cross land advection initialisation '
       IF(lwp) WRITE(numout,*) '~~~~~~~~~'
+      IF(lwp .AND. lflush) CALL flush(numout)
       !
       !                           ! Allocate arrays for this module

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -319 +319 @@
       mynode = mpprank
 
-      IF( mynode == 0 ) THEN
+      IF( mynode == 0 .AND. nprint > 2) THEN
          CALL ctl_opn( kumond, TRIM(ldname), 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 )
          WRITE(kumond, nammpp)      
@@ -3989 +3989 @@
       IF( iost == 0 ) THEN
          IF(ldwp) THEN
-            WRITE(kout,*) '     file   : ', clfile,' open ok'
-            WRITE(kout,*) '     unit   = ', knum
-            WRITE(kout,*) '     status = ', cdstat
-            WRITE(kout,*) '     form   = ', cdform
-            WRITE(kout,*) '     access = ', cdacce
+            IF(nprint > 0) WRITE(kout,*) '     file   : ', clfile,' open ok'
+            IF(nprint > 2) THEN
+               WRITE(kout,*) '     unit   = ', knum
+               WRITE(kout,*) '     status = ', cdstat
+               WRITE(kout,*) '     form   = ', cdform
+               WRITE(kout,*) '     access = ', cdacce
+            ENDIF
             WRITE(kout,*)
          ENDIF

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

@@ -73 +73 @@
          WRITE(numout,*) '         nimpp  = ', nimpp
          WRITE(numout,*) '         njmpp  = ', njmpp
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -137 +138 @@
       IF(lwp) WRITE(numout,*) 'mpp_init : Message Passing MPI'
       IF(lwp) WRITE(numout,*) '~~~~~~~~'
+      IF(lflush) CALL flush(numout)
 
 
@@ -287 +289 @@
       IF(lwp) WRITE(numout,*)' sum ilcit(1,j)=', zjdom, ' jpjglo=', jpjglo
       IF(lwp) WRITE(numout,*)
-
-      IF(lwp) THEN
+      IF(lwp .AND. lflush) CALL flush(numout)
+
+      IF(lwp .AND. nprint>1) THEN
          ifreq = 4
          il1   = 1
@@ -305 +308 @@
             il1 = il1+ifreq
          END DO
+         IF(lflush) CALL flush(numout)
+      ENDIF
  9200     FORMAT('     ***',20('*************',a3))
  9203     FORMAT('     *     ',20('         *   ',a3))
@@ -310 +315 @@
  9202     FORMAT(' ',i3,' *  ',20(i3,'  x',i3,'   *   '))
  9204     FORMAT('     *  ',20('      ',i3,'   *   '))
-      ENDIF
 
       ! 5. From global to local
@@ -364 +368 @@
 
      ! Save processor layout in layout.dat file 
-       IF (lwp) THEN
+       IF (lwp .AND. nprint > 1) THEN
         CALL ctl_opn( inum, 'layout.dat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, .FALSE., narea )
         WRITE(inum,'(a)') '   jpnij     jpi     jpj     jpk  jpiglo  jpjglo'
@@ -430 +434 @@
       ! Periodicity : no corner if nbondi = 2 and nperio != 1
 
-      IF(lwp) THEN
+      IF(lwp .and. nprint > 0) THEN
          WRITE(numout,*) ' nproc  = ', nproc
          WRITE(numout,*) ' nowe   = ', nowe  , ' noea   =  ', noea
@@ -447 +451 @@
          WRITE(numout,*) ' jprecj = ', jprecj , ' npnw   = ', npnw
          WRITE(numout,*)
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -456 +461 @@
          CALL mpp_ini_north
          IF(lwp) WRITE(numout,*) ' mpp_init : North fold boundary prepared for jpni >1'
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF
 
@@ -505 +511 @@
       idid(2) = 2
 
-      IF(lwp) THEN
+      IF(lwp .AND. nprint > 0) THEN
           WRITE(numout,*)
           WRITE(numout,*) 'mpp_init_ioipsl :   iloc  = ', iloc (1), iloc (2)
@@ -511 +517 @@
           WRITE(numout,*) '                    ihals = ', ihals(1), ihals(2)
           WRITE(numout,*) '                    ihale = ', ihale(1), ihale(2)
+          IF(lflush) CALL flush(numout)
       ENDIF
       !

branches/UKMO/dev_r5518_GO6_starthour_obsoper/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90

@@ -87 +87 @@
       READ  ( numnam_cfg, namzgr, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namzgr in configuration namelist', lwp )
-      IF(lwm) WRITE ( numond, namzgr )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namzgr )
 
       IF(lwp)WRITE(numout,*)
@@ -93 +93 @@
       IF(lwp)WRITE(numout,*) '~~~~~~~~'
       IF(lwp)WRITE(numout,*) ' '
+      IF(lwp .AND. lflush) CALL flush(numout)
 
       IF( jpni*jpnj < jpnij ) CALL ctl_stop( ' jpnij > jpni x jpnj impossible' )
@@ -184 +185 @@
       IF(lwp) WRITE(numout,*) ' sum ilcj(1,j)=',zjdom,' jpjglo=',jpjglo
       IF(lwp) WRITE(numout,*)
+      IF(lwp .AND. lflush) CALL flush(numout)
 
 
@@ -364 +366 @@
             il1 = il1+ifreq
          END DO
+         IF(lflush) CALL flush(numout)
  9400     FORMAT('     ***',20('*************',a3))
  9403     FORMAT('     *     ',20('         *   ',a3))
@@ -572 +575 @@
          WRITE(numout,*) ' jprecj = ', jprecj , ' npnw   = ', npnw
          WRITE(numout,*)
+         IF(lflush) CALL flush(numout)
       ENDIF
 
@@ -581 +585 @@
          CALL mpp_ini_north
          IF(lwp) WRITE(numout,*) ' mpp_init2 : North fold boundary prepared for jpni >1'
+         IF(lwp .AND. lflush) CALL flush(numout)
       ENDIF