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

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

@@ -11 +11 @@
   ! Ajustement humide (Manabe) + Ajustement convectif (Kuo)
   ! ======================================================================
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -105 +103 @@
   ! du modele.
   ! ======================================================================
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
 
@@ -310 +306 @@
   ! et itop est le haut du plus haut bloc
   ! ======================================================================
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
 
@@ -1059 +1053 @@
   ! N.B. version vectorielle (le 6 oct. 1997)
   ! ======================================================================
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
 
@@ -1578 +1570 @@
   ! kcbot---output-I- Niveau du bas de la convection
   ! ======================================================================
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOETHF.h"
@@ -1682 +1672 @@
   ! KCALL=2  EVAPORATION IN DOWNDRAFTS (E.G. CUDLFS,CUDDRAF)
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
 
@@ -1777 +1765 @@
   ! Ajustement humide (Schema de convection de Manabe)
   ! .
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
 
@@ -2062 +2048 @@
   IMPLICIT NONE
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"