Changeset 1308 for trunk/LMDZ.GENERIC/libf/phystd/totalcloudfrac.F90

Timestamp:

Jul 10, 2014, 3:19:01 PM (10 years ago)

Author:

emillour

Message:

Generic GCM:
Some cleanup to simplify dynamics/physics interactions by getting rid
of dimphys.h (i.e. the nlayermx parameter) and minimizing use of
dimension.h in the physics.
EM

File:

• trunk/LMDZ.GENERIC/libf/phystd/totalcloudfrac.F90 (modified) (9 diffs)

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

@@ -1 @@
-      subroutine totalcloudfrac(ngrid,nq,rneb,totalrneb,pplev,pq,tau)
+      subroutine totalcloudfrac(ngrid,nlayer,nq,rneb,totalrneb,pplev,pq,tau)
 
       use watercommon_h
@@ -19 +19 @@
 !==================================================================
 
-#include "dimensions.h"
-#include "dimphys.h"
+!#include "dimensions.h"
+!#include "dimphys.h"
 #include "comcstfi.h"
 #include "callkeys.h"
 
       integer,intent(in) :: ngrid        ! number of atmospheric columns
+      integer,intent(in) :: nlayer       ! number of atmospheric layers
       integer,intent(in) :: nq           ! number of tracers
-      real,intent(in) :: rneb(ngrid,nlayermx)    ! cloud fraction     
+      real,intent(in) :: rneb(ngrid,nlayer)    ! cloud fraction     
       real,intent(out) :: totalrneb(ngrid)       ! total cloud fraction 
-      real,intent(in) :: pplev(ngrid,nlayermx+1) ! inter-layer pressure (Pa)
-      real,intent(in) :: pq(ngrid,nlayermx,nq)   ! tracers (.../kg_of_air)
-      real,intent(in) :: tau(ngrid,nlayermx)
+      real,intent(in) :: pplev(ngrid,nlayer+1) ! inter-layer pressure (Pa)
+      real,intent(in) :: pq(ngrid,nlayer,nq)   ! tracers (.../kg_of_air)
+      real,intent(in) :: tau(ngrid,nlayer)
 
-      real, dimension(nlayermx+1) :: masse
+      real, dimension(nlayer+1) :: masse
       integer, parameter          :: recovery=7
       integer ltau_max
@@ -47 +48 @@
       real clear,tau_min
       real, parameter ::  tau_c=0.1 !threshold of optical depth for the calculation of total cloud fraction 
-      real rneb2(nlayermx)
+      real rneb2(nlayer)
 
 
@@ -55 +56 @@
          if (recovery.eq.1) then
             clear = (1.-rneb(ig,1))
-            do l=2,nlayermx       
+            do l=2,nlayer      
                clear = clear*(1.-rneb(ig,l))
             enddo
@@ -62 +63 @@
          elseif (recovery.eq.2) then
             totalrneb(ig) = rneb(ig,1)
-            do l=2,14 !nlayermx       
+            do l=2,14 !nlayer    
                totalrneb(ig) = max(rneb(ig,l),totalrneb(ig))
             enddo
@@ -68 +69 @@
          elseif (recovery.eq.3) then
             totalrneb(ig) = rneb(ig,1)
-            do l=2,nlayermx       
+            do l=2,nlayer    
                totalrneb(ig) = min(rneb(ig,l),totalrneb(ig))
             enddo
@@ -77 +78 @@
          elseif (recovery.eq.5) then
             totalrneb(ig) = rneb(ig,1)            
-            do l=1,nlayermx
+            do l=1,nlayer
                masse(l)=pq(ig,l,igcm_h2o_ice)*(pplev(ig,l)-pplev(ig,l+1))
             enddo
@@ -85 +86 @@
          elseif (recovery.eq.6) then
             totalrneb(ig) = 0.            
-            do l=1,nlayermx
+            do l=1,nlayer
                masse(l)=pq(ig,l,igcm_h2o_ice)*(pplev(ig,l)-pplev(ig,l+1))
                masse(l)=max(masse(l),0.)
             enddo
             massetot=sum(masse,dim=1)
-            do l=1,nlayermx
+            do l=1,nlayer
                totalrneb(ig) = totalrneb(ig)+rneb(ig,l)*masse(l)/massetot
             enddo
@@ -96 +97 @@
          elseif (recovery.eq.7) then
 
-            rneb2(:)=rneb(ig,1:nlayermx)
-            tau_min=MIN(tau_c,MAXVAL(tau(ig,1:nlayermx))/2.)
-            do l=1,nlayermx
+            rneb2(:)=rneb(ig,1:nlayer)
+            tau_min=MIN(tau_c,MAXVAL(tau(ig,1:nlayer))/2.)
+            do l=1,nlayer
                if(tau(ig,l)<tau_min) rneb2(l)=0.        
             enddo
-            totalrneb(ig)=maxval(rneb2(1:nlayermx))
+            totalrneb(ig)=maxval(rneb2(1:nlayer))
 
          endif                  ! (recovery=)