Changeset 2912 for LMDZ5/trunk/libf/phylmd

Timestamp:

Jun 14, 2017, 10:26:55 AM (7 years ago)

Author:

jghattas

Message:

• Added OMP_THREADPRIVATE for varibales fields_cpl, nb_fields_cpl, type_veget.
• Removed variable flag_omp never used.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• surf_land_orchidee_mod.F90 (modified) (1 diff)
• surf_land_orchidee_noopenmp_mod.F90 (modified) (1 diff)
• surf_land_orchidee_noz0h_mod.F90 (modified) (1 diff)
• surface_data.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -30 +30 @@
   PUBLIC  :: surf_land_orchidee
 
-  LOGICAL, ALLOCATABLE, SAVE :: flag_omp(:)
 CONTAINS
 !

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90

@@ -144 +144 @@
     INTEGER                                   :: error
     INTEGER, SAVE                             :: nb_fields_cpl ! number of fields for the climate-carbon coupling (between ATM and ORCHIDEE). 
+    !$OMP THREADPRIVATE(nb_fields_cpl)
     REAL, SAVE, ALLOCATABLE, DIMENSION(:,:)   :: fields_cpl    ! Fluxes for the climate-carbon coupling
+    !$OMP THREADPRIVATE(fields_cpl)
     REAL, DIMENSION(klon)                     :: swdown_vrai
     CHARACTER (len = 20)                      :: modname = 'surf_land_orchidee'

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_noz0h_mod.F90

@@ -33 +33 @@
   PUBLIC  :: surf_land_orchidee
 
-  LOGICAL, ALLOCATABLE, SAVE :: flag_omp(:)
 CONTAINS
 !

LMDZ5/trunk/libf/phylmd/surface_data.F90

@@ -9 +9 @@
   
   LOGICAL, SAVE          :: ok_veget      ! true for use of vegetation model ORCHIDEE
-  CHARACTER(len=10), SAVE :: type_veget    ! orchidee/y/bucket/n/betaclim
   !$OMP THREADPRIVATE(ok_veget)
-  ! Martin
+
+  CHARACTER(len=10), SAVE :: type_veget   ! orchidee/y/bucket/n/betaclim
+  !$OMP THREADPRIVATE(type_veget)
+
   LOGICAL, SAVE          :: ok_snow       ! true for coupling to snow model SISVAT
   !$OMP THREADPRIVATE(ok_snow)
-  ! Martin
 
   CHARACTER(len=6), SAVE :: type_ocean    ! force/slab/couple