Changeset 988 for trunk

Timestamp:

2008-05-16T18:07:42+02:00 (16 years ago)

Author:

rblod

Message:

Minor bugs, see ticket #153

Location:

trunk/NEMO

Files:

• LIM_SRC_3/limrhg.F90 (modified) (2 diffs)
• OPA_SRC/TRA/tradmp.F90 (modified) (5 diffs)
• OPA_SRC/eosbn2.F90 (modified) (1 diff)
• OPA_SRC/step.F90 (modified) (1 diff)

trunk/NEMO/LIM_SRC_3/limrhg.F90

@@ -328 +328 @@
 
          DO jj = k_j1+1, k_jpj-1
-            DO ji = fs_2, fs_jpim1
+            DO ji = fs_2, jpim1   !RB bug no vect opt due to tmi
 
                !  
@@ -654 +654 @@
       DO jj = k_j1+1, k_jpj-1
 !CDIR NOVERRCHK
-         DO ji = fs_2, fs_jpim1
+         DO ji = fs_2, jpim1   !RB bug no vect opt due to tmi
             !- zdd(:,:), zdt(:,:): divergence and tension at centre 
             !- zds(:,:): shear on northeast corner of grid cells

trunk/NEMO/OPA_SRC/TRA/tradmp.F90

@@ -47 +47 @@
    LOGICAL, PUBLIC            ::   lk_tradmp = .TRUE.     !: internal damping flag
 #endif
-   REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   strdmp   !: damping salinity trend (psu/s)
    REAL(wp), PUBLIC, DIMENSION(jpi,jpj,jpk) ::   resto    !: restoring coeff. on T and S (s-1)
    
@@ -121 +120 @@
                   sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
                   ! save the salinity trend (used in flx to close the salt budget)
-                  strdmp(ji,jj,jk) = zsa
                END DO
             END DO
@@ -142 +140 @@
                   sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
                   ! save the salinity trend (used in flx to close the salt budget)
-                  strdmp(ji,jj,jk) = zsa
                END DO
             END DO
@@ -162 +159 @@
                   sa(ji,jj,jk) = sa(ji,jj,jk) + zsa
                   ! save the salinity trend (used in flx to close the salt budget)
-                  strdmp(ji,jj,jk) = zsa
                END DO
             END DO
@@ -229 +225 @@
       IF( .NOT.lk_dtasal .OR. .NOT.lk_dtatem )   &
          &   CALL ctl_stop( 'no temperature and/or salinity data define key_dtatem and key_dtasal' )
-
-      strdmp(:,:,:) = 0.e0       ! internal damping salinity trend (used in ocesbc)
 
       !                          ! Damping coefficients initialization

trunk/NEMO/OPA_SRC/eosbn2.F90

@@ -47 +47 @@
 
    PUBLIC   eos        ! called by step, istate, tranpc and zpsgrd modules
+   PUBLIC   eos_init   ! called by istate module
    PUBLIC   bn2        ! called by step module
    PUBLIC   tfreez     ! called by sbcice_... modules

trunk/NEMO/OPA_SRC/step.F90

@@ -364 +364 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
+#if defined key_oasis3
       IF( lk_cpl    )   CALL cpl_stp( kstp )                 ! coupled mode : field exchanges
+#endif
       !
    END SUBROUTINE stp