Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/cv3a_uncompress.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3a_uncompress.F90 (modified) (9 diffs)

LMDZ5/branches/testing/libf/phylmd/cv3a_uncompress.F90

@@ -3 +3 @@
                            precip, cbmf, plcl, plfc, wbeff, sig, w0, ptop2, &
                            ft, fq, fu, fv, ftra,  &
-                           sigd, ma, mip, vprecip, upwd, dnwd, dnwd0, &
+                           sigd, ma, mip, vprecip, vprecipi, upwd, dnwd, dnwd0, &
                            qcondc, wd, cape, cin, &
                            tvp, &
@@ -17 +17 @@
                            precip1, cbmf1, plcl1, plfc1, wbeff1, sig1, w01, ptop21, &
                            ft1, fq1, fu1, fv1, ftra1, &
-                           sigd1, ma1, mip1, vprecip1, upwd1, dnwd1, dnwd01, &
+                           sigd1, ma1, mip1, vprecip1, vprecipi1, upwd1, dnwd1, dnwd01, &
                            qcondc1, wd1, cape1, cin1, &
                            tvp1, &
@@ -57 +57 @@
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: ma, mip
   REAL, DIMENSION (nloc, nd+1), INTENT (IN)          :: vprecip
+  REAL, DIMENSION (nloc, nd+1), INTENT (IN)          :: vprecipi
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: upwd, dnwd, dnwd0
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: qcondc
@@ -91 +92 @@
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: ma1, mip1
   REAL, DIMENSION (len, nd+1), INTENT (OUT)          :: vprecip1
+  REAL, DIMENSION (len, nd+1), INTENT (OUT)          :: vprecipi1
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: upwd1, dnwd1, dnwd01
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: qcondc1
@@ -144 +146 @@
     END DO
    
-    DO k = 1, nl+1
+    DO k = 1, nl
       DO i = 1, ncum
         sig1(idcum(i), k) = sig(i, k)
@@ -155 +157 @@
         mip1(idcum(i), k) = mip(i, k)
         vprecip1(idcum(i), k) = vprecip(i, k)
+        vprecipi1(idcum(i), k) = vprecipi(i, k)
         upwd1(idcum(i), k) = upwd(i, k)
         dnwd1(idcum(i), k) = dnwd(i, k)
@@ -178 +181 @@
    
       END DO
+    END DO
+
+! Fluxes are defined on a staggered grid and extend up to nl+1
+    DO i = 1, ncum
+      ma1(idcum(i), nlp) = 0.
+      vprecip1(idcum(i), nlp) = 0.
+      vprecipi1(idcum(i), nlp) = 0.
+      upwd1(idcum(i), nlp) = 0.
+      dnwd1(idcum(i), nlp) = 0.
+      dnwd01(idcum(i), nlp) = 0.
     END DO
    
@@ -203 +216 @@
 !!      END DO
 !!    END DO
