Changeset 1795 for LMDZ5/branches/testing/libf/phylmd/carbon_cycle_mod.F90

Timestamp:

Jul 18, 2013, 10:20:28 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Version testing basee sur la r1794

---

Testing release based on r1794

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/carbon_cycle_mod.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/carbon_cycle_mod.F90

@@ -19 +19 @@
 !$OMP THREADPRIVATE(carbon_cycle_cpl)
 
+  LOGICAL :: carbon_cycle_emis_comp_omp=.FALSE.
   LOGICAL :: carbon_cycle_emis_comp=.FALSE. ! Calculation of emission compatible
 !$OMP THREADPRIVATE(carbon_cycle_emis_comp)
 
+  LOGICAL :: RCO2_inter_omp
   LOGICAL :: RCO2_inter  ! RCO2 interactive : if true calculate new value RCO2 for the radiation scheme
 !$OMP THREADPRIVATE(RCO2_inter)
 
 ! Scalare values when no transport, from physiq.def
+  REAL :: fos_fuel_s_omp
   REAL :: fos_fuel_s  ! carbon_cycle_fos_fuel dans physiq.def
 !$OMP THREADPRIVATE(fos_fuel_s)
@@ -112 +115 @@
     ! Read fosil fuel value if no transport
     IF (.NOT. carbon_cycle_tr) THEN
-       fos_fuel_s = 0.
-       CALL getin ('carbon_cycle_fos_fuel',fos_fuel_s)
+!$OMP MASTER
+       fos_fuel_s_omp = 0.
+       CALL getin ('carbon_cycle_fos_fuel',fos_fuel_s_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+       fos_fuel_s=fos_fuel_s_omp
        WRITE(lunout,*) 'carbon_cycle_fos_fuel = ', fos_fuel_s 
     END IF
@@ -120 +127 @@
     ! Read parmeter for calculation compatible emission
     IF (.NOT. carbon_cycle_tr) THEN
-       carbon_cycle_emis_comp=.FALSE.
-       CALL getin('carbon_cycle_emis_comp',carbon_cycle_emis_comp)
+!$OMP MASTER
+       carbon_cycle_emis_comp_omp=.FALSE.
+       CALL getin('carbon_cycle_emis_comp',carbon_cycle_emis_comp_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+       carbon_cycle_emis_comp=carbon_cycle_emis_comp_omp
        WRITE(lunout,*) 'carbon_cycle_emis_comp = ',carbon_cycle_emis_comp
        IF (carbon_cycle_emis_comp) THEN
@@ -129 +140 @@
 
     ! Read parameter for interactive calculation of the CO2 value for the radiation scheme
-    RCO2_inter=.FALSE.
-    CALL getin('RCO2_inter',RCO2_inter)
+!$OMP MASTER
+    RCO2_inter_omp=.FALSE.
+    CALL getin('RCO2_inter',RCO2_inter_omp)
+!$OMP END MASTER
+!$OMP BARRIER
+    RCO2_inter=RCO2_inter_omp
     WRITE(lunout,*) 'RCO2_inter = ', RCO2_inter
     IF (RCO2_inter) THEN
@@ -294 +309 @@
     USE phys_cal_mod, ONLY : day_cur
     USE comgeomphy
+    USE indice_sol_mod
 
     IMPLICIT NONE
 
     INCLUDE "clesphys.h"
-    INCLUDE "indicesol.h"
     INCLUDE "iniprint.h"
     INCLUDE "YOMCST.h"