Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/thermcellV0_main.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/thermcellV0_main.F90 (modified) (11 diffs)

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

@@ -13 +13 @@
 
       USE dimphy
-      USE comgeomphy , ONLY:rlond,rlatd
+      USE print_control_mod, ONLY: prt_level,lunout
       IMPLICIT NONE
 
@@ -41 +41 @@
 !   -------------
 
-      include "dimensions.h"
       include "YOMCST.h"
       include "YOETHF.h"
       include "FCTTRE.h"
-      include "iniprint.h"
 
 !   arguments:
@@ -465 +463 @@
       if (.not. (f0(1).ge.0.) ) then
         abort_message = 'Dans thermcell_main f0(1).lt.0 '
-        CALL abort_gcm (modname,abort_message,1)
+        CALL abort_physic (modname,abort_message,1)
       endif
 
@@ -591 +589 @@
            zcon2(ig)=zlay(ig,nlay)-(pcon(ig)-pplay(ig,nlay))/(RG*rho(ig,nlay))/100.
            abort_message = 'thermcellV0_main: les thermiques vont trop haut '
-           CALL abort_gcm (modname,abort_message,1)
+           CALL abort_physic (modname,abort_message,1)
         endif
       enddo
@@ -790 +788 @@
 
       subroutine testV0_ltherm(klon,klev,pplev,pplay,long,seuil,ztv,po,ztva,zqla,f_star,zw2,comment)
+      USE print_control_mod, ONLY: prt_level
       IMPLICIT NONE
-      include "iniprint.h"
 
       integer i, k, klon,klev
@@ -833 +831 @@
 !thermcell_closure: fermeture, determination de f
 !-------------------------------------------------------------------------
+      USE print_control_mod, ONLY: prt_level,lunout
       IMPLICIT NONE
 
-      include "iniprint.h"
       include "thermcell.h"
       INTEGER ngrid,nlay
@@ -880 +878 @@
                 print*,'wmax_sec',wmax_sec(ig)
                 abort_message = 'zdenom<1.e-14'
-                CALL abort_gcm (modname,abort_message,1)
+                CALL abort_physic (modname,abort_message,1)
              endif
              if ((zmax_sec(ig).gt.1.e-10).and.(iflag_thermals_ed.eq.0)) then 
@@ -913 +911 @@
 !--------------------------------------------------------------------------
 
+      USE print_control_mod, ONLY: prt_level
       IMPLICIT NONE
 
@@ -918 +917 @@
       include "YOETHF.h"
       include "FCTTRE.h"
-      include "iniprint.h"
       include "thermcell.h"
 
@@ -1711 +1709 @@
 !thermcell_dry: calcul de zmax et wmax du thermique sec
 !--------------------------------------------------------------------------
+       USE print_control_mod, ONLY: prt_level
        IMPLICIT NONE
       include "YOMCST.h"       
-      include "iniprint.h"
        INTEGER l,ig
 
@@ -1923 +1921 @@
 !thermcell_init: calcul du profil d alimentation du thermique
 !----------------------------------------------------------------------
+      USE print_control_mod, ONLY: prt_level
       IMPLICIT NONE
-      include "iniprint.h"
       include "thermcell.h"