Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phylmd/concvl.F90

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/concvl.F90 (modified) (5 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/concvl.F90

@@ -13 +13 @@
 !RomP >>>
 !!     .             da,phi,mp,dd_t,dd_q,lalim_conv,wght_th)
-                  da, phi, mp, phii, d1a, dam, sij, clw, elij, &     ! RomP
+                  da, phi, mp, phii, d1a, dam, sij, qta, clw, elij, &! RomP
                   dd_t, dd_q, lalim_conv, wght_th, &                 ! RomP
                   evap, ep, epmlmMm, eplaMm, &                       ! RomP
-                  wdtrainA, wdtrainM, wght, qtc, sigt, &
+                  wdtrainA, wdtrainS, wdtrainM, wght, qtc, sigt, &
                   tau_cld_cv, coefw_cld_cv, &                           ! RomP+RL, AJ
 !RomP <<<
@@ -80 +80 @@
 ! eplaMm-----output-R
 ! wdtrainA---output-R
+! wdtrainS---output-R
 ! wdtrainM---output-R
 ! wght-------output-R
@@ -134 +135 @@
   REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: d1a, dam
   REAL, DIMENSION(klon,klev,klev),INTENT(OUT)   :: sij, elij
+  REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: qta
   REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: clw
   REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: dd_t, dd_q
@@ -139 +141 @@
   REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: eplaMm
   REAL, DIMENSION(klon,klev,klev), INTENT(OUT)  :: epmlmMm
-  REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: wdtrainA, wdtrainM
+  REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: wdtrainA, wdtrainS, wdtrainM
 ! RomP <<<
   REAL, DIMENSION(klon,klev),   INTENT(OUT)     :: wght                       !RL
@@ -437 +439 @@
 !!                   evap,ep,epmlmMm,eplaMm,                              ! RomP
                     da, phi, mp, phii, d1a, dam, sij, wght, &           ! RomP+RL
-                    clw, elij, evap, ep, epmlmMm, eplaMm, &             ! RomP+RL
-                    wdtrainA, wdtrainM, qtc, sigt, &
+                    qta, clw, elij, evap, ep, epmlmMm, eplaMm, &        ! RomP+RL
+                    wdtrainA, wdtrainS, wdtrainM, qtc, sigt, &
                     tau_cld_cv, coefw_cld_cv, &                         ! RomP,AJ
 !AC!+!RomP+jyg