Changeset 516 for trunk/NEMO/OPA_SRC/prtctl.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/prtctl.F90 (modified) (10 diffs)

trunk/NEMO/OPA_SRC/prtctl.F90

@@ -22 +22 @@
       t_ctll , s_ctll ,   &  !: previous trend values
       u_ctll , v_ctll
+
+   INTEGER ::   ktime        !: time step
 
    !! * Routine accessibility
@@ -79 +81 @@
       REAL(wp), DIMENSION(:,:,:), INTENT(in), OPTIONAL :: tab3d_1
       REAL(wp), DIMENSION(:,:,:), INTENT(in), OPTIONAL :: mask1
-      CHARACTER (len=*), INTENT(in), OPTIONAL :: clinfo1
+      CHARACTER (len=*)         , INTENT(in), OPTIONAL :: clinfo1
       REAL(wp), DIMENSION(:,:)  , INTENT(in), OPTIONAL :: tab2d_2
       REAL(wp), DIMENSION(:,:,:), INTENT(in), OPTIONAL :: tab3d_2
       REAL(wp), DIMENSION(:,:,:), INTENT(in), OPTIONAL :: mask2
-      CHARACTER (len=*), INTENT(in), OPTIONAL :: clinfo2
-      INTEGER, INTENT(in), OPTIONAL :: ovlap
-      INTEGER, INTENT(in), OPTIONAL :: kdim
-      CHARACTER (len=*), INTENT(in), OPTIONAL :: clinfo3
+      CHARACTER (len=*)         , INTENT(in), OPTIONAL :: clinfo2
+      INTEGER                   , INTENT(in), OPTIONAL :: ovlap
+      INTEGER                   , INTENT(in), OPTIONAL :: kdim
+      CHARACTER (len=*)         , INTENT(in), OPTIONAL :: clinfo3
 
       !! * Local declarations
@@ -135 +137 @@
       DO jn = sind, eind
 
-         numid = 90
+         numid = 90 + jn
 
          ! Set indices for the SUM control
@@ -184 +186 @@
 
          ! Print the result
-         IF( PRESENT(clinfo2) .OR. PRESENT(tab2d_2) .OR. PRESENT(tab3d_2) )   THEN
+         IF( PRESENT(clinfo3) )   THEN
             WRITE(numid,FMT='(a,D23.16,3x,a,D23.16)')clinfo1, zsum1-zvctl1, cl2, zsum2-zvctl2
-             IF( clinfo3 == 'tra-ta' )  THEN
-                t_ctll(jn) = zsum1
-             ENDIF 
-             IF( clinfo3 == 'tra' )  THEN
+            SELECT CASE( clinfo3 )
+            CASE ( 'tra-ta' ) 
+               t_ctll(jn) = zsum1
+            CASE ( 'tra' ) 
                 t_ctll(jn) = zsum1
                 s_ctll(jn) = zsum2
-             ENDIF 
-             IF( clinfo3 == 'dyn' )   THEN
+            CASE ( 'dyn' ) 
                 u_ctll(jn) = zsum1
                 v_ctll(jn) = zsum2 
-             ENDIF
+            END SELECT
+         ELSEIF ( PRESENT(clinfo2) .OR. PRESENT(tab2d_2) .OR. PRESENT(tab3d_2) )   THEN
+            WRITE(numid,FMT='(a,D23.16,3x,a,D23.16)')clinfo1, zsum1, cl2, zsum2
          ELSE
             WRITE(numid,FMT='(a,D23.16)')clinfo1, zsum1
@@ -206 +209 @@
 
 
-   SUBROUTINE prt_ctl_info (clinfo1, ivar1, clinfo2, ivar2)
+   SUBROUTINE prt_ctl_info (clinfo1, ivar1, clinfo2, ivar2, itime)
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE prt_ctl_info  ***
@@ -223 +226 @@
       !! * Arguments
       CHARACTER (len=*), INTENT(in) ::   clinfo1
-      INTEGER, INTENT(in), OPTIONAL ::   ivar1
+      INTEGER          , INTENT(in), OPTIONAL ::   ivar1
       CHARACTER (len=*), INTENT(in), OPTIONAL ::   clinfo2
-      INTEGER, INTENT(in), OPTIONAL ::   ivar2
+      INTEGER          , INTENT(in), OPTIONAL ::   ivar2
+      INTEGER          , INTENT(in), OPTIONAL ::   itime
 
       !! * Local declarations
-      INTEGER ::  numid, jn, sind, eind
+      INTEGER ::  numid, jn, sind, eind, iltime
       !!----------------------------------------------------------------------
 
@@ -241 +245 @@
       ENDIF
 
+      ! Set to zero arrays at each new time step
+      IF( PRESENT(itime) )   THEN
+         iltime = itime
+         IF( iltime > ktime )   THEN
+            t_ctll(:) = 0.e0   ;   s_ctll(:) = 0.e0
+            u_ctll(:) = 0.e0   ;   v_ctll(:) = 0.e0
+            ktime = iltime
+         ENDIF
+      ENDIF
+
       ! Loop over each sub-domain, i.e. number of processors ijsplt
       DO jn = sind, eind
 
-         numid = 90 
+         numid = 90 + jn
 
          IF( PRESENT(ivar1) .AND. PRESENT(clinfo2) .AND. PRESENT(ivar2) )   THEN
@@ -296 +310 @@
 
       ! Initialization 
-      t_ctll (:)=0.e0
-      s_ctll (:)=0.e0
-      u_ctll (:)=0.e0
-      v_ctll (:)=0.e0
+      t_ctll(:)=0.e0
+      s_ctll(:)=0.e0
+      u_ctll(:)=0.e0
+      v_ctll(:)=0.e0
+      ktime = 1
 
       IF( lk_mpp ) THEN
@@ -330 +345 @@
 
       DO jn = sind, eind
-         numid = 90 
+         numid = 90 + jn
          WRITE(clfile_out,FMT=clb_name) jn-1
          OPEN ( UNIT=numid, FILE=TRIM(clfile_out),FORM='FORMATTED' )
@@ -345 +360 @@
          ! Print the SUM control indices
          IF( .NOT. lsp_area )   THEN
-            IF ( lk_mpp )   THEN
-               nictls = nlditl(jn) 
-               nictle = nleitl(jn)
-               njctls = nldjtl(jn)
-               njctle = nlejtl(jn)
-            ELSE
-               nictls = nimpptl(jn) + nlditl(jn) - 1
-               nictle = nimpptl(jn) + nleitl(jn) - 1
-               njctls = njmpptl(jn) + nldjtl(jn) - 1
-               njctle = njmpptl(jn) + nlejtl(jn) - 1
-            ENDIF
+            nictls = nimpptl(jn) + nlditl(jn) - 1
+            nictle = nimpptl(jn) + nleitl(jn) - 1
+            njctls = njmpptl(jn) + nldjtl(jn) - 1
+            njctle = njmpptl(jn) + nlejtl(jn) - 1
          ENDIF
          WRITE(numid,*)