Changeset 1999 for LMDZ5/branches/testing/libf/phylmd/thermcell_main.F90

Timestamp:

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

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/thermcell_main.F90 (modified) (4 diffs)

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

@@ -83 +83 @@
       REAL pplay(ngrid,nlay),pplev(ngrid,nlay+1)
       real pphi(ngrid,nlay)
+      LOGICAL debut
 
 !   local:
@@ -178 +179 @@
 !FH/IM     save f0
       real zlevinter(klon)
-      logical debut
        real seuil
       real csc(klon,klev)
@@ -256 +256 @@
 !
 
-      seuil=0.25
-
-      if (debut)  then
-!        call getin('dvdq',dvdq)
-!        call getin('dqimpl',dqimpl)
-
-         if (iflag_thermals==15.or.iflag_thermals==16) then
-            dvdq=0
-            dqimpl=-1
-         else
-            dvdq=1
-            dqimpl=1
-         endif
-
-         fm0=0.
-         entr0=0.
-         detr0=0.
-
-
-#undef wrgrads_thermcell
-#ifdef wrgrads_thermcell
-! Initialisation des sorties grads pour les thermiques.
-! Pour l'instant en 1D sur le point igout.
-! Utilise par thermcell_out3d.h
-         str10='therm'
-         call inigrads(1,1,rlond(igout),1.,-180.,180.,jjm, &
-     &   rlatd(igout),-90.,90.,1.,llm,pplay(igout,:),1.,   &
-     &   ptimestep,str10,'therm ')
-#endif
-
-
-
-      endif
-
-      fm=0. ; entr=0. ; detr=0.
-
-
-      icount=icount+1
+   seuil=0.25
+
+   if (debut) then
+      if (iflag_thermals==15.or.iflag_thermals==16) then
+         dvdq=0
+         dqimpl=-1
+      else
+         dvdq=1
+         dqimpl=1
+      endif
+
+      fm0=0.
+      entr0=0.
+      detr0=0.
+   endif
+   fm=0. ; entr=0. ; detr=0.
+   icount=icount+1
 
 !IM 090508 beg
@@ -1091 +1070 @@
 !     print*,'15 OK convect8 CCCCCCCCCCCCCCCCCCc'
 
-#ifdef wrgrads_thermcell
-      if (prt_level.ge.1) print*,'thermcell_main sorties 3D'
-#include "thermcell_out3d.h"
-#endif
-
       endif