Changeset 13900

Timestamp:

2020-11-27T17:55:34+01:00 (4 years ago)

Author:

acc

Message:

Branch dev_r13787_OSMOSIS_IMMERSE. Fix obscure bug that was preventing reproducibility. This branch now passes SETTE both with and without the new option activated

File:

• NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/src/OCE/ZDF/zdfosm.F90 (modified) (3 diffs)

NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/src/OCE/ZDF/zdfosm.F90

@@ -670 +670 @@
 
       DO_2D( 0, 0, 0, 0 )
-       IF ( zdb_bl(ji,jj) < rn_osm_bl_thresh .or. ibld(ji,jj) + jp_ext(ji,jj) >= mbkt(ji,jj) .or. ibld(ji,jj)-imld(jj,ji) == 1 ) lpyc(ji,jj) = .FALSE. 
+       IF ( zdb_bl(ji,jj) < rn_osm_bl_thresh .or. ibld(ji,jj) + jp_ext(ji,jj) >= mbkt(ji,jj) .or. ibld(ji,jj)-imld(ji,jj) == 1 ) lpyc(ji,jj) = .FALSE. 
       END_2D
 
@@ -1154 +1154 @@
 
        ! Lateral boundary conditions on zvicos (sign unchanged), needed to caclulate viscosities on u and v grids
-       !CALL lbc_lnk( zviscos(:,:,:), 'W', 1. )
+       !CALL lbc_lnk( 'zdfosm', zviscos(:,:,:), 'W', 1.0_wp )
 
        ! GN 25/8: need to change tmask --> wmask
@@ -1314 +1314 @@
               zbeta_v_sc(ji,jj) = 1.0 -  2.0 * ( zvispyc_n_sc(ji,jj) + zvispyc_s_sc(ji,jj) ) / ( zvisml_sc(ji,jj) + epsln )
             ELSE
-              zbeta_d_sc = 1.0
-              zbeta_v_sc = 1.0
+              zbeta_d_sc(ji,jj) = 1.0
+              zbeta_v_sc(ji,jj) = 1.0
             ENDIF
           ELSE