Changeset 3605 for LMDZ6/branches/Ocean_skin/libf/phylmd/cv3p2_closure.F90

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/cv3p2_closure.F90 (modified) (2 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/cv3p2_closure.F90

@@ -23 +23 @@
   include "cvthermo.h"
   include "cv3param.h"
+  include "cvflag.h"
   include "YOMCST2.h"
   include "YOMCST.h"
@@ -608 +609 @@
     ELSE
       ! Calculate wbeff
-      IF (flag_wb==0) THEN
+      IF (NINT(flag_wb)==0) THEN
         wbeff(il) = wbmax
-      ELSE IF (flag_wb==1) THEN
+      ELSE IF (NINT(flag_wb)==1) THEN
         wbeff(il) = wbmax/(1.+500./(ph(il,1)-plfc(il)))
-      ELSE IF (flag_wb==2) THEN
+      ELSE IF (NINT(flag_wb)==2) THEN
         wbeff(il) = wbmax*(0.01*(ph(il,1)-plfc(il)))**2
       END IF