Changeset 942 for LMDZ4/trunk

Timestamp:

Apr 10, 2008, 4:25:06 PM (17 years ago)

Author:

lmdzadmin

Message:

Petit bogue dimensions fm_therm + declaration phys_state_var_mod
IM

Location:

LMDZ4/trunk/libf/phylmd

Files:

• phys_state_var_mod.F90 (modified) (3 diffs)
• physiq.F (modified) (10 diffs)

LMDZ4/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -31 +31 @@
       REAL, ALLOCATABLE, SAVE :: zmax0(:), f0(:) ! 
       REAL, ALLOCATABLE, SAVE :: ema_work1(:,:), ema_work2(:,:)
+      REAL, ALLOCATABLE, SAVE :: entr_therm(:,:), fm_therm(:,:)
 CONTAINS
 
@@ -59 +60 @@
       ALLOCATE(zmax0(klon), f0(klon))
       ALLOCATE(ema_work1(klon,klev), ema_work2(klon,klev))
+      ALLOCATE(entr_therm(klon,klev), fm_therm(klon,klev+1))
 
 END SUBROUTINE phys_state_var_init
@@ -77 +79 @@
       deallocate( zmax0, f0 )
       deallocate( ema_work1, ema_work2 )
+      deallocate( entr_therm, fm_therm )
 
 END SUBROUTINE phys_state_var_end

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -172 +172 @@
 c======================================================================
 c     pour phsystoke avec thermiques
-      REAL fm_therm(klon,klev+1)
-      REAL entr_therm(klon,klev)
       real,allocatable,save :: clwcon0th(:,:),rnebcon0th(:,:)
 c$OMP THREADPRIVATE(clwcon0th,rnebcon0th)
@@ -1358 +1356 @@
 c======================================================================
 
-      if (1.eq.1) then
+      if (prt_level.ge.1) then
           igout=klon/2
          write(lunout,*) 'DEBUT DE PHYSIQ !!!!!!!!!!!!!!!!!!!!'
@@ -1531 +1529 @@
       ENDIF
 
-      print*,'CONVERGENCE PHYSIQUE THERM 1 '
+      if(prt_level.ge.1) print*,'CONVERGENCE PHYSIQUE THERM 1 '
 
 
@@ -2143 +2141 @@
       endif
 
-      print*,'Longitude solaire ',zlongi,solarlong0
+      if(prt_level.ge.1) print*,'Longitude solaire ',zlongi,solarlong0
 
 !  Avec ou sans cycle diurne
@@ -2255 +2253 @@
       ENDDO
 
-      if (1.eq.1) then
+      if (prt_level.ge.1) then
       write(lunout,*) 'L   qsat (g/kg) avant clouds_gno'
       write(lunout,'(i4,f15.4)') (k,1000.*zqsat(igout,k),k=1,klev)
@@ -2355 +2353 @@
 cdans le thermique sinon
        if (iflag_coupl.eq.0) then
-          print*,'ALE et ALP imposes'
+          if (debut) print*,'ALE et ALP imposes'
           do i = 1,klon
 con ne couple que ale
@@ -2609 +2607 @@
       d_q_ajs(:,:)=0.
       clwcon0th(:,:)=0.
-      fm_therm(:,:)=0.
-      entr_therm(:,:)=0.
 c
       IF(prt_level>9)WRITE(lunout,*)
@@ -2626 +2622 @@
 c  ==========
          IF(prt_level>9)WRITE(lunout,*)'JUSTE AVANT , iflag_thermals='
-     s   ,iflag_thermals,'   nsplit_thermals=',nsplit_thermals
-         print*,'JUSTE AVANT , iflag_thermals='
      s   ,iflag_thermals,'   nsplit_thermals=',nsplit_thermals
 
@@ -2722 +2716 @@
          ptconvth(:,:)=.false.
          ratqsc(:,:)=0.
-         print*,'avant clouds_gno thermique'
+         if(prt_level.ge.9) print*,'avant clouds_gno thermique'
          call clouds_gno
      s   (klon,klev,q_seri,zqsat,clwcon0th,ptconvth,ratqsc,rnebcon0th)
-         print*,' CLOUDS_GNO OK'
+         if(prt_level.ge.9) print*,' CLOUDS_GNO OK'
       endif
 
@@ -3632 +3626 @@
 !==========================================================================
 
-      if (1.eq.1) then
+      if (prt_level.ge.1) then
       write(lunout,*) 'FIN DE PHYSIQ !!!!!!!!!!!!!!!!!!!!'
       write(lunout,*)