New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13900 – NEMO

Changeset 13900


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r13787_OSMOSIS_IMMERSE/src/OCE/ZDF/zdfosm.F90

    r13894 r13900  
    670670 
    671671      DO_2D( 0, 0, 0, 0 ) 
    672        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.  
     672       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.  
    673673      END_2D 
    674674 
     
    11541154 
    11551155       ! Lateral boundary conditions on zvicos (sign unchanged), needed to caclulate viscosities on u and v grids 
    1156        !CALL lbc_lnk( zviscos(:,:,:), 'W', 1. ) 
     1156       !CALL lbc_lnk( 'zdfosm', zviscos(:,:,:), 'W', 1.0_wp ) 
    11571157 
    11581158       ! GN 25/8: need to change tmask --> wmask 
     
    13141314              zbeta_v_sc(ji,jj) = 1.0 -  2.0 * ( zvispyc_n_sc(ji,jj) + zvispyc_s_sc(ji,jj) ) / ( zvisml_sc(ji,jj) + epsln ) 
    13151315            ELSE 
    1316               zbeta_d_sc = 1.0 
    1317               zbeta_v_sc = 1.0 
     1316              zbeta_d_sc(ji,jj) = 1.0 
     1317              zbeta_v_sc(ji,jj) = 1.0 
    13181318            ENDIF 
    13191319          ELSE 
Note: See TracChangeset for help on using the changeset viewer.