Changeset 5225 for LMDZ6/branches/Amaury_dev

Timestamp:

Sep 25, 2024, 12:37:42 AM (2 months ago)

Author:

abarral

Message:

Merge r5206 r5207

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/parallel_lmdz.F90 (modified) (3 diffs)
• libf/misc/lmdz_wxios.F90 (modified) (1 diff)
• libf/phylmd/physiq_mod.F90 (modified) (1 diff)

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

@@ -382 +382 @@
     USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
     USE lmdz_paramet
+    USE control_mod, only : ok_dyn_xios
 
 
@@ -411 +412 @@
         IF (using_xios) THEN
           !Fermeture propre de XIOS
+          ! close xios dynamic context if is defined (call LMDZDYN)
+          IF (ok_dyn_xios) THEN
+             CALL xios_context_finalize()
+          ENDIF
           CALL wxios_close()
           CALL prism_terminate_proto(ierr)
@@ -425 +430 @@
       CALL abort_gcm('Finalize_parallel', 'type_ocean = couple but CPP_COUPLE not defined', 1)
 #endif 
-    else
+
+    ELSE
       IF (using_xios) THEN
         !Fermeture propre de XIOS
+        IF (ok_dyn_xios) THEN
+          CALL xios_context_finalize()
+        END IF
+
         CALL wxios_close()
-      ENDIF
+      END IF
       IF (using_mpi) CALL MPI_FINALIZE(ierr)
-    end if
+    END IF
 
   END SUBROUTINE  Finalize_parallel

LMDZ6/branches/Amaury_dev/libf/misc/lmdz_wxios.F90

@@ -772 +772 @@
 
   SUBROUTINE wxios_close()
-    CALL xios_context_finalize()
+!    CALL xios_context_finalize()
     CALL xios_finalize()
   END SUBROUTINE wxios_close

LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90

@@ -5677 +5677 @@
         END IF
 
-        IF (is_omp_master .AND. grid_type==unstructured) CALL xios_context_finalize
-      ENDIF
+! close xios physiq context (call LMDZ)
+          IF (is_omp_master) CALL xios_context_finalize
+       ENDIF
 
       WRITE(lunout, *) ' physiq fin, nombre de steps ou cvpas = 1 : ', Ncvpaseq1