Changeset 4152 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2013-11-05T12:59:53+01:00 (11 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013 the 2nd development branch dev_r3940_CNRS4_IOCRS, see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -24 +24 @@
    !!             -   !  2010-10  (C. Ethe, G. Madec) reorganisation of initialisation phase + merge TRC-TRA
    !!            3.4  !  2011-04  (G. Madec, C. Ethe) Merge of dtatem and dtasal
+   !!                 !  2012-07  (J. Simeon, G. Madec. C. Ethe) Online coarsening of outputs
    !!----------------------------------------------------------------------
 
@@ -78 +79 @@
 !      IF (lwp) Write(*,*) 'Grid Number',Agrif_Fixed(),' time step ',kstp
 # if defined key_iomput
-      IF( Agrif_Nbstepint() == 0 )   CALL iom_swap
+      IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( "nemo" )
 # endif
 #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)
+                             indic = 0           ! reset to no error condition
+      IF( kstp == nit000 ) THEN
+                      CALL iom_init( "nemo" )      ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
+         IF( ln_crs ) CALL iom_init( "nemo_crs" )  ! initialize context for coarse grid
+      ENDIF
 
       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
+                             CALL iom_setkt( kstp - nit000 + 1, "nemo"     )   ! say to iom that we are at time step kstp
+      IF( ln_crs     )       CALL iom_setkt( kstp - nit000 + 1, "nemo_crs" )   ! say to iom that we are at time step kstp
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -173 +177 @@
       IF( lk_diaharm )   CALL dia_harm( kstp )        ! Tidal harmonic analysis
                          CALL dia_wri( kstp )         ! ocean model: outputs
+      !
+      IF( ln_crs     )   CALL crs_fld( kstp )         ! ocean model: online field coarsening & output
+
 
 #if defined key_top
@@ -277 +284 @@
       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( kstp == nitend   )  THEN
+                      CALL iom_context_finalize( "nemo"     ) ! needed for XIOS+AGRIF
+         IF( ln_crs ) CALL iom_context_finalize( "nemo_crs" ) ! 
+      ENDIF
       !
       IF( nn_timing == 1 .AND.  kstp == nit000  )   CALL timing_reset