Changeset 586 for trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90

Timestamp:

Mar 16, 2012, 7:11:41 PM (13 years ago)

Author:

jleconte

Message:

removed cpp3D and nonideal stuff.

File:

• trunk/LMDZ.GENERIC/libf/phystd/callcorrk.F90 (modified) (3 diffs)

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

@@ -1 +1 @@
       subroutine callcorrk(ngrid,nlayer,pq,nq,qsurf,           &
           albedo,emis,mu0,pplev,pplay,pt,                      & 
-          tsurf,fract,dist_star,aerosol,cpp3D,muvar,           &
+          tsurf,fract,dist_star,aerosol,muvar,           &
           dtlw,dtsw,fluxsurf_lw,                               &
           fluxsurf_sw,fluxtop_lw,fluxabs_sw,fluxtop_dn,        &
@@ -164 +164 @@
       real totcloudfrac(ngridmx)
       logical clearsky
-
-!     Allow variations in cp with location
-      real cpp3D(ngridmx,nlayermx)   ! specific heat capacity at const. pressure
 
       ! for weird cloud test
@@ -825 +822 @@
 
 !     Finally, the heating rates
-         if(nonideal)then
-
-            DO l=2,L_NLAYRAD
-               dtsw(ig,L_NLAYRAD+1-l)=(fmnetv(l)-fmnetv(l-1))  &
-                    *g/(cpp3D(ig,L_NLAYRAD+1-l)                &
-                    *scalep*(plevrad(2*l+1)-plevrad(2*l-1)))
-               dtlw(ig,L_NLAYRAD+1-l)=(fmneti(l)-fmneti(l-1))  &
-                    *g/(cpp3D(ig,L_NLAYRAD+1-l)                &
-                    *scalep*(plevrad(2*l+1)-plevrad(2*l-1)))           
-            END DO      
+
+         DO l=2,L_NLAYRAD
+            dtsw(ig,L_NLAYRAD+1-l)=(fmnetv(l)-fmnetv(l-1))  &
+                *g/(cpp*scalep*(plevrad(2*l+1)-plevrad(2*l-1)))
+            dtlw(ig,L_NLAYRAD+1-l)=(fmneti(l)-fmneti(l-1))  &
+                *g/(cpp*scalep*(plevrad(2*l+1)-plevrad(2*l-1)))
+         END DO      
 
 !     These are values at top of atmosphere
-            dtsw(ig,L_NLAYRAD)=(fmnetv(1)-nfluxtopv)           &
-                 *g/(cpp3D(ig,L_NLAYRAD)*scalep*(plevrad(3)-plevrad(1)))
-            dtlw(ig,L_NLAYRAD)=(fmneti(1)-nfluxtopi)           &
-                 *g/(cpp3D(ig,L_NLAYRAD)*scalep*(plevrad(3)-plevrad(1)))
-
-         else
-
-            DO l=2,L_NLAYRAD
-               dtsw(ig,L_NLAYRAD+1-l)=(fmnetv(l)-fmnetv(l-1))  &
-                   *g/(cpp*scalep*(plevrad(2*l+1)-plevrad(2*l-1)))
-               dtlw(ig,L_NLAYRAD+1-l)=(fmneti(l)-fmneti(l-1))  &
-                   *g/(cpp*scalep*(plevrad(2*l+1)-plevrad(2*l-1)))
-            END DO      
-
-!     These are values at top of atmosphere
-            dtsw(ig,L_NLAYRAD)=(fmnetv(1)-nfluxtopv)           &
-                *g/(cpp*scalep*(plevrad(3)-plevrad(1)))
-            dtlw(ig,L_NLAYRAD)=(fmneti(1)-nfluxtopi)           &
-                *g/(cpp*scalep*(plevrad(3)-plevrad(1)))
-
-         endif
+         dtsw(ig,L_NLAYRAD)=(fmnetv(1)-nfluxtopv)           &
+             *g/(cpp*scalep*(plevrad(3)-plevrad(1)))
+         dtlw(ig,L_NLAYRAD)=(fmneti(1)-nfluxtopi)           &
+             *g/(cpp*scalep*(plevrad(3)-plevrad(1)))
 
 !     ---------------------------------------------------------------