Changeset 5412 for trunk/NEMOGCM/NEMO

Timestamp:

2015-06-12T20:29:43+02:00 (9 years ago)

Author:

hadcv

Message:

• Set mpi_comm_opa in non-MPP cases (addresses #1533)
• Add an xios_context_finalize in step_C1D

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

@@ -154 +154 @@
       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

@@ -102 +102 @@
       clname = cdname
       IF( TRIM(Agrif_CFixed()) /= '0' )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(cdname)
-# 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( cdname )
 

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

@@ -3185 +3185 @@
    LOGICAL, PUBLIC            ::   ln_nnogather          !: namelist control of northfold comms (needed here in case "key_mpp_mpi" is not used)
    INTEGER :: ncomm_ice
+   INTEGER, PUBLIC            ::   mpi_comm_opa          ! opa local communicator
    !!----------------------------------------------------------------------
 CONTAINS
@@ -3198 +3199 @@
       CHARACTER(len=*) ::   ldname
       INTEGER ::   kumnam_ref, knumnam_cfg , kumond , 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'
       CALL ctl_opn( kumond, TRIM(ldname), 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 )