Changeset 1255 for trunk/NEMO/TOP_SRC/CFC/trcini_cfc.F90

Timestamp:

2009-01-13T11:20:17+01:00 (15 years ago)

Author:

cetlod

Message:

minor modifications in all top models, see ticket:299

File:

• trunk/NEMO/TOP_SRC/CFC/trcini_cfc.F90 (modified) (6 diffs)

trunk/NEMO/TOP_SRC/CFC/trcini_cfc.F90

@@ -44 +44 @@
       !! ** Method  : - Read the namcfc namelist and check the parameter values
       !!----------------------------------------------------------------------
-      INTEGER  ::   ji, jj, jn, jl, jm
+      INTEGER  ::   ji, jj, jn, jl, jm, js
       REAL(wp) ::   zyy  ,  zyd
       !!----------------------------------------------------------------------
@@ -55 +55 @@
       ! Initialization of boundaries conditions
       ! --------------------------------------- 
-      qtr   (:,:,:) = 0.e0
-      xphem (:,:)   = 0.e0
-      DO jn = jp_cfc0, jp_cfc1
+      xphem (:,:)    = 0.e0
+      DO jl = 1, jp_cfc
+         jn = jp_cfc0 + jl - 1
          DO jm = 1, jphem
-            DO jl = 1, jpyear
-               p_cfc(jl,jm,jn) = 0.0
+            DO js = 1, jpyear
+               p_cfc(js,jm,jn) = 0.0
             END DO
          END DO
@@ -68 +68 @@
       ! Initialization of qint in case of  no restart 
       !----------------------------------------------
+      qtr_cfc(:,:,:) = 0.e0
       IF( .NOT. lrsttr ) THEN    
          IF(lwp) THEN
@@ -73 +74 @@
             WRITE(numout,*) 'Initialization de qint ; No restart : qint equal zero '
          ENDIF
-         DO jn = jp_cfc0, jp_cfc1
-            trn(:,:,:,jn) = 0.e0
-            qint(:,: ,jn) = 0.e0
+         DO jl = 1, jp_cfc
+            jn = jp_cfc0 + jl - 1
+            trn     (:,:,:,jn) = 0.e0
+            qint_cfc(:,:  ,jn) = 0.e0
          END DO
       ENDIF
@@ -96 +98 @@
    
       DO jn = 31, 98      !   Read file
-         READ(inum,*) zyy, p_cfc(jn,1,jp11), p_cfc(jn,1,jp12), &
-            &              p_cfc(jn,2,jp11), p_cfc(jn,2,jp12)
+         READ(inum,*) zyy, p_cfc(jn,1,1), p_cfc(jn,1,2), p_cfc(jn,2,1), p_cfc(jn,2,2)
          WRITE(numout,'(f7.2, 4f8.2)' ) &
-            &         zyy, p_cfc(jn,1,jp11), p_cfc(jn,1,jp12), &
-            &              p_cfc(jn,2,jp11), p_cfc(jn,2,jp12)
+            &         zyy, p_cfc(jn,1,1), p_cfc(jn,1,2), p_cfc(jn,2,1), p_cfc(jn,2,2)
       END DO
 
-      p_cfc(32,1:2,jp11) = 5.e-4      ! modify the values of the first years
-      p_cfc(33,1:2,jp11) = 8.e-4
-      p_cfc(34,1:2,jp11) = 1.e-6
-      p_cfc(35,1:2,jp11) = 2.e-3
-      p_cfc(36,1:2,jp11) = 4.e-3
-      p_cfc(37,1:2,jp11) = 6.e-3
-      p_cfc(38,1:2,jp11) = 8.e-3
-      p_cfc(39,1:2,jp11) = 1.e-2
+      p_cfc(32,1:2,1) = 5.e-4      ! modify the values of the first years
+      p_cfc(33,1:2,1) = 8.e-4
+      p_cfc(34,1:2,1) = 1.e-6
+      p_cfc(35,1:2,1) = 2.e-3
+      p_cfc(36,1:2,1) = 4.e-3
+      p_cfc(37,1:2,1) = 6.e-3
+      p_cfc(38,1:2,1) = 8.e-3
+      p_cfc(39,1:2,1) = 1.e-2
       
       IF(lwp) THEN        ! Control print
@@ -117 +117 @@
          DO jn = 30, 100
             WRITE(numout, '( 1I4, 4F9.2)')   &
-               &         jn, p_cfc(jn,1,jp11), p_cfc(jn,2,jp11), &
-               &             p_cfc(jn,1,jp12), p_cfc(jn,2,jp12)
+               &         jn, p_cfc(jn,1,1), p_cfc(jn,2,1), p_cfc(jn,1,2), p_cfc(jn,2,2)
          END DO
       ENDIF