Changeset 3765


Ignore:
Timestamp:
2013-01-24T11:39:28+01:00 (8 years ago)
Author:
smasson
Message:

dev_MERGE_2012: add missing bugfix in r3692 see ticket #1029

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

    r3764 r3765  
    307307            ! multiplied by z2dt 
    308308#if defined key_obc 
     309            IF(lk_obc) THEN 
    309310            ! caution : grad D = 0 along open boundaries 
    310311            ! Remark: The filtering force could be reduced here in the FRS zone 
    311312            !         by multiplying spgu/spgv by (1-alpha) ??   
    312             spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj) 
    313             spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj) 
     313               spgu(ji,jj) = z2dt * ztdgu * obcumask(ji,jj) 
     314               spgv(ji,jj) = z2dt * ztdgv * obcvmask(ji,jj) 
     315            ELSE 
     316               spgu(ji,jj) = z2dt * ztdgu 
     317               spgv(ji,jj) = z2dt * ztdgv 
     318            ENDIF 
    314319#elif defined key_bdy 
     320            IF(lk_bdy) THEN 
    315321            ! caution : grad D = 0 along open boundaries 
    316             spgu(ji,jj) = z2dt * ztdgu * bdyumask(ji,jj) 
    317             spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj) 
     322               spgu(ji,jj) = z2dt * ztdgu * bdyumask(ji,jj) 
     323               spgv(ji,jj) = z2dt * ztdgv * bdyvmask(ji,jj) 
     324            ELSE 
     325               spgu(ji,jj) = z2dt * ztdgu 
     326               spgv(ji,jj) = z2dt * ztdgv 
     327            ENDIF 
    318328#else 
    319329            spgu(ji,jj) = z2dt * ztdgu 
Note: See TracChangeset for help on using the changeset viewer.