Changeset 14781 for NEMO

Timestamp:

2021-05-04T17:05:07+02:00 (3 years ago)

Author:

sparonuz

Message:

Added missing file for ICE + moved lbc_lnk_multi -> lbc_lnk

Location:

NEMO/branches/2021/dev_r14116_HPC-10_mcastril_Mixed_Precision_implementation/src

Files:

• ICE/do_loop_substitute.h90 (added)
• OCE/SBC/sbccpl.F90 (modified) (1 diff)

NEMO/branches/2021/dev_r14116_HPC-10_mcastril_Mixed_Precision_implementation/src/OCE/SBC/sbccpl.F90

@@ -1677 +1677 @@
                p_tauj(ji,jj) = zztmp2 * ( frcv(jpr_ity1)%z3(ji  ,jj+1,1) + frcv(jpr_ity1)%z3(ji,jj,1) )
             END_2D
-<<<<<<< .working
-            CALL lbc_lnk_multi( 'sbccpl', p_taui, 'U',  -1._wp, p_tauj, 'V',  -1._wp )
-||||||| .merge-left.r14199
-            CALL lbc_lnk_multi( 'sbccpl', p_taui, 'U',  -1., p_tauj, 'V',  -1. )
-=======
-            CALL lbc_lnk( 'sbccpl', p_taui, 'U',  -1., p_tauj, 'V',  -1. )
->>>>>>> .merge-right.r14642
+            CALL lbc_lnk( 'sbccpl', p_taui, 'U',  -1._wp, p_tauj, 'V',  -1._wp )
          END SELECT