Changeset 11149 for NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90

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:

• NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90 (modified) (2 diffs)

NEMO/branches/2019/dev_r10984_HPC-13_IRRMANN_BDY_optimization/src/OCE/BDY/bdydyn2d.F90

@@ -212 +212 @@
             IF( iiTrim > jpi .OR. iiToce > jpi .OR. iiUoce > jpi .OR. iiUoce < 1 )   CYCLE   
             !
-            zfla = pua2d(iiUoce,ij) - flagu * SQRT( grav * phur(ii, ij) ) * ( pssh(iiToce,ij) - sshdta(iiTrim,ij) )
+            zfla = dta%u2d(jb) - flagu * SQRT( grav * phur(ii, ij) ) * ( pssh(iiToce,ij) - sshdta(iiTrim,ij) )
             !
             ! jchanut tschanges, use characteristics method (Blayo et Debreu, 2005) :
             ! mix Flather scheme with velocity of the ocean next to the rim
-            pua2d(ii,ij) =  z1_2 * ( dta%u2d(jb) + zfla )
+            pua2d(ii,ij) =  z1_2 * ( pua2d(iiUoce,ij) + zfla )
          END IF
       END DO
@@ -235 +235 @@
             IF( ijTrim > jpj .OR. ijToce > jpj .OR. ijVoce > jpj .OR. ijVoce < 1 )   CYCLE
             !
-            zfla = pva2d(ii,ijVoce) - flagv * SQRT( grav * phvr(ii, ij) ) * ( pssh(ii,ijToce) - sshdta(ii,ijTrim) )
+            zfla = dta%v2d(jb) - flagv * SQRT( grav * phvr(ii, ij) ) * ( pssh(ii,ijToce) - sshdta(ii,ijTrim) )
             !
             ! jchanut tschanges, use characteristics method (Blayo et Debreu, 2005) :
             ! mix Flather scheme with velocity of the ocean next to the rim
-            pva2d(ii,ij) =  z1_2 * ( dta%v2d(jb) + zfla )
+            pva2d(ii,ij) =  z1_2 * ( pva2d(ii,ijVoce) + zfla )
          END IF
       END DO