Changeset 2038 for branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcini_cfc.F90

Timestamp:

2010-08-02T12:57:40+02:00 (14 years ago)

Author:

cetlod

Message:

Apply the merge to passive tracers, see ticket:693

File:

• branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcini_cfc.F90 (modified) (3 diffs)

branches/DEV_r2006_merge_TRA_TRC/NEMO/TOP_SRC/CFC/trcini_cfc.F90

@@ -46 +46 @@
       REAL(wp) ::   zyy  ,  zyd
       !!----------------------------------------------------------------------
+
 
       IF(lwp) WRITE(numout,*)
@@ -95 +96 @@
       END DO
    
-      DO jn = 31, 98      !   Read file
-         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)' ) &
+      ! file starts in 1931 do jn represent the year in the century.jhh
+      ! Read file till the end
+      jn = 31
+      DO WHILE ( 1 /= 2 )
+         READ(inum,*,END=100) zyy, p_cfc(jn,1,1), p_cfc(jn,1,2), p_cfc(jn,2,1), p_cfc(jn,2,2)
+         IF ( lwp) THEN
+           WRITE(numout,'(f7.2, 4f8.2)' ) &
             &         zyy, p_cfc(jn,1,1), p_cfc(jn,1,2), p_cfc(jn,2,1), p_cfc(jn,2,2)
+         ENDIF
+         jn = jn + 1
       END DO
+ 100  npyear = jn - 1
+      IF ( lwp) WRITE(numout,*) '    ', npyear ,' years read'
 
       p_cfc(32,1:2,1) = 5.e-4      ! modify the values of the first years
@@ -138 +147 @@
 
    END SUBROUTINE trc_ini_cfc
-   
+ 
 #else
    !!----------------------------------------------------------------------