Changeset 5618 for LMDZ6/branches/contrails/libf/phylmd/lmdz_thermcell_main.F90

Timestamp:

Apr 15, 2025, 11:56:45 AM (2 months ago)

Author:

aborella

Message:

Merge with trunk testing r5597. We have convergence in prod and debug in NPv7.0.1c

Location:

LMDZ6/branches/contrails

Files:

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

LMDZ6/branches/contrails/libf/phylmd/lmdz_thermcell_main.F90

@@ -140 +140 @@
 
 
-      integer,save :: igout=1
-!$OMP THREADPRIVATE(igout)
-      integer,save :: lunout1=6
-!$OMP THREADPRIVATE(lunout1)
-      integer,save :: lev_out=10
-!$OMP THREADPRIVATE(lev_out)
+      integer, parameter :: igout=1
+      integer, parameter :: lunout1=6
+      integer, parameter :: lev_out=10
 
       real lambda, zf,zf2,var,vardiff,CHI
@@ -166 +163 @@
       logical, dimension(ngrid,nlay) :: mask
 
-      character (len=20) :: modname='thermcell_main'
+      character (len=20), parameter :: modname='thermcell_main'
       character (len=80) :: abort_message
 
@@ -191 +188 @@
        sorties=.true.
       IF(ngrid.NE.ngrid) THEN
-         PRINT*
          PRINT*,'STOP dans convadj'
          PRINT*,'ngrid    =',ngrid
@@ -240 +236 @@
         !    SUBROUTINE thermcell_env(ngrid,nlay,po,pt,pu,pv,pplay,  &
         ! &           pplev,zo,zh,zl,ztv,zthl,zu,zv,zpspsk,pqsat,lev_out)
-        ! contenu thermcell_env : call thermcell_qsat(ngrid*nlay,mask,pplev,pt,po,pqsat)
+        ! contenu thermcell_env : call thermcell_qsat(ngrid, nlay,mask,pplev,pt,po,pqsat)
         ! contenu thermcell_env : do ll=1,nlay
         ! contenu thermcell_env :    do ig=1,ngrid
@@ -272 +268 @@
             enddo
         enddo
-        call thermcell_qsat(ngrid*nlay,mask,pplev,ptemp_env,p_o,zqsat)
+        call thermcell_qsat(ngrid, nlay, mask,pplev,ptemp_env,p_o,zqsat)
           
       endif