Changeset 4619 for LMDZ6/trunk/libf/dyn3d

Timestamp:

Jul 10, 2023, 1:40:39 AM (18 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

Location:

LMDZ6/trunk/libf/dyn3d

Files:

• abort_gcm.F (modified) (2 diffs)
• gcm.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3d/abort_gcm.F

@@ -12 +12 @@
       USE ioipsl_getincom
 #endif
-
-#ifdef CPP_XIOS
-    ! ug Pour les sorties XIOS
+ ! ug Pour les sorties XIOS
       USE wxios
-#endif
 
 #include "iniprint.h"
@@ -34 +31 @@
       write(lunout,*) 'in abort_gcm'
 
-#ifdef CPP_XIOS
-    !Fermeture propre de XIOS
-      CALL wxios_close()
-#endif
+      IF (using_xios) THEN
+!Fermeture propre de XIOS
+        CALL wxios_close()
+      ENDIF
 
 #ifdef CPP_IOIPSL

LMDZ6/trunk/libf/dyn3d/gcm.F90

@@ -14 +14 @@
 
 
-#ifdef CPP_XIOS
-  ! ug Pour les sorties XIOS
+! ug Pour les sorties XIOS
   USE wxios
-#endif
 
   USE filtreg_mod
@@ -156 +154 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#ifdef CPP_XIOS
-  CALL wxios_init("LMDZ")
-#endif
+  IF (using_xios) THEN
+    CALL wxios_init("LMDZ")
+  ENDIF