Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phylmd/cv3param.h

Timestamp:

Nov 21, 2019, 4:43:45 PM (5 years ago)

Author:

lguez

Message:

Merge revisions 3427:3600 of trunk into branch Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

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

LMDZ6/branches/Ocean_skin/libf/phylmd/cv3param.h

@@ -7 +7 @@
 !------------------------------------------------------------
 
-      logical ok_homo_tend
-      logical ok_optim_yield
-      logical ok_entrain
-      logical ok_convstop
-      logical ok_intermittent
+      integer flag_epKEorig
+      real flag_wb
+      integer cv_flag_feed
       integer noff, minorig, nl, nlp, nlm
-      integer cv_flag_feed
-      integer flag_epKEorig,flag_wb
       real sigdz, spfac
       real pbcrit, ptcrit
@@ -27 +23 @@
       real delta
       real betad
+      real ejectliq
+      real ejectice
 
       COMMON /cv3param/ sigdz, spfac &
@@ -39 +37 @@
                       ,wbmax &
                       ,delta, betad  &
+                      ,ejectliq, ejectice &
                       ,flag_epKEorig &
                       ,flag_wb, cv_flag_feed &
-                      ,noff, minorig, nl, nlp, nlm  &
-                      ,ok_convstop, ok_intermittent &
-                      ,ok_optim_yield &
-                      ,ok_entrain &
-                      ,ok_homo_tend
+                      ,noff, minorig, nl, nlp, nlm
 !$OMP THREADPRIVATE(/cv3param/)