Changeset 6220 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable

Timestamp:

2016-01-06T17:21:02+01:00 (8 years ago)

Author:

jpalmier

Message:

JPALM -- 06-01-2016 -- debugg CFC diag-restart reading and writing

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (4 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -300 +300 @@
       fq1 = MAXVAL(qint_idtra(:,:,1))
       fq2 = SUM(qint_idtra(:,:,1))
-      if (lwp) write (numout,'(a,3f15.5)') 'qint_idtra ', fq0, fq1, fq2
+      if (lwp) write (numout,'(a,3f15.5)') 'qint_IDTRA ', fq0, fq1, fq2
 #endif
       !
 #if defined key_cfc
-      DO jn = jp_cfc0, jp_cfc1
+      DO jl = 1, jp_cfc
+         jn = jp_cfc0 + jl - 1
          IF( iom_varid( numrtr, 'qint_'//ctrcnm(jn), ldstop = .FALSE. ) > 0 ) THEN
             !! YES; in which case read them
             !!
             IF(lwp) WRITE(numout,*) ' CFC averaged properties present - reading in ...'
-            CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) )
+            CALL iom_get( numrtr, jpdom_autoglo, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jl) )
          ELSE
             !! NO; in which case set them to zero
@@ -319 +320 @@
          !! calculate stats on these fields
          IF(lwp) WRITE(numout,*) ' CFC averaged properties stats (min, max, sum) ...'
-         fq0 = MINVAL(qint_cfc(:,:,jn))
-         fq1 = MAXVAL(qint_cfc(:,:,jn))
-         fq2 = SUM(qint_cfc(:,:,jn))
+         fq0 = MINVAL(qint_cfc(:,:,jl))
+         fq1 = MAXVAL(qint_cfc(:,:,jl))
+         fq2 = SUM(qint_cfc(:,:,jl))
          if (lwp) write (numout,'(a,3f15.5)') 'qint_'//ctrcnm(jn), fq0, fq1, fq2
       END DO
@@ -336 +337 @@
       INTEGER, INTENT( in ) ::   kt    ! ocean time-step index
       !!
-      INTEGER  :: jn
+      INTEGER  :: jn, jl
       REAL(wp) :: zarak0
       !! AXY (05/11/13): temporary variables
@@ -459 +460 @@
       fq1 = MAXVAL(qint_idtra(:,:,1))
       fq2 = SUM(qint_idtra(:,:,1))
-      if (lwp) write (numout,'(a,3f15.5)') 'qint_idtra ', fq0, fq1, fq2
+      if (lwp) write (numout,'(a,3f15.5)') 'qint_IDTRA ', fq0, fq1, fq2
 #endif
       !
 #if defined key_cfc
-      DO jn = jp_cfc0, jp_cfc1
+      DO jl = 1, jp_cfc
+         jn = jp_cfc0 + jl - 1
          IF(lwp) WRITE(numout,*) ' CFC averaged properties - writing out ...'
-         CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jn) )
+         CALL iom_rstput( kt, nitrst, numrtw, 'qint_'//ctrcnm(jn), qint_cfc(:,:,jl) )
          !!
          !! calculate stats on these fields
          IF(lwp) WRITE(numout,*) ' CFC averaged properties stats (min, max, sum) ...'
-         fq0 = MINVAL(qint_cfc(:,:,jn))
-         fq1 = MAXVAL(qint_cfc(:,:,jn))
-         fq2 = SUM(qint_cfc(:,:,jn))
+         fq0 = MINVAL(qint_cfc(:,:,jl))
+         fq1 = MAXVAL(qint_cfc(:,:,jl))
+         fq2 = SUM(qint_cfc(:,:,jl))
          if (lwp) write (numout,'(a,3f15.5)') 'qint_'//ctrcnm(jn), fq0, fq1, fq2
       END DO