Changeset 4619 for LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90

Timestamp:

Jul 10, 2023, 1:40:39 AM (12 months ago)

Author:

yann meurdesoif

Message:

Suppress usage of preprocessing key CPP_XIOS.
Wrapper file is used to suppress XIOS symbol when xios is not linked and not used (-io ioipsl)
The CPP_XIOS key is replaced in model by "using_xios" boolean variable to switch between IOIPSL or XIOS output.

YM

File:

• LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90

@@ -23 +23 @@
     USE mod_prism
 #endif
-#ifdef CPP_XIOS
     USE wxios, only: wxios_init
-#endif
     IMPLICIT NONE
 
@@ -44 +42 @@
 #ifdef CPP_COUPLE
 !$OMP MASTER
-#ifdef CPP_XIOS
-        CALL wxios_init("LMDZ", outcom=COMM_LMDZ, type_ocean=type_ocean)
-#else
-        CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
-        CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
-#endif
+        IF (using_xios) THEN
+          CALL wxios_init("LMDZ", outcom=COMM_LMDZ, type_ocean=type_ocean)
+        ELSE
+          CALL prism_init_comp_proto (comp_id, 'LMDZ', ierr)
+          CALL prism_get_localcomm_proto(COMM_LMDZ,ierr)
+        ENDIF
 !$OMP END MASTER
 #endif
@@ -61 +59 @@
   SUBROUTINE Init_mpi
     USE lmdz_mpi
+    USE wxios, only: wxios_init, using_xios
 
-#ifdef CPP_XIOS
-    USE wxios, only: wxios_init
-#endif
   IMPLICIT NONE
     INTEGER             :: ierr
@@ -83 +79 @@
 ! Initialisation de XIOS
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#ifdef CPP_XIOS
-      WRITE(*,*)'IN Init_mpi call wxios_init'
-      CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
-#endif
+      IF (using_xios) THEN
+        WRITE(*,*)'IN Init_mpi call wxios_init'
+        CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
+      ENDIF
 !$OMP END MASTER