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

Timestamp:

2019-03-25T09:38:58+01:00 (5 years ago)

Author:

davestorkey

Message:

Temporarily revert all changes to do with the time-level swapping so the
branch just does variable renaming of the 3D state variables and changes
the interfaces to the DYN and TRA routines from stp.

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/step.F90 (modified) (1 diff)

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

@@ -277 +277 @@
 !!jc2: dynnxt must be the latest call. e3t_b are indeed updated in that routine
                          CALL tra_nxt       ( kstp )  ! finalize (bcs) tracer fields at next time step and swap
-                         CALL dyn_nxt       ( kstp, Nm1, Np1, uu(:,:,:,Nnn), vv(:,:,:,Nnn), e3t(:,:,:,Nnn), e3u(:,:,:,Nnn), e3v(:,:,:,Nnn) )  ! 
+                         CALL dyn_nxt       ( kstp )  ! 
                          CALL ssh_swp       ( kstp )  ! swap of sea surface height
-      !
-      ! Swap time levels
-      IF( .NOT. (neuler == 0 .AND. kstp == nit000)  ) THEN
-         Nrhs = Nm1
-         Nm1 = Nnn
-         Nnn = Np1
-         Np1 = Nrhs
-      ENDIF
-      !
-      ! Update temporary pointers
-      CALL update_pointers()
-      !
-      ! Note that 2-time-level indices don't need to be swapped because both "before" and "now" fields are derived in dom_vvl_sf_swp
-      IF(.NOT.ln_linssh) CALL dom_vvl_sf_swp( kstp, Nm1, Nnn, Nm1_2lev, Nnn_2lev )  ! interpolate vertical scale factors for Nnn time level
+      IF(.NOT.ln_linssh) CALL dom_vvl_sf_swp( kstp )  ! interpolate vertical scale factors for Nnn time level
       !
       IF( ln_diahsb  )   CALL dia_hsb       ( kstp )  ! - ML - global conservation diagnostics