Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/thermcell_flux2.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/thermcell_flux2.F90 (modified) (13 diffs)

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

@@ -13 +13 @@
 !---------------------------------------------------------------------------
 
+      USE print_control_mod, ONLY: prt_level
       IMPLICIT NONE
-#include "iniprint.h"
 #include "thermcell.h"
       
@@ -50 +50 @@
       save fomass_max,alphamax
 
-      logical check_debug,labort_gcm
+      logical check_debug,labort_physic
 
       character (len=20) :: modname='thermcell_flux2'
@@ -108 +108 @@
                     print*,'detr_star(ig,l)',detr_star(ig,l)
                     abort_message = ''
-                    labort_gcm=.true.
-                    CALL abort_gcm (modname,abort_message,1)
+                    labort_physic=.true.
+                    CALL abort_physic (modname,abort_message,1)
                endif
             endif
@@ -270 +270 @@
 
 
-         labort_gcm=.false.
+         labort_physic=.false.
          do ig=1,ngrid
             if (entr(ig,l)<0.) then
-               labort_gcm=.true.
+               labort_physic=.true.
                igout=ig
                lout=l
@@ -279 +279 @@
          enddo
 
-         if (labort_gcm) then
+         if (labort_physic) then
             print*,'N1 ig,l,entr',igout,lout,entr(igout,lout)
             abort_message = 'entr negatif'
-            CALL abort_gcm (modname,abort_message,1)
+            CALL abort_physic (modname,abort_message,1)
          endif
 
@@ -310 +310 @@
          enddo
 
-         labort_gcm=.false.
+         labort_physic=.false.
          do ig=1,ngrid
             if (entr(ig,l).lt.0.) then
-               labort_gcm=.true.
+               labort_physic=.true.
                igout=ig
             endif
          enddo
-         if (labort_gcm) then
+         if (labort_physic) then
             ig=igout
             print*,'ig,l,lmax(ig)',ig,l,lmax(ig)
@@ -323 +323 @@
             print*,'fm(ig,l)',fm(ig,l)
             abort_message = 'probleme dans thermcell flux'
-            CALL abort_gcm (modname,abort_message,1)
+            CALL abort_physic (modname,abort_message,1)
          endif
 
@@ -348 +348 @@
          enddo
 
-         labort_gcm=.false.
+         labort_physic=.false.
          do ig=1,ngrid
             if (detr(ig,l).lt.0.) then
-               labort_gcm=.true.
+               labort_physic=.true.
                igout=ig
             endif
         enddo
-        if (labort_gcm) then
+        if (labort_physic) then
                ig=igout
                print*,'cas 2 : ig,l,lmax(ig)',ig,l,lmax(ig)
@@ -361 +361 @@
                print*,'fm(ig,l)',fm(ig,l)
                abort_message = 'probleme dans thermcell flux'
-               CALL abort_gcm (modname,abort_message,1)
+               CALL abort_physic (modname,abort_message,1)
         endif
 !    enddo
@@ -427 +427 @@
 
       if (1.eq.1) then
-      labort_gcm=.false.
+      labort_physic=.false.
       do l=1,klev-1
          do ig=1,ngrid
@@ -450 +450 @@
                          igout=ig
                          lout=l
-                         labort_gcm=.true.
+                         labort_physic=.true.
                       endif
                       entr(ig,l+1)=entr(ig,l+1)-ddd
@@ -461 +461 @@
          enddo
       enddo
-      if (labort_gcm) then
+      if (labort_physic) then
                          ig=igout
                          l=lout
@@ -479 +479 @@
                          print*,'fm(ig,l)',fm(ig,l)
                          abort_message = 'probleme dans thermcell_flux'
-                         CALL abort_gcm (modname,abort_message,1)
+                         CALL abort_physic (modname,abort_message,1)
       endif
       endif