Changeset 14255 for NEMO/trunk/src/OFF/nemogcm.F90

Timestamp:

2021-01-04T12:35:00+01:00 (3 years ago)

Author:

cetlod

Message:

trunk : consolidation of OFFLINE with key_qco ; use the ORCA2_OFF_TRC configuration for that purpose

File:

• NEMO/trunk/src/OFF/nemogcm.F90 (modified) (2 diffs)

NEMO/trunk/src/OFF/nemogcm.F90

@@ -138 +138 @@
          IF( istp /= nit000 )   CALL day        ( istp )         ! Calendar (day was already called at nit000 in day_init)
                                 CALL iom_setkt  ( istp - nit000 + 1, cxios_context )   ! say to iom that we are at time step kstp
-#if defined key_sed_off
-                                CALL dta_dyn_sed( istp,      Nnn      )       ! Interpolation of the dynamical fields
-#else
+#if ! defined key_sed_off
                                 CALL dta_dyn    ( istp, Nbb, Nnn, Naa )       ! Interpolation of the dynamical fields
-#endif
-#if ! defined key_sed_off
          IF( .NOT.ln_linssh ) THEN
                                 CALL dta_dyn_atf( istp, Nbb, Nnn, Naa )       ! time filter of sea  surface height and vertical scale factors
@@ -151 +147 @@
          ENDIF
                                 CALL trc_stp    ( istp, Nbb, Nnn, Nrhs, Naa ) ! time-stepping
-# if defined key_qco
-                                !r3t(:,:,Nnn) = r3t_f(:,:)                     ! update ssh to h0 ratio
-                                !r3u(:,:,Nnn) = r3u_f(:,:)
-                                !r3v(:,:,Nnn) = r3v_f(:,:)
-# endif
-#endif
          ! Swap time levels
          Nrhs = Nbb
-         Nbb = Nnn
-         Nnn = Naa
-         Naa = Nrhs
+         Nbb  = Nnn
+         Nnn  = Naa
+         Naa  = Nrhs
          !
 #if ! defined key_qco
-# if ! defined key_sed_off
          IF( .NOT.ln_linssh )   CALL dta_dyn_sf_interp( istp, Nnn )  ! calculate now grid parameters
-# endif
-#endif         
+#endif  
+
+#else
+                                CALL dta_dyn_sed( istp,      Nnn      )       ! Interpolation of the dynamical fields
+
+#endif
          CALL stp_ctl    ( istp )             ! Time loop: control and print
          istp = istp + 1