Changeset 14943

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.

Location:

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE

Files:

• DOM/istate.F90 (modified) (2 diffs)
• TRA/trasbc.F90 (modified) (3 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

NEMO/branches/2021/dev_r14318_RK3_stage1/src/OCE/TRA/trasbc.F90

@@ -143 +143 @@
             sbc_tsc_b(ji,jj,:) = sbc_tsc(ji,jj,:)
          END_2D
+#if defined key_RK3
          IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only on the last tile
             IF( lrst_oce ) THEN           !==  write sbc_tsc in the ocean restart file  ==!
@@ -149 +150 @@
             ENDIF
          ENDIF
+#endif
       ENDIF
       !                             !==  Now sbc tracer content fields  ==!
@@ -173 +175 @@
       END DO
       !
+#if ! defined key_RK3
+      IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only on the last tile
+         IF( lrst_oce ) THEN           !==  write sbc_tsc in the ocean restart file  ==!
+            CALL iom_rstput( kt, nitrst, numrow, 'sbc_hc_b', sbc_tsc(:,:,jp_tem) )
+            CALL iom_rstput( kt, nitrst, numrow, 'sbc_sc_b', sbc_tsc(:,:,jp_sal) )
+         ENDIF
+      ENDIF
+#endif
       !
       !----------------------------------------