Changeset 5388


Ignore:
Timestamp:
2015-06-09T18:52:06+02:00 (5 years ago)
Author:
hadcv
Message:

Add fix for XIOS initialization in server mode for non-MPP NEMO (and include a related XIOS finalize fix for C1D).

Location:
branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90

    r5350 r5388  
    154154      IF( lrst_oce       )   CALL rst_write( kstp )        ! write output ocean restart file 
    155155      ! 
     156#if defined key_iomput 
     157      IF( kstp == nitend .OR. indic < 0 )   CALL xios_context_finalize()   ! needed for XIOS  
     158      !  
     159#endif 
    156160   END SUBROUTINE stp_c1d 
    157161 
  • branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r5350 r5388  
    102102      clname = cdname 
    103103      IF( TRIM(Agrif_CFixed()) /= '0' )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(cdname) 
    104 # if defined key_mpp_mpi 
    105104      CALL xios_context_initialize(TRIM(clname), mpi_comm_opa) 
    106 # else 
    107       CALL xios_context_initialize(TRIM(clname), 0) 
    108 # endif 
    109105      CALL iom_swap( cdname ) 
    110106 
  • branches/2014/dev_r5134_UKMO4_CF_compliance/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r4990 r5388  
    31833183   LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .FALSE.      !: mpp flag 
    31843184   LOGICAL, PUBLIC            ::   ln_nnogather          !: namelist control of northfold comms (needed here in case "key_mpp_mpi" is not used) 
    3185    INTEGER :: ncomm_ice 
     3185   INTEGER                    ::   ncomm_ice 
     3186   INTEGER, PUBLIC            ::   mpi_comm_opa          ! opa local communicator 
    31863187   !!---------------------------------------------------------------------- 
    31873188CONTAINS 
     
    31963197      CHARACTER(len=*),DIMENSION(:) ::   ldtxt 
    31973198      INTEGER ::   kumnam_ref, knumnam_cfg , kumond , kstop 
    3198       IF( PRESENT( localComm ) .OR. .NOT.PRESENT( localComm ) )   function_value = 0 
     3199      IF( PRESENT( localComm ) ) mpi_comm_opa = localComm 
     3200      function_value = 0 
    31993201      IF( .FALSE. )   ldtxt(:) = 'never done' 
    32003202      CALL ctl_opn( kumond, 'output.namelist.dyn', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. , 1 ) 
Note: See TracChangeset for help on using the changeset viewer.