-      DO i = 1, ncum
-        jdcum=idcum(i)
-        phi1    (jdcum, 1:nl+1, 1:nl+1) = phi    (i, 1:nl+1, 1:nl+1)          !AC!
-        phi21   (jdcum, 1:nl+1, 1:nl+1) = phi2   (i, 1:nl+1, 1:nl+1)          !RomP
-        sigij1  (jdcum, 1:nl+1, 1:nl+1) = sigij  (i, 1:nl+1, 1:nl+1)          !RomP
-        elij1   (jdcum, 1:nl+1, 1:nl+1) = elij   (i, 1:nl+1, 1:nl+1)          !RomP
-        epmlmMm1(jdcum, 1:nl+1, 1:nl+1) = epmlmMm(i, 1:nl+1, 1:nl+1)          !RomP+jyg
+
+!!      DO i = 1, ncum
+!!        jdcum=idcum(i)
+!!        phi1    (jdcum, 1:nl+1, 1:nl+1) = phi    (i, 1:nl+1, 1:nl+1)          !AC!
+!!        phi21   (jdcum, 1:nl+1, 1:nl+1) = phi2   (i, 1:nl+1, 1:nl+1)          !RomP
+!!        sigij1  (jdcum, 1:nl+1, 1:nl+1) = sigij  (i, 1:nl+1, 1:nl+1)          !RomP
+!!        elij1   (jdcum, 1:nl+1, 1:nl+1) = elij   (i, 1:nl+1, 1:nl+1)          !RomP
+!!        epmlmMm1(jdcum, 1:nl+1, 1:nl+1) = epmlmMm(i, 1:nl+1, 1:nl+1)          !RomP+jyg
+!!      END DO
+!  These tracer associated arrays are defined up to nl, not nl+1
+  DO i = 1, ncum
+    jdcum=idcum(i)
+    DO k = 1,nl
+      DO j = 1,nl
+        phi1    (jdcum, j, k) = phi    (i, j, k)          !AC!
+        phi21   (jdcum, j, k) = phi2   (i, j, k)          !RomP
+        sigij1  (jdcum, j, k) = sigij  (i, j, k)          !RomP
+        elij1   (jdcum, j, k) = elij   (i, j, k)          !RomP
+        epmlmMm1(jdcum, j, k) = epmlmMm(i, j, k)          !RomP+jyg
       END DO
+    ENDDO
+  ENDDO
 !>jyg
     ! AC!
@@ -246 +273 @@
       asupmaxmin1(:) = asupmaxmin(:)
 !
