Changeset 895

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

Location:

trunk/NEMO

Files:

• LIM_SRC_3/limdia.F90 (modified) (1 diff)
• LIM_SRC_3/limupdate.F90 (modified) (1 diff)
• OPA_SRC/DIA/diawri.F90 (modified) (1 diff)
• OPA_SRC/LDF/ldfeiv.F90 (modified) (1 diff)
• OPA_SRC/SBC/sbcfwb.F90 (modified) (3 diffs)

trunk/NEMO/LIM_SRC_3/limdia.F90

@@ -579 +579 @@
        clname = 'ice.evolu'
        irecl = ( jpchinf + 1 ) * nvinfo 
-       CALL ctlopn( numevo_ice, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',
+       CALL ctlopn( numevo_ice, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',    &
           &         irecl, numout, lwp, 1 )
 

trunk/NEMO/LIM_SRC_3/limupdate.F90

@@ -52 +52 @@
    !! * Accessibility
    PUBLIC lim_update ! routine called by ice_step
+
+   !! * Substitutions
+#  include "vectopt_loop_substitute.h90"
 
    !! * Module variables

trunk/NEMO/OPA_SRC/DIA/diawri.F90

@@ -169 +169 @@
 
          ! WRITE root name in date.file for use by postpro
-         CALL dia_nam( clhstnam, nwrite,' ' )
-         clname = 'date.file'
-         CALL ctlopn( inum, clname,  'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', 1, numout, lwp, 1 )
-         WRITE(inum,*) clhstnam
-         CLOSE(inum)
+         IF( lwp) THEN
+            CALL dia_nam( clhstnam, nwrite,' ' )
+            clname = 'date.file'
+            CALL ctlopn( inum, clname,  'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', 1, numout, lwp, 1 )
+            WRITE(inum,*) clhstnam
+            CLOSE(inum)
+         ENDIF
 
          ! Define the T grid FILE ( nid_T )

trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90

@@ -137 +137 @@
             ! Compute aeiw by multiplying Ro^2 and T^-1
             aeiw(ji,jj) = zross(ji,jj) * zross(ji,jj) * SQRT( zah(ji,jj) / zhw(ji,jj) ) * tmask(ji,jj,1)
-            IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN   ! ORCA R02
+         END DO
+      END DO
+
+      IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN   ! ORCA R02
+         DO jj = 2, jpjm1
+!CDIR NOVERRCHK 
+            DO ji = fs_2, fs_jpim1   ! vector opt.
                ! Take the minimum between aeiw and aeiv0 for depth levels
                ! lower than 20 (21 in w- point)
                IF( mbathy(ji,jj) <= 21. ) aeiw(ji,jj) = MIN( aeiw(ji,jj), 1000. )
-            ENDIF
-         END DO
-      END DO
+            END DO
+         END DO
+      ENDIF
 
       ! Decrease the coefficient in the tropics (20N-20S) 

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