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

Timestamp:

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

Author:

hadcv

Message:

#2365: Corrections for ORCA2 and to pass SETTE

File:

• NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/DOM/dtatsd.F90 (modified) (4 diffs)

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)