Ignore:
Timestamp:
Sep 25, 2024, 12:37:42 AM (15 months ago)
Author:
abarral
Message:

Merge r5206 r5207

Location:
LMDZ6/branches/Amaury_dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/branches/Amaury_dev

  • LMDZ6/branches/Amaury_dev/libf/dyn3dmem/parallel_lmdz.F90

    r5159 r5225  
    382382    USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
    383383    USE lmdz_paramet
     384    USE control_mod, only : ok_dyn_xios
    384385
    385386
     
    411412        IF (using_xios) THEN
    412413          !Fermeture propre de XIOS
     414          ! close xios dynamic context if is defined (call LMDZDYN)
     415          IF (ok_dyn_xios) THEN
     416             CALL xios_context_finalize()
     417          ENDIF
    413418          CALL wxios_close()
    414419          CALL prism_terminate_proto(ierr)
     
    425430      CALL abort_gcm('Finalize_parallel', 'type_ocean = couple but CPP_COUPLE not defined', 1)
    426431#endif
    427     else
     432
     433    ELSE
    428434      IF (using_xios) THEN
    429435        !Fermeture propre de XIOS
     436        IF (ok_dyn_xios) THEN
     437          CALL xios_context_finalize()
     438        END IF
     439
    430440        CALL wxios_close()
    431       ENDIF
     441      END IF
    432442      IF (using_mpi) CALL MPI_FINALIZE(ierr)
    433     end if
     443    END IF
    434444
    435445  END SUBROUTINE  Finalize_parallel
Note: See TracChangeset for help on using the changeset viewer.