Changeset 1999 for LMDZ5/branches/testing/libf/phylmd/cv30param.h

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cv30param.h (modified) (2 diffs)

LMDZ5/branches/testing/libf/phylmd/cv30param.h

@@ -2 +2 @@
 ! $Header$
 !
-c------------------------------------------------------------
-c Parameters for convectL, iflag_con=30:
-c (includes - microphysical parameters, 
-c                       - parameters that control the rate of approach 
-c               to quasi-equilibrium)
-c                       - noff & minorig (previously in input of convect1)
-c------------------------------------------------------------
+!------------------------------------------------------------
+! Parameters for convectL, iflag_con=30:
+! (includes - microphysical parameters, 
+!                       - parameters that control the rate of approach 
+!               to quasi-equilibrium)
+!                       - noff & minorig (previously in input of convect1)
+!------------------------------------------------------------
 
       integer noff, minorig, nl, nlp, nlm
       real sigd, spfac
-cIM cf. FH : pour compatibilite avec conema3 TEMPORAIRE   real pbcrit, ptcrit, epmax
+!IM cf. FH : pour compatibilite avec conema3 TEMPORAIRE   real pbcrit, ptcrit, epmax
       real pbcrit, ptcrit
       real omtrain
@@ -20 +20 @@
       real betad
 
-      COMMON /cv30param/  noff, minorig, nl, nlp, nlm
-     :                ,  sigd, spfac
-cIM cf. FH : pour compatibilite avec conema3 TEMPORAIRE  :                ,pbcrit, ptcrit, epmax
-     :                ,pbcrit, ptcrit
-     :                ,omtrain
-     :                ,dtovsh, dpbase, dttrig
-     :                ,dtcrit, tau, beta, alpha, delta, betad
+      COMMON /cv30param/  noff, minorig, nl, nlp, nlm &
+                      ,  sigd, spfac &
+!IM cf. FH : pour compatibilite avec conema3 TEMPORAIRE  :                ,pbcrit, ptcrit, epmax
+                      ,pbcrit, ptcrit &
+                      ,omtrain &
+                      ,dtovsh, dpbase, dttrig &
+                      ,dtcrit, tau, beta, alpha, delta, betad
 
-c$OMP THREADPRIVATE(/cv30param/)
+!$OMP THREADPRIVATE(/cv30param/)