Changeset 14943 for NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DOM

Timestamp:

2021-06-03T16:53:29+02:00 (3 years ago)

Author:

acc

Message:

#2605 : Corrections to istate.F90 and trasbc.F90 so that changes to ensure restartability with key_RK3 do not break restartability without key_RK3. Both now passing SETTE tests.

File:

• NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DOM/istate.F90 (modified) (2 diffs)

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/DOM/istate.F90

@@ -158 +158 @@
       vv_b(:,:,Kmm) = vv_b(:,:,Kmm) * r1_hv(:,:,Kmm)
       !
+#if defined key_RK3
       IF( .NOT. ln_rstart ) THEN
+#endif
          ! Initialize "before" barotropic velocities. "now" values are always set but 
          ! "before" values may have been read from a restart to ensure restartability.
-         ! In the non-restart case they need to be initialised here:
+         ! In the non-restart or non-RK3 cases they need to be initialised here:
          uu_b(:,:,Kbb) = 0._wp   ;   vv_b(:,:,Kbb) = 0._wp
          DO_3D( 1, 1, 1, 1, 1, jpkm1 )
@@ -170 +172 @@
          vv_b(:,:,Kbb) = vv_b(:,:,Kbb) * r1_hv(:,:,Kbb)
          ! 
+#if defined key_RK3
       ENDIF
+#endif
       !
    END SUBROUTINE istate_init