Changeset 5571 for LMDZ6/trunk/libf

Timestamp:

Mar 10, 2025, 4:50:44 PM (3 months ago)

Author:

acozic

Message:

remove call to finalize_inca from dynamic code, now this close is done from the physiq for regular and ico configuration

Location:

LMDZ6/trunk/libf

Files:

• dyn3dmem/leapfrog_loc.f90 (modified) (4 diffs)
• phylmd/physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.f90

@@ -1475 +1475 @@
      endif
 
-IF (CPPKEY_INCA) THEN
-     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
-END IF
 IF (CPPKEY_REPROBUS) THEN
      if (type_trac == 'repr') CALL finalize_reprobus
@@ -1532 +1521 @@
 !$OMP END MASTER
 
-IF (CPPKEY_INCA) THEN
-          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
-END IF
 IF (CPPKEY_REPROBUS) THEN
           if (type_trac == 'repr') CALL finalize_reprobus
@@ -1703 +1681 @@
 !$OMP END MASTER
 
-IF (CPPKEY_INCA) THEN
-             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
-
-END IF
 IF (CPPKEY_REPROBUS) THEN
              if (type_trac == 'repr') CALL finalize_reprobus
@@ -1815 +1781 @@
 !$OMP END MASTER
 
-IF (CPPKEY_INCA) THEN
-  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
-
-END IF
 IF (CPPKEY_REPROBUS) THEN
   if (type_trac == 'repr') CALL finalize_reprobus

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -5836 +5836 @@
 
 IF (CPPKEY_INCA) THEN
-          IF (type_trac == 'inca') THEN
-             IF (is_omp_master .AND. grid_type==unstructured) THEN
+          IF (ANY(type_trac == ['inca','inco'])) THEN
+             IF (is_omp_master) THEN
                 CALL finalize_inca
              ENDIF