Changeset 4145

Timestamp:

2013-11-01T18:47:40+01:00 (10 years ago)

Author:

hadcv

Message:

Ticket #1157 (C1D fixes): redo the fix for #1096 to work for XIOS detached mode and add xios_context_finalize.

Location:

trunk/NEMOGCM/NEMO/OPA_SRC

Files:

• C1D/step_c1d.F90 (modified) (1 diff)
• IOM/iom.F90 (modified) (1 diff)
• LBC/lib_mpp.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

@@ -147 +147 @@
       IF( lrst_oce           )   CALL rst_write  ( kstp )             ! write output ocean restart file
       !
+#if defined key_iomput
+      IF( kstp == nitend .OR. indic < 0 )   CALL xios_context_finalize()   ! needed for XIOS
+      !
+#endif
    END SUBROUTINE stp_c1d
 

trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -100 +100 @@
       clname = "nemo"
       IF( TRIM(Agrif_CFixed()) /= '0' )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname)
-# if defined key_mpp_mpi
       CALL xios_context_initialize(TRIM(clname), mpi_comm_opa)
-# else
-      CALL xios_context_initialize(TRIM(clname), 0)
-# endif
       CALL iom_swap
 

trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -3446 +3446 @@
    LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .FALSE.      !: mpp flag
    LOGICAL, PUBLIC            ::   ln_nnogather  = .FALSE.  !: namelist control of northfold comms (needed here in case "key_mpp_mpi" is not used)
-   INTEGER :: ncomm_ice
+   INTEGER                    ::   ncomm_ice
+   INTEGER, PUBLIC            ::   mpi_comm_opa             !: opa local communicator
    !!----------------------------------------------------------------------
 CONTAINS
@@ -3459 +3460 @@
       CHARACTER(len=*),DIMENSION(:) ::   ldtxt
       INTEGER ::   kumnam, kstop
-      IF( PRESENT( localComm ) .OR. .NOT.PRESENT( localComm ) )   function_value = 0
+      IF( PRESENT( localComm ) )  mpi_comm_opa = localComm
+      function_value = 0
       IF( .FALSE. )   ldtxt(:) = 'never done'
    END FUNCTION mynode