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

Timestamp:

2006-10-05T17:53:31+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_072 : CT : - lights modifications to ensure good control prints for the restartability & reproductibility tests

• build all ocean.output_XXXX files only if logical namelist ln_ctl is TRUE, in all case keep the initial ocean.output file (require a new namelist namctl)
• conditionning some prints using nprint parameter

File:

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

trunk/NEMO/OPA_SRC/opa.F90

@@ -166 +166 @@
       CHARACTER (len=20) ::   namelistname
       CHARACTER (len=28) ::   file_out
+      NAMELIST/namctl/  ln_ctl, nprint, nictls, nictle,   &
+         &              isplt , jsplt , njctls, njctle, nbench
       !!----------------------------------------------------------------------
 
@@ -178 +180 @@
             &         'SEQUENTIAL', 1, numout, .FALSE., 1 )
       ENDIF
-
-      namelistname = 'namelist'
-      CALL ctlopn( numnam, namelistname, 'OLD', 'FORMATTED', 'SEQUENTIAL',   &
-         &           1, numout, .FALSE., 1 )
 
       WRITE(numout,*)
@@ -191 +189 @@
       WRITE(numout,*)
 
+      namelistname = 'namelist'
+      CALL ctlopn( numnam, namelistname, 'OLD', 'FORMATTED', 'SEQUENTIAL',   &
+         &           1, numout, .FALSE., 1 )
+
+      ! Namelist namctl : Control prints & Benchmark
+      REWIND( numnam )
+      READ  ( numnam, namctl )
+
       ! Nodes selection
       narea = mynode()
@@ -196 +202 @@
       lwp   = narea == 1
 
-      IF( lk_mpp )   THEN
-         CLOSE( numout )       ! standard model output file
-         WRITE(file_out,FMT="('ocean.output_',I4.4)") narea-1
-         IF ( numout /= 0 .AND. numout /= 6 ) THEN 
-            CALL ctlopn( numout, file_out, 'UNKNOWN', 'FORMATTED',   &
-                 &         'SEQUENTIAL', 1, numout, .FALSE., 1 )
+      ! open additionnal listing
+      IF( ln_ctl )   THEN
+         IF( narea-1 > 0 )   THEN
+            WRITE(file_out,FMT="('ocean.output_',I4.4)") narea-1
+            IF( numout /= 0 .AND. numout /= 6 ) THEN 
+               CALL ctlopn( numout, file_out, 'UNKNOWN', 'FORMATTED',   &
+                  &         'SEQUENTIAL', 1, numout, .FALSE., 1 )
+            ENDIF
+            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
-         !
-         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
 
@@ -220 +229 @@
       IF(lwp) WRITE(numout,cform_aaa)       ! Flag AAAAAAA
 
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'opa_init: Control prints & Benchmark'
+         WRITE(numout,*) '~~~~~~~~ '
+         WRITE(numout,*) '          Namelist namctl'
+         WRITE(numout,*) '             run control (for debugging)     ln_ctl    = ', ln_ctl
+         WRITE(numout,*) '             level of print                  nprint    = ', nprint
+         WRITE(numout,*) '             Start i indice for SUM control  nictls    = ', nictls
+         WRITE(numout,*) '             End i indice for SUM control    nictle    = ', nictle
+         WRITE(numout,*) '             Start j indice for SUM control  njctls    = ', njctls
+         WRITE(numout,*) '             End j indice for SUM control    njctle    = ', njctle
+         WRITE(numout,*) '             number of proc. following i     isplt     = ', isplt
+         WRITE(numout,*) '             number of proc. following j     jsplt     = ', jsplt
+         WRITE(numout,*) '             benchmark parameter (0/1)       nbench    = ', nbench
+      ENDIF
                                             ! Domain decomposition
       IF( jpni*jpnj == jpnij ) THEN