Changeset 4145


Ignore:
Timestamp:
2013-11-01T18:47:40+01:00 (8 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

    r3971 r4145  
    147147      IF( lrst_oce           )   CALL rst_write  ( kstp )             ! write output ocean restart file 
    148148      ! 
     149#if defined key_iomput 
     150      IF( kstp == nitend .OR. indic < 0 )   CALL xios_context_finalize()   ! needed for XIOS 
     151      ! 
     152#endif 
    149153   END SUBROUTINE stp_c1d 
    150154 
  • trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r3983 r4145  
    100100      clname = "nemo" 
    101101      IF( TRIM(Agrif_CFixed()) /= '0' )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname) 
    102 # if defined key_mpp_mpi 
    103102      CALL xios_context_initialize(TRIM(clname), mpi_comm_opa) 
    104 # else 
    105       CALL xios_context_initialize(TRIM(clname), 0) 
    106 # endif 
    107103      CALL iom_swap 
    108104 
  • trunk/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r4047 r4145  
    34463446   LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .FALSE.      !: mpp flag 
    34473447   LOGICAL, PUBLIC            ::   ln_nnogather  = .FALSE.  !: namelist control of northfold comms (needed here in case "key_mpp_mpi" is not used) 
    3448    INTEGER :: ncomm_ice 
     3448   INTEGER                    ::   ncomm_ice 
     3449   INTEGER, PUBLIC            ::   mpi_comm_opa             !: opa local communicator 
    34493450   !!---------------------------------------------------------------------- 
    34503451CONTAINS 
     
    34593460      CHARACTER(len=*),DIMENSION(:) ::   ldtxt 
    34603461      INTEGER ::   kumnam, kstop 
    3461       IF( PRESENT( localComm ) .OR. .NOT.PRESENT( localComm ) )   function_value = 0 
     3462      IF( PRESENT( localComm ) )  mpi_comm_opa = localComm 
     3463      function_value = 0 
    34623464      IF( .FALSE. )   ldtxt(:) = 'never done' 
    34633465   END FUNCTION mynode 
Note: See TracChangeset for help on using the changeset viewer.