Changeset 12144 for NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OFF/nemogcm.F90

Timestamp:

2019-12-10T13:24:43+01:00 (4 years ago)

Author:

acc

Message:

Branch 2019/fix_sn_cfctl_ticket2328. Merge in trunk changes from 11862 to 12072. Fully SETTE tested

File:

• NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OFF/nemogcm.F90 (modified) (1 diff)

NEMO/branches/2019/fix_sn_cfctl_ticket2328/src/OFF/nemogcm.F90

@@ -114 +114 @@
 #else
                                 CALL dta_dyn    ( istp )         ! Interpolation of the dynamical fields
+#endif
+                                CALL trc_stp    ( istp )         ! time-stepping
+#if ! defined key_sed_off
          IF( .NOT.ln_linssh )   CALL dta_dyn_swp( istp )         ! swap of sea  surface height and vertical scale factors
 #endif
-                                CALL trc_stp    ( istp )         ! time-stepping
                                 CALL stp_ctl    ( istp, indic )  ! Time loop: control and print
          istp = istp + 1