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 11149 – NEMO

Changeset 11149


Ignore:
Timestamp:
2019-06-20T12:48:17+02:00 (5 years ago)
Author:
girrmann
Message:

dev_r10984_HPC-13 : minor modification of flather, the change in results is due to the non associativity of addition, see #2285

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90

    r11074 r11149  
    212212            IF( iiTrim > jpi .OR. iiToce > jpi .OR. iiUoce > jpi .OR. iiUoce < 1 )   CYCLE    
    213213            ! 
    214             zfla = pua2d(iiUoce,ij) - flagu * SQRT( grav * phur(ii, ij) ) * ( pssh(iiToce,ij) - sshdta(iiTrim,ij) ) 
     214            zfla = dta%u2d(jb) - flagu * SQRT( grav * phur(ii, ij) ) * ( pssh(iiToce,ij) - sshdta(iiTrim,ij) ) 
    215215            ! 
    216216            ! jchanut tschanges, use characteristics method (Blayo et Debreu, 2005) : 
    217217            ! mix Flather scheme with velocity of the ocean next to the rim 
    218             pua2d(ii,ij) =  z1_2 * ( dta%u2d(jb) + zfla ) 
     218            pua2d(ii,ij) =  z1_2 * ( pua2d(iiUoce,ij) + zfla ) 
    219219         END IF 
    220220      END DO 
     
    235235            IF( ijTrim > jpj .OR. ijToce > jpj .OR. ijVoce > jpj .OR. ijVoce < 1 )   CYCLE 
    236236            ! 
    237             zfla = pva2d(ii,ijVoce) - flagv * SQRT( grav * phvr(ii, ij) ) * ( pssh(ii,ijToce) - sshdta(ii,ijTrim) ) 
     237            zfla = dta%v2d(jb) - flagv * SQRT( grav * phvr(ii, ij) ) * ( pssh(ii,ijToce) - sshdta(ii,ijTrim) ) 
    238238            ! 
    239239            ! jchanut tschanges, use characteristics method (Blayo et Debreu, 2005) : 
    240240            ! mix Flather scheme with velocity of the ocean next to the rim 
    241             pva2d(ii,ij) =  z1_2 * ( dta%v2d(jb) + zfla ) 
     241            pva2d(ii,ij) =  z1_2 * ( pva2d(ii,ijVoce) + zfla ) 
    242242         END IF 
    243243      END DO 
Note: See TracChangeset for help on using the changeset viewer.