Changeset 5618 for LMDZ6/branches/contrails/libf/phylmd/cv3a_uncompress.f90

Timestamp:

Apr 15, 2025, 11:56:45 AM (2 months ago)

Author:

aborella

Message:

Merge with trunk testing r5597. We have convergence in prod and debug in NPv7.0.1c

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3a_uncompress.f90 (modified) (7 diffs)

LMDZ6/branches/contrails/libf/phylmd/cv3a_uncompress.f90

@@ +1 @@
+! $Id$
+
 SUBROUTINE cv3a_uncompress(nloc, len, ncum, nd, ntra, idcum, compress, &
                            iflag, kbas, ktop, &
@@ -9 +11 @@
                            plim1, plim2, asupmax, supmax0, &
                            asupmaxmin, &
+                           coef_clos, coef_clos_eff, &
                            da, phi, mp, phi2, d1a, dam, sigij, &                ! RomP+AC+jyg
                            qta, clw, elij, evap, ep, epmlmMm, eplaMm, &         ! RomP+jyg
@@ -23 +26 @@
                            plim11, plim21, asupmax1, supmax01, &
                            asupmaxmin1, &
+                           coef_clos1, coef_clos_eff1, &
                            da1, phi1, mp1, phi21, d1a1, dam1, sigij1, &         ! RomP+AC+jyg
                            qta1, clw1, elij1, evap1, ep1, epmlmMm1, eplaMm1, &  ! RomP+jyg
@@ -68 +72 @@
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: asupmax
   REAL, DIMENSION (nloc), INTENT (IN)                :: supmax0, asupmaxmin
+  REAL, DIMENSION (nloc), INTENT (IN)                :: coef_clos, coef_clos_eff
 
   REAL, DIMENSION (nloc, nd), INTENT (IN)            :: da
@@ -105 +110 @@
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: asupmax1
   REAL, DIMENSION (len), INTENT (OUT)                :: supmax01, asupmaxmin1
+  REAL, DIMENSION (len), INTENT (OUT)                :: coef_clos1, coef_clos_eff1
                                                     
   REAL, DIMENSION (len, nd), INTENT (OUT)            :: da1
@@ -149 +155 @@
       supmax01(idcum(i)) = supmax0(i)
       asupmaxmin1(idcum(i)) = asupmaxmin(i)
+      coef_clos1(idcum(i)) = coef_clos(i)
+      coef_clos_eff1(idcum(i)) = coef_clos_eff(i)
       epmax_diag1(idcum(i)) = epmax_diag(i)
     END DO
@@ -282 +290 @@
       supmax01(:) = supmax0(:)
       asupmaxmin1(:) = asupmaxmin(:)
+      coef_clos1(:) = coef_clos(:)
+      coef_clos_eff1(:) = coef_clos_eff(:)
 !
       sig1(:, 1:nl) = sig(:, 1:nl)