Changeset 1999 for LMDZ5/branches/testing/libf/phy1d/1D_read_forc_cases.h

Timestamp:

Mar 20, 2014, 10:57:19 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phy1d/1D_read_forc_cases.h (modified) (5 diffs)

LMDZ5/branches/testing/libf/phy1d/1D_read_forc_cases.h

@@ -3 +3 @@
 ! forcing_radconv = .T. : Pure radiative-convective equilibrium:
 !----------------------------------------------------------------------
+
+
+      nq1=0
+      nq2=0
 
       if (forcing_les .or. forcing_radconv
@@ -24 +28 @@
 !----------------------------------------------------------------------
 
-      call readprofiles(nlev_max,kmax,height,
+      call readprofiles(nlev_max,kmax,nqtot,height,
      .           tttprof,qtprof,uprof,vprof,
      .           e12prof,ugprof,vgprof,
      .           wfls,dqtdxls,dqtdyls,dqtdtls,
-     .           thlpcar) 
+     .           thlpcar,qprof,nq1,nq2)
       endif
 
@@ -62 +66 @@
         ug(l)   = ugprof(kmax)-frac*( ugprof(kmax)- ugprof(kmax-1))
         vg(l)   = vgprof(kmax)-frac*( vgprof(kmax)- vgprof(kmax-1))
+        IF (nq2>0) q(l,nq1:nq2)=qprof(kmax,nq1:nq2)
+     s               -frac*(qprof(kmax,nq1:nq2)-qprof(kmax-1,nq1:nq2))
         omega(l)=   wfls(kmax)-frac*(   wfls(kmax)-   wfls(kmax-1))
 
@@ -85 +91 @@
             ug(l)   = ugprof(k)-frac*( ugprof(k)- ugprof(k-1))
             vg(l)   = vgprof(k)-frac*( vgprof(k)- vgprof(k-1))
+            IF (nq2>0) q(l,nq1:nq2)=qprof(k,nq1:nq2)
+     s                   -frac*(qprof(k,nq1:nq2)-qprof(k-1,nq1:nq2))
             omega(l)=   wfls(k)-frac*(   wfls(k)-   wfls(k-1))
             dq_dyn(l,1)=dqtdtls(k)-frac*(dqtdtls(k)-dqtdtls(k-1))
@@ -104 +112 @@
             vg(l)   = vgprof(1)
             omega(l)=   wfls(1)
+            IF (nq2>0) q(l,nq1:nq2)=qprof(1,nq1:nq2)
             dq_dyn(l,1)  =dqtdtls(1)
             dt_cooling(l)=thlpcar(1)