Changeset 2292 for trunk/LMDZ.TITAN/libf

Timestamp:

Apr 17, 2020, 7:48:38 PM (5 years ago)

Author:

mlefevre

Message:

MESOSCALE. Fixed misplaced OMP_THREADPRIVATE in Titan physics.

Location:

trunk/LMDZ.TITAN/libf/phytitan

Files:

• phys_state_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (3 diffs)

trunk/LMDZ.TITAN/libf/phytitan/phys_state_var_mod.F90

@@ -24 +24 @@
       real, dimension(:),allocatable,save :: albedo_equivalent     ! Spectral Mean albedo.
 
+!$OMP THREADPRIVATE(tsurf,tsoil,albedo,albedo_equivalent)
+
       real,dimension(:),allocatable,save :: albedo_bareground ! Bare Ground Albedo. By MT 2015.
 
+!$OMP THREADPRIVATE(albedo_bareground)
+
        real, dimension(:), allocatable, save       :: tankCH4    ! Depth of surface methane tank (m)
+!$OMP THREADPRIVATE(tankCH4)
 
       real,dimension(:),allocatable,save :: emis        ! Thermal IR surface emissivity.
@@ -35 +40 @@
       real,dimension(:),allocatable,save :: fluxgrd     ! Surface conduction flux (W.m-2).
       real,dimension(:,:),allocatable,save :: qsurf     ! Tracer on surface (e.g. kg.m-2).
+
+!$OMP THREADPRIVATE(emis,dtrad,fluxrad_sky,fluxrad,capcal,fluxgrd,qsurf,q2)
 
       ! FOR DIAGNOSTIC :
@@ -55 +62 @@
       real,dimension(:,:,:),allocatable,save :: int_dtaui   ! IR optical thickness of layers within narrowbands for diags ().
 
+!$OMPTHREADPRIVATE(fluxsurf_lw,fluxsurf_sw,fluxsurfabs_sw,fluxtop_lw,fluxabs_sw,fluxtop_dn,fluxdyn,OLR_nu,OSR_nu,&        
+        !$OMP zdtlw,zdtsw,sensibFlux,int_dtauv,int_dtaui))
 
       real,allocatable,dimension(:,:),save :: qsurf_hist
+!$OMP THREADPRIVATE(qsurf_hist)
  
 CONTAINS

trunk/LMDZ.TITAN/libf/phytitan/physiq_mod.F90

@@ -214 +214 @@
       integer,save :: day_ini                                      ! Initial date of the run (sol since Ls=0).
       integer,save :: icount                                       ! Counter of calls to physiq during the run.
-!$OMP THREADPRIVATE(day_ini,icount)
-
-!$OMP THREADPRIVATE(tsurf,tsoil,albedo,albedo_equivalent)
-
-!$OMP THREADPRIVATE(albedo_bareground)
-
-!$OMP THREADPRIVATE(emis,dtrad,fluxrad_sky,fluxrad,capcal,fluxgrd,qsurf,q2)
 
 
@@ -232 +225 @@
       
       ! FOR DIAGNOSTIC :
-      
-!$OMP THREADPRIVATE(fluxsurf_lw,fluxsurf_sw,fluxsurfabs_sw,fluxtop_lw,fluxabs_sw,fluxtop_dn,fluxdyn,OLR_nu,OSR_nu,&        
-        !$OMP zdtlw,zdtsw,sensibFlux,int_dtauv,int_dtaui))
 
       real zls                       ! Solar longitude (radians).
@@ -367 +357 @@
       real, dimension(ngrid,nlayer,nkim)          :: ysat ! (mol/mol)
 
-      ! Surface methane
-!$OMP THREADPRIVATE(tankCH4)
 
       real :: i2e(ngrid,nlayer)      ! int 2 ext factor ( X.kg-1 -> X.m-3 for diags )