Changeset 227 for codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/aeropacity.F90

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/aeropacity.F90 (modified) (16 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/LMDZ.COMMON/libf/phystd/aeropacity.F90

@@ -30 +30 @@
 !     pq                Aerosol mixing ratio
 !     reffrad(ngrid,nlayer,naerkind)         Aerosol effective radius
-!     QREFvis3d(ngrid,nlayermx,naerkind) \ 3d extinction coefficients
-!     QREFir3d(ngrid,nlayermx,naerkind)  / at reference wavelengths
+!     QREFvis3d(ngrid,nlayer,naerkind) \ 3d extinction coefficients
+!     QREFir3d(ngrid,nlayer,naerkind)  / at reference wavelengths
 !
 !     Output
@@ -40 +40 @@
 !=======================================================================
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "callkeys.h"
 #include "comcstfi.h"
-#include "comvert.h"
+!#include "comvert.h"
 
       INTEGER,INTENT(IN) :: ngrid  ! number of atmospheric columns
@@ -54 +54 @@
       REAL,INTENT(OUT) :: aerosol(ngrid,nlayer,naerkind) ! aerosol optical depth
       REAL,INTENT(IN) :: reffrad(ngrid,nlayer,naerkind) ! aerosol effective radius
-      REAL,INTENT(IN) :: QREFvis3d(ngrid,nlayermx,naerkind) ! extinction coefficient in the visible
-      REAL,INTENT(IN) :: QREFir3d(ngrid,nlayermx,naerkind)
+      REAL,INTENT(IN) :: QREFvis3d(ngrid,nlayer,naerkind) ! extinction coefficient in the visible
+      REAL,INTENT(IN) :: QREFir3d(ngrid,nlayer,naerkind)
       REAL,INTENT(OUT):: tau_col(ngrid) !column integrated visible optical depth
       ! BENJAMIN MODIFS
-      real,intent(in) :: cloudfrac(ngrid,nlayermx) ! cloud fraction
+      real,intent(in) :: cloudfrac(ngrid,nlayer) ! cloud fraction
       real,intent(out) :: totcloudfrac(ngrid) ! total cloud fraction
       logical,intent(in) :: clearsky
@@ -67 +67 @@
 
       LOGICAL,SAVE :: firstcall=.true.
+!$OMP THREADPRIVATE(firstcall)
       REAL CBRT
       EXTERNAL CBRT
@@ -72 +73 @@
       INTEGER,SAVE :: i_co2ice=0      ! co2 ice
       INTEGER,SAVE :: i_h2oice=0      ! water ice
+!$OMP THREADPRIVATE(i_co2ice,i_h2oice)
       CHARACTER(LEN=20) :: tracername ! to temporarily store text
 
@@ -135 +137 @@
            iaer=iaero_co2
 !       1. Initialization
-            aerosol(1:ngrid,1:nlayermx,iaer)=0.0
+            aerosol(1:ngrid,1:nlayer,iaer)=0.0
 !       2. Opacity calculation
             if (noaero) then ! aerosol set to zero
-             aerosol(1:ngrid,1:nlayermx,iaer)=0.0
+             aerosol(1:ngrid,1:nlayer,iaer)=0.0
             elseif (aerofixco2.or.(i_co2ice.eq.0)) then !  CO2 ice cloud prescribed
-               aerosol(1:ngrid,1:nlayermx,iaer)=1.e-9
+               aerosol(1:ngrid,1:nlayer,iaer)=1.e-9
                !aerosol(1:ngrid,12,iaer)=4.0 ! single cloud layer option
             else
@@ -172 +174 @@
            iaer=iaero_h2o
 !       1. Initialization
-            aerosol(1:ngrid,1:nlayermx,iaer)=0.0
+            aerosol(1:ngrid,1:nlayer,iaer)=0.0
 !       2. Opacity calculation
             if (aerofixh2o.or.(i_h2oice.eq.0).or.clearsky) then
-               aerosol(1:ngrid,1:nlayermx,iaer) =1.e-9
+               aerosol(1:ngrid,1:nlayer,iaer) =1.e-9
 
                ! put cloud at cloudlvl
@@ -226 +228 @@
 
                if(CLFvarying)then
-                  call totalcloudfrac(ngrid,nq,cloudfrac,totcloudfrac,pplev,pq,aerosol(1:ngrid,1:nlayermx,iaer))
+                  call totalcloudfrac(ngrid,nlayer,nq,cloudfrac,totcloudfrac,pplev,pq,aerosol(1,1,iaer))
                   do ig=1, ngrid
                      do l=1,nlayer-1 ! to stop the rad tran bug
@@ -253 +255 @@
           iaer=iaero_dust
 !         1. Initialization 
-          aerosol(1:ngrid,1:nlayermx,iaer)=0.0
+          aerosol(1:ngrid,1:nlayer,iaer)=0.0
           
           topdust=30.0 ! km  (used to be 10.0 km) LK
@@ -264 +266 @@
 !             Typical mixing ratio profile
 
-                 zp=(preff/pplay(ig,l))**(70./topdust)
+                 zp=(pplev(ig,1)/pplay(ig,l))**(70./topdust)
                  expfactor=max(exp(0.007*(1.-max(zp,1.))),1.e-3)
 
@@ -277 +279 @@
 !          Rescaling each layer to reproduce the choosen (or assimilated)
 !          dust extinction opacity at visible reference wavelength, which
-!          is scaled to the "preff" reference surface pressure available in comvert.h
-!          and stored in startfi.nc
+!          is scaled to the surface pressure pplev(ig,1)
 
             taudusttmp(1:ngrid)=0.
@@ -291 +292 @@
                   aerosol(ig,l,iaer) = max(1E-20, &
                           dusttau &
-                       *  pplev(ig,1) / preff &
+                       *  pplev(ig,1) / pplev(ig,1) &
                        *  aerosol(ig,l,iaer) &
                        /  taudusttmp(ig))
@@ -307 +308 @@
 
 !       1. Initialization
-         aerosol(1:ngrid,1:nlayermx,iaer)=0.0
+         aerosol(1:ngrid,1:nlayer,iaer)=0.0
 
 
@@ -317 +318 @@
 !              Typical mixing ratio profile
 
-               zp=(preff/pplay(ig,l))**(70./30) !emulating topdust
+               zp=(pplev(ig,1)/pplay(ig,l))**(70./30) !emulating topdust
                expfactor=max(exp(0.007*(1.-max(zp,1.))),1.e-3)
 
@@ -335 +336 @@
                aerosol(ig,l,iaer) = max(1E-20, &
                           1 &
-                       *  pplev(ig,1) / preff &
+                       *  pplev(ig,1) / pplev(ig,1) &
                        *  aerosol(ig,l,iaer) &
                        /  tauh2so4tmp(ig))
@@ -367 +368 @@
            iaer=iaero_back2lay
 !       1. Initialization
-            aerosol(1:ngrid,1:nlayermx,iaer)=0.0
+            aerosol(1:ngrid,1:nlayer,iaer)=0.0
 !       2. Opacity calculation
           DO ig=1,ngrid