Changeset 10768

Timestamp:

2019-03-15T15:54:10+01:00 (6 years ago)

Author:

acc

Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Fixes to dynnxt.F90 and step.F90 to recover identical results to source trunk version with all SETTE tests. This excludes AGRIF tests which are currently broken by the presence of the temporary pointers which will be removed once all routines have been refactored. Still to be confirmed with eORCA1

Location:

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE

Files:

• DYN/dynnxt.F90 (modified) (3 diffs)
• step.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/DYN/dynnxt.F90

@@ -339 +339 @@
          ENDIF
          !
+         ikt = Nnn
+      ELSE
+         ikt = kNm1
+         puu(:,:,:)  =  uu(:,:,:,kNp1)
+         pvv(:,:,:)  =  vv(:,:,:,kNp1)
+         pe3t(:,:,:) = e3t(:,:,:,kNp1)
+         pe3u(:,:,:) = e3u(:,:,:,kNp1)
+         pe3v(:,:,:) = e3v(:,:,:,kNp1)
       ENDIF ! neuler =/0
       !
@@ -350 +358 @@
       !
       IF(.NOT.ln_linssh ) THEN
-         hu_b(:,:) = pe3u(:,:,1) * umask(:,:,1)
-         hv_b(:,:) = pe3v(:,:,1) * vmask(:,:,1)
+         hu_b(:,:) = e3u(:,:,1,ikt ) * umask(:,:,1)
+         hv_b(:,:) = e3v(:,:,1,ikt ) * vmask(:,:,1)
          DO jk = 2, jpkm1
-            hu_b(:,:) = hu_b(:,:) + pe3u(:,:,jk) * umask(:,:,jk)
-            hv_b(:,:) = hv_b(:,:) + pe3v(:,:,jk) * vmask(:,:,jk)
+            hu_b(:,:) = hu_b(:,:) + e3u(:,:,jk,ikt ) * umask(:,:,jk)
+            hv_b(:,:) = hv_b(:,:) + e3v(:,:,jk,ikt ) * vmask(:,:,jk)
          END DO
          r1_hu_b(:,:) = ssumask(:,:) / ( hu_b(:,:) + 1._wp - ssumask(:,:) )
@@ -361 +369 @@
       !
       un_b(:,:) = e3u(:,:,1,kNp1) * uu(:,:,1,kNp1) * umask(:,:,1)
-      ub_b(:,:) = pe3u(:,:,1)     * puu(:,:,1) * umask(:,:,1)
+      ub_b(:,:) = e3u(:,:,1,ikt ) * uu(:,:,1,ikt ) * umask(:,:,1)
       vn_b(:,:) = e3v(:,:,1,kNp1) * vv(:,:,1,kNp1) * vmask(:,:,1)
-      vb_b(:,:) = pe3v(:,:,1)     * pvv(:,:,1) * vmask(:,:,1)
+      vb_b(:,:) = e3v(:,:,1,ikt ) * vv(:,:,1,ikt ) * vmask(:,:,1)
       DO jk = 2, jpkm1
          un_b(:,:) = un_b(:,:) + e3u(:,:,jk,kNp1) * uu(:,:,jk,kNp1) * umask(:,:,jk)
-         ub_b(:,:) = ub_b(:,:) + pe3u(:,:,jk)     * puu(:,:,jk) * umask(:,:,jk)
+         ub_b(:,:) = ub_b(:,:) + e3u(:,:,jk,ikt ) * uu(:,:,jk,ikt ) * umask(:,:,jk)
          vn_b(:,:) = vn_b(:,:) + e3v(:,:,jk,kNp1) * vv(:,:,jk,kNp1) * vmask(:,:,jk)
-         vb_b(:,:) = vb_b(:,:) + pe3v(:,:,jk)     * pvv(:,:,jk) * vmask(:,:,jk)
+         vb_b(:,:) = vb_b(:,:) + e3v(:,:,jk,ikt ) * vv(:,:,jk,ikt ) * vmask(:,:,jk)
       END DO
       un_b(:,:) = un_b(:,:) * r1_hu_a(:,:)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/step.F90

@@ -281 +281 @@
       !
       ! Swap time levels
-      Nrhs = Nm1
-      Nm1 = Nnn
-      Nnn = Np1
-      Np1 = Nrhs
+      IF( .NOT. (neuler == 0 .AND. kstp == nit000)  ) THEN
+         Nrhs = Nm1
+         Nm1 = Nnn
+         Nnn = Np1
+         Np1 = Nrhs
+      ENDIF
       !
       ! Update temporary pointers