Changeset 2787 for LMDZ5/branches/testing/libf/phylmd/cv3param.h

Timestamp:

Jan 30, 2017, 5:54:45 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2727:2785 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cv3param.h (modified) (3 diffs)

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

@@ -11 +11 @@
       logical ok_intermittent
       integer noff, minorig, nl, nlp, nlm
+      integer cv_flag_feed
+      integer flag_epKEorig,flag_wb
       real sigdz, spfac
-      integer flag_epKEorig,flag_wb
       real pbcrit, ptcrit
       real elcrit, tlcrit
@@ -19 +20 @@
       real dtovsh, dpbase, dttrig
       real dtcrit, tau, beta, alpha, alpha1
+      real T_top_max
       real tau_stop, noconv_stop
       real wbmax
@@ -31 +33 @@
                       ,dtovsh, dpbase, dttrig &
                       ,dtcrit, tau, beta, alpha, alpha1 &
+                      ,T_top_max &
                       ,tau_stop, noconv_stop &
                       ,wbmax &
                       ,delta, betad  &
                       ,flag_epKEorig &
-                      ,flag_wb &
+                      ,flag_wb, cv_flag_feed &
                       ,noff, minorig, nl, nlp, nlm  &
                       ,ok_convstop, ok_intermittent &