Changeset 3651 for LMDZ6/trunk/libf/phylmd/tracco2i_mod.F90

Timestamp:

Mar 20, 2020, 11:24:02 AM (5 years ago)

Author:

jghattas

Message:

Correction pour tourner experience avec type_trac=co2i sur Jean-Zay : allocation necessaire sur tout les procs, sinon scatter se plain.

File:

• LMDZ6/trunk/libf/phylmd/tracco2i_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/tracco2i_mod.F90

@@ -317 +317 @@
 !$OMP END MASTER
 
+    ! Allocation needed for all proc otherwise scatter might complain
+    IF (.NOT.ALLOCATED(flx_co2ff_glo)) ALLOCATE(flx_co2ff_glo(0,0))
+    IF (.NOT.ALLOCATED(flx_co2bb_glo)) ALLOCATE(flx_co2bb_glo(0,0))
+
 !--scatter on all proc
     CALL scatter(flx_co2ff_glo,flx_co2ff)
     CALL scatter(flx_co2bb_glo,flx_co2bb)
 
-!$OMP MASTER
-    IF (is_mpi_root) THEN
-       DEALLOCATE(flx_co2ff_glo)
-       DEALLOCATE(flx_co2bb_glo)
-    ENDIF
-!$OMP END MASTER
+   IF (ALLOCATED(flx_co2ff_glo)) DEALLOCATE(flx_co2ff_glo)
+   IF (ALLOCATED(flx_co2bb_glo)) DEALLOCATE(flx_co2bb_glo)
 
   ENDIF !--end debuthy