Changes from branches/UKMO/dev_r5518_GO6_package at r12407 to branches/UKMO/dev_r5518_GO6_XIOS25_cpl at r12796

File:

• branches/UKMO/dev_r5518_GO6_XIOS25_cpl/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_XIOS25_cpl/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -26 +26 @@
 #if defined key_oasis3
    USE mod_oasis                    ! OASIS3-MCT module
+#if defined key_iomput && defined key_xios25
+   USE xios, ONLY:xios_oasis_enddef
+#endif
 #endif
    USE par_oce                      ! ocean parameters
@@ -414 +417 @@
       ! End of definition phase
       !------------------------------------------------------------------
-      
+#if defined key_iomput && defined key_xios25
+!needed for XIOS 2.5
+      CALL xios_oasis_enddef()
+#endif
       CALL oasis_enddef(nerror)
       IF( nerror /= OASIS_Ok )   CALL oasis_abort ( ncomp_id, 'cpl_define', 'Failure in oasis_enddef')