Changeset 1520 for trunk/LMDZ.GENERIC/libf/phystd/callkeys_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/callkeys_mod.F90 (modified) (1 diff)

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

@@ -2 +2 @@
 IMPLICIT NONE  
 
-      logical callrad,corrk,calldifv,UseTurbDiff                        &
-     &   , calladj,co2cond,callsoil                                     &
-     &   , season,diurnal,tlocked,rings_shadow,lwrite                   &
-     &   , callstats,calleofdump                                        &
-     &   , callgasvis,continuum,H2Ocont_simple,graybody                 &
-     &   , strictboundcorrk                                     
+      logical,save :: callrad,corrk,calldifv,UseTurbDiff
+!$OMP THREADPRIVATE(callrad,corrk,calldifv,UseTurbDiff)
+      logical,save :: calladj,co2cond,callsoil
+!$OMP THREADPRIVATE(calladj,co2cond,callsoil)
+      logical,save :: season,diurnal,tlocked,rings_shadow,lwrite
+!$OMP THREADPRIVATE(season,diurnal,tlocked,rings_shadow,lwrite)
+      logical,save :: callstats,calleofdump
+!$OMP THREADPRIVATE(callstats,calleofdump)
+      logical,save :: callgasvis,continuum,H2Ocont_simple,graybody
+!$OMP THREADPRIVATE(callgasvis,continuum,H2Ocont_simple,graybody)
+      logical,save :: strictboundcorrk                                     
+!$OMP THREADPRIVATE(strictboundcorrk)
 
-      logical enertest
-      logical nonideal
-      logical meanOLR
-      logical specOLR
-      logical kastprof
-      logical newtonian
-      logical check_cpp_match
-      logical force_cpp
-      logical testradtimes
-      logical rayleigh
-      logical stelbbody
-      logical ozone
-      logical nearco2cond
-      logical tracer
-      logical mass_redistrib
-      logical varactive
-      logical varfixed
-      logical radfixed
-      logical sedimentation
-      logical water,watercond,waterrain
-      logical aeroco2,aeroh2o,aeroh2so4,aeroback2lay
-      logical aerofixco2,aerofixh2o
-      logical hydrology
-      logical sourceevol
-      logical CLFvarying
-      logical nosurf
-      logical oblate
-      logical ok_slab_ocean
-      logical ok_slab_sic
-      logical ok_slab_heat_transp
-      logical albedo_spectral_mode
+      logical,save :: enertest
+      logical,save :: nonideal
+      logical,save :: meanOLR
+      logical,save :: specOLR
+      logical,save :: kastprof
+!$OMP THREADPRIVATE(enertest,nonideal,meanOLR,kastprof)
+      logical,save :: newtonian
+      logical,save :: check_cpp_match
+      logical,save :: force_cpp
+      logical,save :: testradtimes
+      logical,save :: rayleigh
+!$OMP THREADPRIVATE(newtonian,check_cpp_match,force_cpp,testradtimes,rayleigh)
+      logical,save :: stelbbody
+      logical,save :: ozone
+      logical,save :: nearco2cond
+      logical,save :: tracer
+      logical,save :: mass_redistrib
+!$OMP THREADPRIVATE(stelbbody,ozone,nearco2cond,tracer,mass_redistrib)
+      logical,save :: varactive
+      logical,save :: varfixed
+      logical,save :: radfixed
+      logical,save :: sedimentation
+!$OMP THREADPRIVATE(varactive,varfixed,radfixed,sedimentation)
+      logical,save :: water,watercond,waterrain
+!$OMP THREADPRIVATE(water,watercond,waterrain)
+      logical,save :: aeroco2,aeroh2o,aeroh2so4,aeroback2lay
+!$OMP THREADPRIVATE(aeroco2,aeroh2o,aeroh2so4,aeroback2lay)
+      logical,save :: aerofixco2,aerofixh2o
+!$OMP THREADPRIVATE(aerofixco2,aerofixh2o)
+      logical,save :: hydrology
+      logical,save :: sourceevol
+      logical,save :: CLFvarying
+      logical,save :: nosurf
+      logical,save :: oblate
+!$OMP THREADPRIVATE(hydrology,sourceevol,CLFvarying,nosurf,oblate)
+      logical,save :: ok_slab_ocean
+      logical,save :: ok_slab_sic
+      logical,save :: ok_slab_heat_transp
+      logical,save :: albedo_spectral_mode
+!$OMP THREADPRIVATE(ok_slab_ocean,ok_slab_sic,ok_slab_heat_transp,albedo_spectral_mode)
 
