Changeset 1520 for trunk/LMDZ.GENERIC/libf/phystd/planete_mod.F90

Timestamp:

Mar 24, 2016, 12:51:12 PM (9 years ago)

Author:

emillour

Message:

Generic GCM:

• Some fixes/adjustments to run using OpenMP (in the physics, best practice is to always have "save" variables, this of course includes all module variables, as "threadprivate").

EM

File:

• trunk/LMDZ.GENERIC/libf/phystd/planete_mod.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/planete_mod.F90

@@ -2 +2 @@
   IMPLICIT NONE
   
-  REAL :: apoastr ! maximum star-planet distance (AU)
-  REAL :: periastr ! minimum star-planet distance (AU)
-  REAL :: year_day ! length of year (sols)
-  REAL :: peri_day ! date of periastron (sols since N. spring)
-  REAL :: obliquit ! Obliquity of the planet (deg)
-  REAL :: nres ! tidal resonance ratio
-  REAL :: z0 ! surface roughness (m)
-  REAL :: lmixmin ! mixing length
-  REAL :: emin_turb ! minimal energy
-  REAL :: coefvis
-  REAL :: coefir
-  REAL :: timeperi
-  REAL :: e_elips
-  REAL :: p_elips
+  REAL,SAVE :: apoastr ! maximum star-planet distance (AU)
+  REAL,SAVE :: periastr ! minimum star-planet distance (AU)
+  REAL,SAVE :: year_day ! length of year (sols)
+  REAL,SAVE :: peri_day ! date of periastron (sols since N. spring)
+  REAL,SAVE :: obliquit ! Obliquity of the planet (deg)
+!$OMP THREADPRIVATE(apoastr,periastr,year_day,peri_day,obliquit)
+  REAL,SAVE :: nres ! tidal resonance ratio
+  REAL,SAVE :: z0 ! surface roughness (m)
+  REAL,SAVE :: lmixmin ! mixing length
+  REAL,SAVE :: emin_turb ! minimal energy
+!$OMP THREADPRIVATE(nres,z0,lmixmin,emin_turb)
+  REAL,SAVE :: coefvis
+  REAL,SAVE :: coefir
+  REAL,SAVE :: timeperi
+  REAL,SAVE :: e_elips
+  REAL,SAVE :: p_elips
+!$OMP THREADPRIVATE(coefvis,coefir,timeperi,e_elips,p_elips)
   
-  REAL :: preff ! reference surface pressure (Pa)       !read by master
-  REAL,ALLOCATABLE :: ap(:) ! hybrid coordinate at layer interface      !read by master
-  REAL,ALLOCATABLE :: bp(:) ! hybrid coordinate at layer interface      !read by master
-  
+  REAL,SAVE :: preff ! reference surface pressure (Pa)  !read by master
+  REAL,SAVE,ALLOCATABLE :: ap(:) ! hybrid coordinate at layer interface !read by master
+  REAL,SAVE,ALLOCATABLE :: bp(:) ! hybrid coordinate at layer interface         !read by master
+!$OMP THREADPRIVATE(preff,ap,bp)
+
   CONTAINS
   
@@ -31 +35 @@
   real,intent(in) :: bp_dyn(nlayer+1) ! hybrid coordinate at interfaces
   
-!$OMP MASTER
   allocate(ap(nlayer+1))
   allocate(bp(nlayer+1))
@@ -38 +41 @@
   ap(:)=ap_dyn(:)
   bp(:)=bp_dyn(:)
-!$OMP END MASTER
-!$OMP BARRIER
   
   end subroutine ini_planete_mod