Changeset 1492 for LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

Timestamp:

Mar 8, 2011, 9:10:25 AM (13 years ago)

Author:

Laurent Fairhead

Message:

Merge of development branch LMDZ5V2.0-dev r1455:r1491 into the trunk.
Validation made locally: restart files are strictly equal between the HEAD of the trunk
and r1491 of LMDZ5V2.0-dev

---

Synchro de la branche de développement LMDZ5V2.0-dev r1455:r1491 et de la trunk
Validation faite en local: les fichiers restart sont équivalents entre la HEAD de la trunk
et la révision r1491 de LMDZ5V2.0-dev

Location:

LMDZ5/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -427 +427 @@
   type(ctrl_out),save :: o_pres         = ctrl_out((/ 2, 3, 10, 10, 1 /),'pres')
   type(ctrl_out),save :: o_paprs        = ctrl_out((/ 2, 3, 10, 10, 1 /),'paprs')
+  type(ctrl_out),save :: o_mass        = ctrl_out((/ 2, 3, 10, 10, 1 /),'mass')
+
   type(ctrl_out),save :: o_rneb         = ctrl_out((/ 2, 5, 10, 10, 1 /),'rneb')
   type(ctrl_out),save :: o_rnebcon      = ctrl_out((/ 2, 5, 10, 10, 1 /),'rnebcon')
@@ -1057 +1059 @@
 ! Couplage conv-CL
  IF (iflag_con.GE.3) THEN
-    IF (iflag_coupl.EQ.1) THEN
+    IF (iflag_coupl>=1) THEN
  CALL histdef2d(iff,o_ale_bl%flag,o_ale_bl%name, "ALE BL", "m2/s2") 
  CALL histdef2d(iff,o_alp_bl%flag,o_alp_bl%name, "ALP BL", "m2/s2") 
@@ -1108 +1110 @@
  CALL histdef3d(iff,o_pres%flag,o_pres%name, "Air pressure", "Pa" )
  CALL histdef3d(iff,o_paprs%flag,o_paprs%name, "Air pressure Inter-Couches", "Pa" )
+ CALL histdef3d(iff,o_mass%flag,o_mass%name, "Masse Couches", "kg/m2" )
  CALL histdef3d(iff,o_rneb%flag,o_rneb%name, "Cloud fraction", "-")
  CALL histdef3d(iff,o_rnebcon%flag,o_rnebcon%name, "Convective Cloud Fraction", "-")