Changeset 2787 for LMDZ5/branches/testing/libf/phylmd/cdrag.F90

Timestamp:

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

Author:

Laurent Fairhead

Message:

Merged trunk changes r2727:2785 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/cdrag.F90 (modified) (5 diffs, 1 prop)

LMDZ5/branches/testing/libf/phylmd/cdrag.F90

@@ -1 +1 @@
 !
-!$Id: cdrag.F90 ???? 2015-??-?? ??:??:??Z ? $
+!$Id$
 !
  SUBROUTINE cdrag( knon,  nsrf,   &
@@ -9 +9 @@
   USE dimphy
   USE indice_sol_mod
-  USE print_control_mod, ONLY: lunout
+  USE print_control_mod, ONLY: lunout, prt_level
   IMPLICIT NONE
 ! ================================================================= c
@@ -139 +139 @@
      IF (qsurf(i).LT.0.0)  ng_qsurf = ng_qsurf + 1
   ENDDO
-  IF (ng_q1.GT.0) THEN
+  IF (ng_q1.GT.0 .and. prt_level > 5) THEN
       WRITE(lunout,*)" *** Warning: Negative q1(humidity at 1st level) values in cdrag.F90 !"
       WRITE(lunout,*)" The total number of the grids is: ", ng_q1
@@ -146 +146 @@
 !      CALL abort_physic(modname,abort_message,1)
   ENDIF
-  IF (ng_qsurf.GT.0) THEN
+  IF (ng_qsurf.GT.0 .and. prt_level > 5) THEN
       WRITE(lunout,*)" *** Warning: Negative qsurf(humidity at surface) values in cdrag.F90 !"
       WRITE(lunout,*)" The total number of the grids is: ", ng_qsurf
@@ -172 +172 @@
 ! the negative qsurf and q1 are set to zero (as in coefcdrag)
      ztsolv = tsurf(i) * (1.0+RETV*max(qsurf(i),0.0)) ! negative qsurf set to zero
-     ztvd = (t1(i)+zgeop1(i)/RCPD/(1.+RVTMP2*q1(i))) &
+     ztvd = (t1(i)+zgeop1(i)/RCPD/(1.+RVTMP2*max(q1(i),0.0))) &
           *(1.+RETV*max(q1(i),0.0)) ! negative q1 set to zero
      zri(i) = zgeop1(i)*(ztvd-ztsolv)/(zdu2*ztvd)