Changeset 3769 for branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2013-02-01T15:56:10+01:00 (11 years ago)

Author:

smasson

Message:

dev_MERGE_2012: xios+agrif+oasis compliant

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (3 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -30 +30 @@
    !!----------------------------------------------------------------------
    USE step_oce         ! time stepping definition modules
-#if defined key_top
-   USE trcstp           ! passive tracer time-stepping      (trc_stp routine)
-#endif
-#if defined key_agrif
-   USE agrif_opa_sponge ! Momemtum and tracers sponges
-#endif
-   USE restart          ! restart
 
    IMPLICIT NONE
@@ -89 +82 @@
 #endif
                              indic = 0                ! reset to no error condition
+      IF( kstp == nit000 )   CALL iom_init            ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
       IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init)
                              CALL iom_setkt( kstp - nit000 + 1 )   ! say to iom that we are at time step kstp
@@ -276 +270 @@
       IF( lk_cpl           )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges
       !
+#if defined key_iomput
+      IF( kstp == nitend   )   CALL xios_context_finalize() ! needed for XIOS+AGRIF
+#endif
+      !
       IF( nn_timing == 1 .AND.  kstp == nit000  )   CALL timing_reset
       !