Changeset 1579 for trunk/NEMO/OPA_SRC/opa.F90

Timestamp:

2009-08-05T12:14:11+02:00 (15 years ago)

Author:

smasson

Message:

avoid write in numout before definition of lwp, see ticket:237

File:

• trunk/NEMO/OPA_SRC/opa.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/opa.F90

@@ -179 +179 @@
       INTEGER :: localComm
 #endif
-      CHARACTER (len=20) ::   namelistname
-      CHARACTER (len=28) ::   file_out
+      CHARACTER(len=20)               ::   namelistname
+      CHARACTER(len=28)               ::   file_out
+      CHARACTER(len=80),dimension(10) ::   cltxt
+      INTEGER                         :: ji             ! local loop indicees
       NAMELIST/namctl/ ln_ctl, nprint, nictls, nictle,   &
          &             isplt , jsplt , njctls, njctle, nbench, nbit_cmp
@@ -187 +189 @@
       ! Initializations
       ! ===============
-
+      cltxt(:) = ''
       file_out = 'ocean.output'
+      namelistname = 'namelist'
       
-      ! open listing and namelist units
-      CALL ctlopn( numout, file_out, 'UNKNOWN', 'FORMATTED',   &
-         &         'SEQUENTIAL', 1, 6, .FALSE., 1 )
-
-      WRITE(numout,*)
-      WRITE(numout,*) '                 L O D Y C - I P S L'
-      WRITE(numout,*) '                     O P A model'
-      WRITE(numout,*) '            Ocean General Circulation Model'
-      WRITE(numout,*) '               version OPA 9.0  (2005) '
-      WRITE(numout,*)
-      WRITE(numout,*)
-
-      namelistname = 'namelist'
-      CALL ctlopn( numnam, namelistname, 'OLD', 'FORMATTED', 'SEQUENTIAL',   &
-         &         1, numout, .FALSE., 1 )
-
       ! Namelist namctl : Control prints & Benchmark
-      REWIND( numnam )
+      CALL ctlopn( numnam, namelistname, 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE., 1 )
+      REWIND( numnam )   ! is this really needed? we just open the file...
       READ  ( numnam, namctl )
 
@@ -221 +209 @@
 # endif
       ! Nodes selection
-      narea = mynode( localComm )
+      narea = mynode( cltxt, localComm )
 #else
 # if defined key_oasis3 || defined key_oasis4
@@ -227 +215 @@
       CALL cpl_prism_init( localComm )
       ! Nodes selection
-      narea = mynode( localComm )
+      narea = mynode( cltxt, localComm )
 # else
       ! Nodes selection
-      narea = mynode()
+      narea = mynode( cltxt )
 # endif
 #endif
       narea = narea + 1    ! mynode return the rank of proc (0 --> jpnij -1 )
-      lwp   = narea == 1
-
-      ! open additionnal listing
-      IF( ln_ctl )   THEN
-         IF( narea-1 > 0 )   THEN
-            WRITE(file_out,FMT="('ocean.output_',I4.4)") narea-1
-            CALL ctlopn( numout, file_out, 'UNKNOWN', 'FORMATTED',   &
-               &         'SEQUENTIAL', 1, numout, .FALSE., 1 )
-            lwp = .TRUE.
-            !
-            WRITE(numout,*)
-            WRITE(numout,*) '                 L O D Y C - I P S L'
-            WRITE(numout,*) '                     O P A model'
-            WRITE(numout,*) '            Ocean General Circulation Model'
-            WRITE(numout,*) '               version OPA 9.0  (2005) '
-            WRITE(numout,*) '                   MPI Ocean output '
-            WRITE(numout,*)
-            WRITE(numout,*)
-         ENDIF
+
+      lwp = narea == 1 .OR. ln_ctl   ! print control
+
+      IF( lwp ) THEN
+         ! open listing and namelist units
+         IF( narea > 1 )   WRITE(file_out, "(a,'_',i4.4)") TRIM(file_out), narea-1
+         CALL ctlopn( numout, file_out, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE., 1 )
+         
+         WRITE(numout,*)
+         WRITE(numout,*) '                 L O D Y C - I P S L'
+         WRITE(numout,*) '                     O P A model'
+         WRITE(numout,*) '            Ocean General Circulation Model'
+         WRITE(numout,*) '               version OPA 9.0  (2005) '
+         WRITE(numout,*)
+         WRITE(numout,*)
+         DO ji = 1, SIZE(cltxt)
+            IF (TRIM(cltxt(ji)) /= '') WRITE(numout,*) cltxt(ji)
+         END DO
+
       ENDIF