-      integer iddist
-      integer iaervar
-      integer iradia
-      integer startype
+      integer,save :: iddist
+      integer,save :: iaervar
+      integer,save :: iradia
+      integer,save :: startype
+!$OMP THREADPRIVATE(iddist,iaervar,iradia,startype)
 
-      real topdustref
-      real Nmix_co2
-      real dusttau
-      real Fat1AU
-      real stelTbb
-      real Tstrat
-      real tplanet
-      real obs_tau_col_tropo
-      real obs_tau_col_strato
-      real pres_bottom_tropo
-      real pres_top_tropo
-      real pres_bottom_strato
-      real pres_top_strato
-      real size_tropo
-      real size_strato
-      real satval
-      real CLFfixval
-      real n2mixratio
-      real co2supsat
-      real pceil
-      real albedosnow
-      real albedoco2ice
-      real maxicethick
-      real Tsaldiff
-      real tau_relax
-      real cloudlvl
-      real icetstep
-      real intheat
-      real flatten
-      real Rmean
-      real J2
-      real MassPlanet
-      
-      logical :: iscallphys=.false.!existence of callphys.def
+      real,save :: topdustref
+      real,save :: Nmix_co2
+      real,save :: dusttau
+      real,save :: Fat1AU
+      real,save :: stelTbb
+!$OMP THREADPRIVATE(topdustref,Nmix_co2,dusttau,Fat1AU,stelTbb)
+      real,save :: Tstrat
+      real,save :: tplanet
+      real,save :: obs_tau_col_tropo
+      real,save :: obs_tau_col_strato
+!$OMP THREADPRIVATE(Tstrat,tplanet,obs_tau_col_tropo,obs_tau_col_strato)
+      real,save :: pres_bottom_tropo
+      real,save :: pres_top_tropo
+      real,save :: pres_bottom_strato
+      real,save :: pres_top_strato
+!$OMP THREADPRIVATE(pres_bottom_tropo,pres_top_tropo,pres_bottom_strato,pres_top_strato)
+      real,save :: size_tropo
+      real,save :: size_strato
+      real,save :: satval
+      real,save :: CLFfixval
+      real,save :: n2mixratio
+!$OMP THREADPRIVATE(size_tropo,size_strato,satval,CLFfixval,n2mixratio)
+      real,save :: co2supsat
+      real,save :: pceil
+      real,save :: albedosnow
+      real,save :: albedoco2ice
+      real,save :: maxicethick
+!$OMP THREADPRIVATE(co2supsat,pceil,albedosnow,albedoco2ice,maxicethick)
+      real,save :: Tsaldiff
+      real,save :: tau_relax
+      real,save :: cloudlvl
+      real,save :: icetstep
+      real,save :: intheat
+!$OMP THREADPRIVATE(Tsaldiff,tau_relax,cloudlvl,icetstep,intheat)
+      real,save :: flatten
+      real,save :: Rmean
+      real,save :: J2
+      real,save :: MassPlanet
+!$OMP THREADPRIVATE(flatten,Rmean,J2,MassPlanet)
+
+      logical,save :: iscallphys=.false.!existence of callphys.def
+!$OMP THREADPRIVATE(iscallphys)
 
 END MODULE callkeys_mod