Changeset 895 for trunk/NEMO/OPA_SRC/SBC/sbcfwb.F90

Timestamp:

2008-04-21T17:32:02+02:00 (16 years ago)

Author:

rblod

Message:

Fix small bugs in sea-ice (previous commit) and old flyspray: 189, 185, 161

File:

• trunk/NEMO/OPA_SRC/SBC/sbcfwb.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcfwb.F90

@@ -60 +60 @@
       INTEGER, INTENT( in ) ::   kn_fwb   ! ocean time-step index
       !!
-      INTEGER  ::   inum = 11             ! temporary logical unit
+      INTEGER  ::   inum                  ! temporary logical unit
       INTEGER  ::   ikty, iyear           ! 
       LOGICAL  ::   llbon
-      CHARACTER (len=32) ::   clname = 'EMPave_old.dat'
+      CHARACTER (len=32) ::   clname 
       REAL(wp) ::   z_emp                 ! temporary scalars
       !!----------------------------------------------------------------------
@@ -98 +98 @@
          IF( kt == nit000 ) THEN
             ! Read the corrective factor on precipitations (empold)
-            INQUIRE( FILE=clname, EXIST=llbon )
-            IF( llbon ) THEN
-               OPEN ( inum, FILE=clname)
-               READ ( inum, "(24X,I8,2ES24.16)" ) iyear, a_fwb_b, a_fwb
-               CLOSE( inum )
-               empold = a_fwb                  ! current year freshwater budget correction
-               !                               ! estimate from the previous year budget
-               IF(lwp)WRITE(numout,*)
-               IF(lwp)WRITE(numout,*)'sbc_fwb : year = ',iyear  , ' freshwater budget correction = ', empold
-               IF(lwp)WRITE(numout,*)'          year = ',iyear-1, ' freshwater budget read       = ', a_fwb
-               IF(lwp)WRITE(numout,*)'          year = ',iyear-2, ' freshwater budget read       = ', a_fwb_b
-            ELSE
-               WRITE(ctmp1,*)'sbc_fwb : unable to read the file', clname
-               CALL ctl_stop( ctmp1 )
-            ENDIF
-         ENDIF
+            clname = 'EMPave_old.dat'
+            CALL ctlopn( inum, clname, 'OLD', 'FORMATTED', 'SEQUENTIAL',   &
+               &           1, numout, .FALSE., 1 )
+
+            READ ( inum, "(24X,I8,2ES24.16)" ) iyear, a_fwb_b, a_fwb
+            CLOSE( inum )
+            empold = a_fwb                  ! current year freshwater budget correction
+            !                               ! estimate from the previous year budget
+            IF(lwp)WRITE(numout,*)
+            IF(lwp)WRITE(numout,*)'sbc_fwb : year = ',iyear  , ' freshwater budget correction = ', empold
+            IF(lwp)WRITE(numout,*)'          year = ',iyear-1, ' freshwater budget read       = ', a_fwb
+            IF(lwp)WRITE(numout,*)'          year = ',iyear-2, ' freshwater budget read       = ', a_fwb_b
+         ENDIF   
          ! 
          ! Update empold if new year start
@@ -134 +131 @@
          !
          ! save empold value in a file
-         IF( kt == nitend ) THEN
-            OPEN( inum, FILE='EMPave.dat' )
+         IF( kt == nitend .AND. lwp ) THEN
+            clname = 'EMPav.dat'    
+            CALL ctlopn( inum, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',   &
+               &           1, numout, .FALSE., 0 )
             WRITE(inum, "(24X,I8,2ES24.16)" ) nyear, a_fwb_b, a_fwb
          ENDIF