Changeset 227 for codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/vdifc.F

Timestamp:

07/16/14 18:05:01 (10 years ago)

Author:

milmd

Message:

Last LMDZ version (1315) with OpenMP directives and other stuff

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/vdifc.F (modified) (8 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/vdifc.F

@@ -38 +38 @@
 !     ------------
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
@@ -77 +77 @@
 
       REAL z4st,zdplanck(ngrid)
-      REAL zkv(ngrid,nlayermx+1),zkh(ngrid,nlayermx+1)
+      REAL zkv(ngrid,nlay+1),zkh(ngrid,nlay+1)
       REAL zcdv(ngrid),zcdh(ngrid)
       REAL zcdv_true(ngrid),zcdh_true(ngrid)
-      REAL zu(ngrid,nlayermx),zv(ngrid,nlayermx)
-      REAL zh(ngrid,nlayermx)
+      REAL zu(ngrid,nlay),zv(ngrid,nlay)
+      REAL zh(ngrid,nlay)
       REAL ztsrf2(ngrid)
       REAL z1(ngrid),z2(ngrid)
-      REAL za(ngrid,nlayermx),zb(ngrid,nlayermx)
-      REAL zb0(ngrid,nlayermx)
-      REAL zc(ngrid,nlayermx),zd(ngrid,nlayermx)
+      REAL za(ngrid,nlay),zb(ngrid,nlay)
+      REAL zb0(ngrid,nlay)
+      REAL zc(ngrid,nlay),zd(ngrid,nlay)
       REAL zcst1
       REAL zu2!, a
-      REAL zcq(ngrid,nlayermx),zdq(ngrid,nlayermx)
+      REAL zcq(ngrid,nlay),zdq(ngrid,nlay)
       REAL evap(ngrid)
       REAL zcq0(ngrid),zdq0(ngrid)
@@ -96 +96 @@
       LOGICAL firstcall
       SAVE firstcall
+!$OMP THREADPRIVATE(firstcall)
       
       LOGICAL lastcall
@@ -101 +102 @@
 !     variables added for CO2 condensation
 !     ------------------------------------
-      REAL hh                   !, zhcond(ngrid,nlayermx)
+      REAL hh                   !, zhcond(ngrid,nlay)
 !     REAL latcond,tcond1mb
 !     REAL acond,bcond
 !     SAVE acond,bcond
+!!$OMP THREADPRIVATE(acond,bcond)
 !     DATA latcond,tcond1mb/5.9e5,136.27/
 
@@ -110 +112 @@
 !     -------
       INTEGER iq
-      REAL zq(ngrid,nlayermx,nq)
+      REAL zq(ngrid,nlay,nq)
       REAL zq1temp(ngrid)
       REAL rho(ngrid)         ! near-surface air density
@@ -123 +125 @@
       real z1_T(ngrid), z2_T(ngrid)
       real zb_T(ngrid)
-      real zc_T(ngrid,nlayermx)
-      real zd_T(ngrid,nlayermx)
+      real zc_T(ngrid,nlay)
+      real zd_T(ngrid,nlay)
       real lat1(ngrid), lat2(ngrid)
       real surfh2otot
@@ -132 +134 @@
       integer ivap, iice ! also make liq for clarity on surface...
       save ivap, iice
+!$OMP THREADPRIVATE(ivap,iice)
 
       real, parameter :: karman=0.4
@@ -249 +252 @@
 !     ------------------------------------------------------ 
 
-      call vdif_kc(ngrid,ptimestep,g,pzlev,pzlay
+      call vdif_kc(ngrid,nlay,ptimestep,g,pzlev,pzlay
      &     ,pu,pv,ph,zcdv_true
      &     ,pq2,zkv,zkh)