Changeset 3798 for LMDZ6/branches/Ocean_skin/libf/phylmd/tracco2i_mod.F90

Timestamp:

Jan 11, 2021, 11:24:08 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/tracco2i_mod.F90 (modified) (4 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/tracco2i_mod.F90

@@ -14 +14 @@
 CONTAINS
 
+  SUBROUTINE tracco2i_init()
+    ! This subroutine calls carbon_cycle_init needed to be done before first call to phys_output_write in physiq.
+    USE carbon_cycle_mod, ONLY: carbon_cycle_init, carbon_cycle_cpl
+
+    ! Initialize carbon_cycle_mod
+    IF (carbon_cycle_cpl) THEN
+       CALL carbon_cycle_init()
+    ENDIF
+
+  END SUBROUTINE tracco2i_init
+
   SUBROUTINE tracco2i(pdtphys, debutphy, &
        xlat, xlon, pphis, pphi, &
@@ -21 +32 @@
     USE infotrac_phy
     USE geometry_mod, ONLY: cell_area
-    USE carbon_cycle_mod, ONLY: carbon_cycle_init
     USE carbon_cycle_mod, ONLY: id_CO2, nbcf_in, fields_in, cfname_in
     USE carbon_cycle_mod, ONLY: fco2_ocn_day, fco2_ff, fco2_bb, fco2_land, fco2_ocean
@@ -79 +89 @@
 !--convert 280 ppm into kg CO2 / kg air
     IF (debutphy) THEN
-
-! Initialisation de module carbon_cycle_mod
-      IF (carbon_cycle_cpl) THEN
-        CALL carbon_cycle_init()
-      ENDIF
 
 ! Initialisation de tr_seri(id_CO2) si pas initialise
@@ -312 +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