Changeset 14822 for NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/TRA/trasbc.F90

Timestamp:

2021-05-10T13:32:16+02:00 (3 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/trunk@14820 (ticket #2353)}

Location:

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

Files:

• . (modified) (1 prop)
• src/OCE/TRA/trasbc.F90 (modified) (5 diffs)

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2021/dev_r14122_HPC-08_Mueller_OSMOSIS_streamlining/src/OCE/TRA/trasbc.F90

@@ -98 +98 @@
       ENDIF
       !
-      ! NOTE: [tiling-comms-merge] Many DO loop bounds changed to avoid changing results when using tiling. Some bounds were also adjusted to account for those changed in tra_atf
       IF( ntsi == Nis0 ) THEN ; isi = nn_hls ; ELSE ; isi = 0 ; ENDIF    ! Avoid double-counting when using tiling
       IF( ntsj == Njs0 ) THEN ; isj = nn_hls ; ELSE ; isj = 0 ; ENDIF
@@ -106 +105 @@
 !!gm  This should be moved into sbcmod.F90 module ? (especially now that ln_traqsr is read in namsbc namelist)
       IF( .NOT.ln_traqsr ) THEN     ! no solar radiation penetration
-         DO_2D( isj, iej, isi, iei )
+         DO_2D( isi, iei, isj, iej )
             qns(ji,jj) = qns(ji,jj) + qsr(ji,jj)      ! total heat flux in qns
             qsr(ji,jj) = 0._wp                        ! qsr set to zero
@@ -127 +126 @@
          ELSE                                             ! No restart or restart not found: Euler forward time stepping
             zfact = 1._wp
-            DO_2D( isj, iej, isi, iei )
+            DO_2D( isi, iei, isj, iej )
                sbc_tsc(ji,jj,:) = 0._wp
                sbc_tsc_b(ji,jj,:) = 0._wp
@@ -134 +133 @@
       ELSE                                !* other time-steps: swap of forcing fields
          zfact = 0.5_wp
-         DO_2D( isj, iej, isi, iei )
+         DO_2D( isi, iei, isj, iej )
             sbc_tsc_b(ji,jj,:) = sbc_tsc(ji,jj,:)
          END_2D
       ENDIF
       !                             !==  Now sbc tracer content fields  ==!
-      DO_2D( isj, iej, isi, iei )
+      DO_2D( isi, iei, isj, iej )
          sbc_tsc(ji,jj,jp_tem) = r1_rho0_rcp * qns(ji,jj)   ! non solar heat flux
          sbc_tsc(ji,jj,jp_sal) = r1_rho0     * sfx(ji,jj)   ! salt flux due to freezing/melting
       END_2D
       IF( ln_linssh ) THEN                !* linear free surface
-         DO_2D( isj, iej, isi, iei )                    !==>> add concentration/dilution effect due to constant volume cell
+         DO_2D( isi, iei, isj, iej )                    !==>> add concentration/dilution effect due to constant volume cell
             sbc_tsc(ji,jj,jp_tem) = sbc_tsc(ji,jj,jp_tem) + r1_rho0 * emp(ji,jj) * pts(ji,jj,1,jp_tem,Kmm)
             sbc_tsc(ji,jj,jp_sal) = sbc_tsc(ji,jj,jp_sal) + r1_rho0 * emp(ji,jj) * pts(ji,jj,1,jp_sal,Kmm)
@@ -155 +154 @@
       !
       DO jn = 1, jpts               !==  update tracer trend  ==!
-         ! NOTE: [tiling-comms-merge] This looped over nn_hls, which changes the results when using tiling
          DO_2D( 0, 0, 0, 0 )
             pts(ji,jj,1,jn,Krhs) = pts(ji,jj,1,jn,Krhs) + zfact * ( sbc_tsc_b(ji,jj,jn) + sbc_tsc(ji,jj,jn) )    &

@@ -1 @@
-^/utils/build/arch@14122      arch
-^/utils/build/makenemo@14122  makenemo
-^/utils/build/mk@14122        mk
-^/utils/tools@14122           tools
-^/vendors/AGRIF/dev@14122     ext/AGRIF
-^/vendors/FCM@14122           ext/FCM
-^/vendors/IOIPSL@14122        ext/IOIPSL
-^/vendors/PPR@14122           ext/PPR
+^/utils/build/arch@HEAD       arch
+^/utils/build/makenemo@HEAD   makenemo
+^/utils/build/mk@HEAD         mk
+^/utils/tools@HEAD            tools
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/FCM@HEAD            ext/FCM
+^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette_wave@13990         sette
+^/utils/CI/sette@14244        sette