Changeset 13745 for NEMO/branches/2020

Timestamp:

2020-11-06T19:28:22+01:00 (3 years ago)

Author:

hadcv

Message:

#2365: Corrections for ORCA2 and to pass SETTE

Location:

NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE

Files:

• DOM/domutl.F90 (modified) (3 diffs)
• DOM/dtatsd.F90 (modified) (4 diffs)
• DYN/dynhpg.F90 (modified) (1 diff)
• TRA/trabbl.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/DOM/domutl.F90

@@ -116 +116 @@
 
 
-   PURE FUNCTION is_tile_2d( pt )
+   FUNCTION is_tile_2d( pt )
       !!
       REAL(wp), DIMENSION(:,:), INTENT(in) ::   pt
@@ -129 +129 @@
 
 
-   PURE FUNCTION is_tile_3d( pt )
+   FUNCTION is_tile_3d( pt )
       !!
       REAL(wp), DIMENSION(:,:,:), INTENT(in) ::   pt
@@ -142 +142 @@
 
 
-   PURE FUNCTION is_tile_4d( pt )
+   FUNCTION is_tile_4d( pt )
       !!
       REAL(wp), DIMENSION(:,:,:,:), INTENT(in) ::   pt

NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/DOM/dtatsd.F90

@@ -141 +141 @@
       INTEGER ::   ji, jj, jk, jl, jkk   ! dummy loop indicies
       INTEGER ::   ik, il0, il1, ii0, ii1, ij0, ij1   ! local integers
+      INTEGER ::   itile
       REAL(wp)::   zl, zi                             ! local scalars
       REAL(wp), DIMENSION(jpk) ::  ztp, zsp   ! 1D workspace
@@ -146 +147 @@
       !
       IF( ntile == 0 .OR. ntile == 1 )  THEN                                         ! Do only for the full domain
+         itile = ntile
          IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = 0 )            ! Use full domain
             CALL fld_read( kt, 1, sf_tsd )   !==   read T & S data at kt time step   ==!
@@ -179 +181 @@
          ENDIF
 !!gm end
-         IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = 1 )            ! Revert to tile domain
-      ENDIF
-      !
-      DO_3D( 0, 0, 0, 0, 1, jpk )
+         IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = itile )            ! Revert to tile domain
+      ENDIF
+      !
+      DO_3D( 1, 1, 1, 1, 1, jpk )
          ptsd(ji,jj,jk,jp_tem) = sf_tsd(jp_tem)%fnow(ji,jj,jk)    ! NO mask
          ptsd(ji,jj,jk,jp_sal) = sf_tsd(jp_sal)%fnow(ji,jj,jk)
@@ -225 +227 @@
       ELSE                                !==   z- or zps- coordinate   ==!
          !                             
-         DO_3D( 0, 0, 0, 0, 1, jpk )
+         DO_3D( 1, 1, 1, 1, 1, jpk )
             ptsd(ji,jj,jk,jp_tem) = ptsd(ji,jj,jk,jp_tem) * tmask(ji,jj,jk)    ! Mask
             ptsd(ji,jj,jk,jp_sal) = ptsd(ji,jj,jk,jp_sal) * tmask(ji,jj,jk)

NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/DYN/dynhpg.F90

@@ -303 +303 @@
       REAL(wp) ::   zcoef0, zcoef1, zcoef2, zcoef3   ! temporary scalars
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: zhpi, zhpj
-      REAL(wp), DIMENSION(jpi,jpj,1)   :: zgtsu, zgtsv
+      REAL(wp), DIMENSION(jpi,jpj,jpts)   :: zgtsu, zgtsv
       REAL(wp), DIMENSION(jpi,jpj)     :: zgru, zgrv
       !!----------------------------------------------------------------------

NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/trabbl.F90

@@ -142 +142 @@
          IF( ntile == 0 .OR. ntile == nijtile ) THEN                       ! Do only on the last tile
             ! lateral boundary conditions ; just need for outputs
+            ! NOTE: The results change along the north fold if this is removed
+            CALL lbc_lnk_multi( 'trabbl', utr_bbl, 'U', 1.0_wp , vtr_bbl, 'V', 1.0_wp )
             CALL iom_put( "uoce_bbl", utr_bbl )  ! bbl i-transport
             CALL iom_put( "voce_bbl", vtr_bbl )  ! bbl j-transport
@@ -238 +240 @@
       INTEGER  ::   iis , iid , ijs , ijd    ! local integers
       INTEGER  ::   ikus, ikud, ikvs, ikvd   !   -       -
+      INTEGER  ::   isi, isj                 !   -       -
       REAL(wp) ::   zbtr, ztra               ! local scalars
       REAL(wp) ::   zu_bbl, zv_bbl           !   -      -
       !!----------------------------------------------------------------------
       !
+      IF( ntsi == Nis0 ) THEN ; isi = 1 ; ELSE ; isi = 0 ; ENDIF    ! Avoid double-counting when using tiling
+      IF( ntsj == Njs0 ) THEN ; isj = 1 ; ELSE ; isj = 0 ; ENDIF
       !                                                          ! ===========
       DO jn = 1, kjpt                                            ! tracer loop
          !                                                       ! ===========
-         DO_2D( 1, 0, 1, 0 )            ! CAUTION start from i=1 to update i=2 when cyclic east-west
+         DO_2D( isi, 0, isj, 0 )            ! CAUTION start from i=1 to update i=2 when cyclic east-west
             IF( utr_bbl(ji,jj) /= 0.e0 ) THEN            ! non-zero i-direction bbl advection
                ! down-slope i/k-indices (deep)      &   up-slope i/k indices (shelf)