Changeset 4743 for LMDZ6/branches/Portage_acc/libf/dyn3dmem/leapfrog_loc.F

Timestamp:

Oct 30, 2023, 5:37:00 PM (7 months ago)

Author:

Laurent Fairhead

Message:

Merge of ACC branch with 4740 revision from trunk

Location:

LMDZ6/branches/Portage_acc

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/leapfrog_loc.F (modified) (9 diffs)

LMDZ6/branches/Portage_acc/libf/dyn3dmem/leapfrog_loc.F

@@ -42 +42 @@
        USE temps_mod, ONLY: itaufin,jD_ref,jH_ref,day_ini,
      &                        day_ref,start_time,dt
-#ifdef CPP_XIOS
-       USE xios, ONLY: xios_update_calendar 
-#endif
+       USE mod_xios_dyn3dmem, ONLY : dyn3d_ctx_handle
+       USE lmdz_xios, ONLY: xios_update_calendar, 
+     &                      xios_set_current_context, 
+     &                      using_xios
        
       IMPLICIT NONE
@@ -1519 +1520 @@
 
 #ifdef INCA
-         if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
+         IF (ANY(type_trac == ['inca','inco'])) THEN
+            CALL finalize_inca
+!     switching back to LMDZDYN context
+!$OMP MASTER
+            IF (ok_dyn_xios) THEN
+               CALL xios_set_current_context(dyn3d_ctx_handle)
+            ENDIF
+!$OMP END MASTER
+         ENDIF
 #endif
 #ifdef REPROBUS
@@ -1568 +1577 @@
 
 #ifdef INCA
-              if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
+              IF (ANY(type_trac == ['inca','inco'])) THEN
+                 CALL finalize_inca
+!     switching back to LMDZDYN context
+!$OMP MASTER
+                 IF (ok_dyn_xios) THEN
+                    CALL xios_set_current_context(dyn3d_ctx_handle)
+                 ENDIF
+!$OMP END MASTER
+              ENDIF
 #endif
 #ifdef REPROBUS
@@ -1640 +1657 @@
 #endif
              
-#ifdef CPP_XIOS
               IF (ok_dyn_xios) THEN
 c$OMP MASTER
@@ -1649 +1665 @@
      &                 ucov,teta,pk,phi,q,masse,ps,phis)
               ENDIF
-#endif
               
           endif                 ! of if (leapf.or.(.not.leapf.and.(.not.forward)))
@@ -1735 +1750 @@
 
 #ifdef INCA
-              if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
+                 IF (ANY(type_trac == ['inca','inco'])) THEN
+                    CALL finalize_inca
+!     switching back to LMDZDYN context
+!$OMP MASTER
+                    IF (ok_dyn_xios) THEN
+                       CALL xios_set_current_context(dyn3d_ctx_handle)
+                    ENDIF
+!$OMP END MASTER
+                 ENDIF
+
 #endif
 #ifdef REPROBUS
@@ -1801 +1825 @@
 #endif
 
-#ifdef CPP_XIOS
               IF (ok_dyn_xios) THEN
 c$OMP MASTER
@@ -1810 +1833 @@
      &                 ucov,teta,pk,phi,q,masse,ps,phis)
               ENDIF
-#endif
               
            ENDIF                ! of IF(MOD(itau,iecri).EQ.0)
@@ -1842 +1864 @@
 
 #ifdef INCA
-      if (ANY(type_trac == ['inca','inco'])) CALL finalize_inca
+      IF (ANY(type_trac == ['inca','inco'])) THEN
+         CALL finalize_inca
+!     switching back to LMDZDYN context
+!$OMP MASTER
+         IF (ok_dyn_xios) THEN
+            CALL xios_set_current_context(dyn3d_ctx_handle)
+         ENDIF
+!$OMP END MASTER
+      ENDIF
+
 #endif
 #ifdef REPROBUS