Changeset 1164

Timestamp:

2008-07-08T17:37:09+02:00 (16 years ago)

Author:

ctlod

Message:

trunk: correct a wrong DO WHILE sequence, see ticket: #230 and update step_c1d.F90 related to ticket #223

Location:

trunk/NEMO

Files:

• C1D_SRC/step_c1d.F90 (modified) (1 diff)
• OPA_SRC/SBC/sbcrnf.F90 (modified) (1 diff)

trunk/NEMO/C1D_SRC/step_c1d.F90

@@ -136 +136 @@
          avmv(:,:,:) = avm0 * vmask(:,:,:)
       ENDIF
-      IF( nn_runoff /=0 ) THEN                              ! increase diffusivity at rivers mouths
-         DO jk = 2, nkrnf   ;   avt(:,:,jk) = avt(:,:,jk) + rn_avt_rnf * rnfmsk(:,:)   ;   END DO
+
+      IF( ln_rnf_mouth ) THEN                                ! increase diffusivity at rivers mouths
+         DO jk = 2, nkrnf   ;   avt(:,:,jk) = avt(:,:,jk) + 2.e0 * rn_avt_rnf * rnfmsk(:,:)   ;   END DO
       ENDIF
       IF( ln_zdfevd )   CALL zdf_evd( kstp )                 ! enhanced vertical eddy diffusivity

trunk/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -171 +171 @@
          IF( rn_hrnf > 0.e0 ) THEN
             nkrnf = 2
-            DO WHILE( nkrnf == jpkm1 .OR. gdepw_0(nkrnf) > rn_hrnf )   ;   nkrnf = nkrnf + 1   ;   END DO
+            DO WHILE( nkrnf /= jpkm1 .AND. gdepw_0(nkrnf+1) < rn_hrnf )   ;   nkrnf = nkrnf + 1   ;   END DO
             IF( ln_sco )   &
                CALL ctl_warn( 'sbc_rnf: number of levels over which Kz is increased is computed for zco...' )