-      sig1(:, 1:nl+1) = sig(:, 1:nl+1)
-      w01(:, 1:nl+1) = w0(:, 1:nl+1)
-      ft1(:, 1:nl+1) = ft(:, 1:nl+1)
-      fq1(:, 1:nl+1) = fq(:, 1:nl+1)
-      fu1(:, 1:nl+1) = fu(:, 1:nl+1)
-      fv1(:, 1:nl+1) = fv(:, 1:nl+1)
-      ma1(:, 1:nl+1) = ma(:, 1:nl+1)
-      mip1(:, 1:nl+1) = mip(:, 1:nl+1)
-      vprecip1(:, 1:nl+1) = vprecip(:, 1:nl+1)
-      upwd1(:, 1:nl+1) = upwd(:, 1:nl+1)
-      dnwd1(:, 1:nl+1) = dnwd(:, 1:nl+1)
-      dnwd01(:, 1:nl+1) = dnwd0(:, 1:nl+1)
-      qcondc1(:, 1:nl+1) = qcondc(:, 1:nl+1)
-      tvp1(:, 1:nl+1) = tvp(:, 1:nl+1)
-      ftd1(:, 1:nl+1) = ftd(:, 1:nl+1)
-      fqd1(:, 1:nl+1) = fqd(:, 1:nl+1)
-      asupmax1(:, 1:nl+1) = asupmax(:, 1:nl+1)
-
-      da1(:, 1:nl+1) = da(:, 1:nl+1)              !AC!
-      mp1(:, 1:nl+1) = mp(:, 1:nl+1)              !RomP
-      d1a1(:, 1:nl+1) = d1a(:, 1:nl+1)            !RomP
-      dam1(:, 1:nl+1) = dam(:, 1:nl+1)            !RomP
-      clw1(:, 1:nl+1) = clw(:, 1:nl+1)            !RomP
-      evap1(:, 1:nl+1) = evap(:, 1:nl+1)          !RomP
-      ep1(:, 1:nl+1) = ep(:, 1:nl+1)              !RomP
-      eplamM1(:, 1:nl+1) = eplamM(:, 1:nl+1)       !RomP+jyg
-      wdtrainA1(:, 1:nl+1) = wdtrainA(:, 1:nl+1)  !RomP
-      wdtrainM1(:, 1:nl+1) = wdtrainM(:, 1:nl+1)  !RomP
-      qtc1(:, 1:nl+1) = qtc(:, 1:nl+1)
-      sigt1(:, 1:nl+1) = sigt(:, 1:nl+1)
-!
-      phi1    (:, 1:nl+1, 1:nl+1) = phi    (:, 1:nl+1, 1:nl+1)  !AC!
-      phi21   (:, 1:nl+1, 1:nl+1) = phi2   (:, 1:nl+1, 1:nl+1)  !RomP
-      sigij1  (:, 1:nl+1, 1:nl+1) = sigij  (:, 1:nl+1, 1:nl+1)  !RomP
-      elij1   (:, 1:nl+1, 1:nl+1) = elij   (:, 1:nl+1, 1:nl+1)  !RomP
-      epmlmMm1(:, 1:nl+1, 1:nl+1) = epmlmMm(:, 1:nl+1, 1:nl+1)  !RomP+jyg
+      sig1(:, 1:nl) = sig(:, 1:nl)
+      w01(:, 1:nl) = w0(:, 1:nl)
+      ft1(:, 1:nl) = ft(:, 1:nl)
+      fq1(:, 1:nl) = fq(:, 1:nl)
+      fu1(:, 1:nl) = fu(:, 1:nl)
+      fv1(:, 1:nl) = fv(:, 1:nl)
+      ma1(:, 1:nl) = ma(:, 1:nl)
+      mip1(:, 1:nl) = mip(:, 1:nl)
+      vprecip1(:, 1:nl) = vprecip(:, 1:nl)
+      vprecipi1(:, 1:nl) = vprecipi(:, 1:nl)
+      upwd1(:, 1:nl) = upwd(:, 1:nl)
+      dnwd1(:, 1:nl) = dnwd(:, 1:nl)
+      dnwd01(:, 1:nl) = dnwd0(:, 1:nl)
+      qcondc1(:, 1:nl) = qcondc(:, 1:nl)
+      tvp1(:, 1:nl) = tvp(:, 1:nl)
+      ftd1(:, 1:nl) = ftd(:, 1:nl)
+      fqd1(:, 1:nl) = fqd(:, 1:nl)
+      asupmax1(:, 1:nl) = asupmax(:, 1:nl)
+
+      da1(:, 1:nl) = da(:, 1:nl)              !AC!
+      mp1(:, 1:nl) = mp(:, 1:nl)              !RomP
+      d1a1(:, 1:nl) = d1a(:, 1:nl)            !RomP
+      dam1(:, 1:nl) = dam(:, 1:nl)            !RomP
+      clw1(:, 1:nl) = clw(:, 1:nl)            !RomP
+      evap1(:, 1:nl) = evap(:, 1:nl)          !RomP
+      ep1(:, 1:nl) = ep(:, 1:nl)              !RomP
+      eplamM1(:, 1:nl) = eplamM(:, 1:nl)       !RomP+jyg
+      wdtrainA1(:, 1:nl) = wdtrainA(:, 1:nl)  !RomP
+      wdtrainM1(:, 1:nl) = wdtrainM(:, 1:nl)  !RomP
+      qtc1(:, 1:nl) = qtc(:, 1:nl)
+      sigt1(:, 1:nl) = sigt(:, 1:nl)
+!
+      ma1(:, nlp) = 0.
+      vprecip1(:, nlp) = 0.
+      vprecipi1(:, nlp) = 0.
+      upwd1(:, nlp) = 0.
+      dnwd1(:, nlp) = 0.
+      dnwd01(:, nlp) = 0.
+
+!
+      phi1    (:, 1:nl, 1:nl) = phi    (:, 1:nl, 1:nl)  !AC!
+      phi21   (:, 1:nl, 1:nl) = phi2   (:, 1:nl, 1:nl)  !RomP
+      sigij1  (:, 1:nl, 1:nl) = sigij  (:, 1:nl, 1:nl)  !RomP
+      elij1   (:, 1:nl, 1:nl) = elij   (:, 1:nl, 1:nl)  !RomP
+      epmlmMm1(:, 1:nl, 1:nl) = epmlmMm(:, 1:nl, 1:nl)  !RomP+jyg
   ENDIF !(compress)
 !>jyg