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

Timestamp:

Jul 10, 2023, 1:40:39 AM (11 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/parallel_lmdz.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90

@@ -384 +384 @@
     subroutine Finalize_parallel
     USE lmdz_mpi
-#ifdef CPP_XIOS
     ! ug Pour les sorties XIOS
-        USE wxios
-#endif
+        USE wxios
+
 #ifdef CPP_COUPLE
 ! Use of Oasis-MCT coupler 
@@ -416 +415 @@
 
       if (type_ocean == 'couple') then
-#ifdef CPP_XIOS
-    !Fermeture propre de XIOS
-      CALL wxios_close()
-#else
+        IF (using_xios) THEN
+          !Fermeture propre de XIOS
+          CALL wxios_close()
+        ELSE
 #ifdef CPP_COUPLE
-         call prism_terminate_proto(ierr)
-         IF (ierr .ne. PRISM_Ok) THEN
-            call abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
-         endif
+           call prism_terminate_proto(ierr)
+           IF (ierr .ne. PRISM_Ok) THEN
+              call abort_gcm('Finalize_parallel',' Probleme dans prism_terminate_proto ',1)
+           endif
 #endif 
-#endif
+        ENDIF
       else
-#ifdef CPP_XIOS
-    !Fermeture propre de XIOS
-      CALL wxios_close()
-#endif
-      IF (using_mpi) call MPI_FINALIZE(ierr)
+        IF (using_xios) THEN
+          !Fermeture propre de XIOS
+          CALL wxios_close()
+        ENDIF
+        IF (using_mpi) call MPI_FINALIZE(ierr)
       end if