Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/conflx.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/conflx.F90 (modified) (11 diffs)

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

@@ -16 +16 @@
   ! et lessivage des traceurs passifs.
   ! ======================================================================
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -210 +208 @@
   IMPLICIT NONE
   ! ------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -489 +485 @@
   ! AND INITIALIZES VALUES FOR UPDRAFTS
   ! ----------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -619 +613 @@
   ! (NON ENTRAINING PLUME,I.E.CONSTANT MASSFLUX)
   ! ----------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -696 +688 @@
   ! FOR CUMULUS PARAMETERIZATION
   ! ----------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -992 +982 @@
     pdpmel, ktopm2, pmflxr, pmflxs)
   USE dimphy
+  USE print_control_mod, ONLY: prt_level
   IMPLICIT NONE
   ! ----------------------------------------------------------------------
@@ -997 +988 @@
   ! FLUXES IN THE CLOUD LAYER AND IN THE SUBCLOUD LAYER
   ! ----------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
   include "YOECUMF.h"
-  include "iniprint.h"
 
   REAL cevapcu(klon, klev)
@@ -1242 +1230 @@
   ! calculer les tendances T et Q
   ! ----------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -1319 +1305 @@
   ! MOIST ENVIRONMENTAL AIR AND CLOUD AIR.
   ! ----------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -1428 +1412 @@
 
   ! ----------------------------------------------------------------------
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -1535 +1517 @@
   ! kcall=2  EVAPORATION IN DOWNDRAFTS (E.G. CUDLFS,CUDDRAF)
 
-  ! yminclude "dimensions.h"
-  ! yminclude "dimphy.h"
   include "YOMCST.h"