Changeset 133 in lmdz_wrf

Timestamp:

Jul 29, 2014, 11:24:27 AM (10 years ago)

Author:

lfita

Message:

Removing checks, but keeping non negative SQRT

File:

• branches/LMDZ_WRFmeas/WRFV3/lmdz/thermcell_plume.F90 (modified) (9 diffs)

branches/LMDZ_WRFmeas/WRFV3/lmdz/thermcell_plume.F90

@@ -89 +89 @@
 
       REAL zw2fact,expa
-! Lluis
-      INTEGER                                            :: llp
-      CHARACTER(LEN=50)                                  :: lvarname, lfname
-      REAL                                               :: largest
-
-      llp = 734
-      lfname = 'physiq'
-      largest = 10.e5
-
       Zsat=.false.
 
@@ -174 +165 @@
                alim_star(ig,l)=alim_star(ig,l)/alim_star_tot(ig)
             endif
-            IF (zlev(ig,l+1) < 0. .OR. alim_star_tot(ig) == 0.) THEN
-              PRINT *,'Lluis ',ig,',',l,' negative zlev: ',zlev(ig,l+1),' null: ',alim_star_tot(ig)
-            END IF
          enddo
       enddo
       alim_star_tot(:)=1.
-
-      lfname='thermcell_plume after computing alim_star'
-      lvarname = 'alim_star'
-      CALL check_var3D(lfname, lvarname, alim_star, ngrid, klev, largest, .FALSE.)
-      lvarname = 'ztv'
-      CALL check_var3D(lfname, lvarname, ztv, ngrid, klev, largest, .FALSE.)
-      lvarname = 'zlev'
-      CALL check_var3D(lfname, lvarname, zlev, ngrid, klev+1, largest, .FALSE.)
 
 !------------------------------------------------------------------------------
@@ -212 +192 @@
 enddo
 !
-
-      lfname='thermcell_plume after k=2'
-      lvarname = 'zw2'
-      CALL check_var3D(lfname, lvarname, zw2, ngrid, klev+1, largest, .FALSE.)
-      lvarname = 'ztv'
-      CALL check_var3D(lfname, lvarname, ztv, ngrid, klev, largest, .FALSE.)
-      lvarname = 'zlev'
-      CALL check_var3D(lfname, lvarname, zlev, ngrid, klev+1, largest, .FALSE.)
-      lvarname = 'pphi'
-      CALL check_var3D(lfname, lvarname, pphi, ngrid, klev, largest, .FALSE.)
-      lvarname = 'alim_star'
-      CALL check_var3D(lfname, lvarname, alim_star, ngrid, klev, largest, .FALSE.)
-      lvarname = 'entr_star'
-      CALL check_var3D(lfname, lvarname, entr_star, ngrid, klev, largest, .FALSE.)
-
-
 !==============================================================================
 !boucle de calcul de la vitesse verticale dans le thermique
@@ -356 +320 @@
       endif
    enddo
-  lfname='thermcell_plume calcul alim_star'
-  lvarname = 'alim_star'
-  CALL check_var3D(lfname, lvarname, alim_star, ngrid, klev, largest, .FALSE.)
-  lvarname = 'entr_star'
-  CALL check_var3D(lfname, lvarname, entr_star, ngrid, klev, largest, .FALSE.)
 
 !----------------------------------------------------------------------------
@@ -467 +426 @@
       enddo
 !=========================================================================
-
-  lfname='thermcell_plume end of vertical loop'
-  lvarname = 'zw2'
-  CALL check_var3D(lfname, lvarname, zw2, ngrid, klev+1, largest, .FALSE.)
-  lvarname = 'ztv'
-  CALL check_var3D(lfname, lvarname, ztv, ngrid, klev, largest, .FALSE.)
-  lvarname = 'zlev'
-  CALL check_var3D(lfname, lvarname, zlev, ngrid, klev+1, largest, .FALSE.)
-  lvarname = 'pphi'
-  CALL check_var3D(lfname, lvarname, pphi, ngrid, klev, largest, .FALSE.)
-  lvarname = 'alim_star'
-  CALL check_var3D(lfname, lvarname, alim_star, ngrid, klev, largest, .FALSE.)
-
 
 !on recalcule alim_star_tot
@@ -592 +538 @@
       REAL fact_gamma,fact_epsilon,fact_gamma2,fact_epsilon2
       REAL c2(ngrid,klev)
-
-! Lluis
-      INTEGER                                            :: llp
-      CHARACTER(LEN=50)                                  :: lvarname, lfname
-      REAL                                               :: largest
-
-      llp = 734
-      lfname = 'physiq'
-      largest = 10.e5
 
       Zsat=.false.
@@ -675 +612 @@
                END IF
                alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l)
-            IF (zlev(ig,l+1) < 0. .OR. alim_star_tot(ig) == 0.) THEN
-              PRINT *,'Lluis ',ig,',',l,' negative zlev: ',zlev(ig,l+1),' null: ',alim_star_tot(ig)
-            END IF
             endif
          enddo
@@ -689 +623 @@
       enddo
       alim_star_tot(:)=1.
-
-      lfname='thermcellV1_plume after computing alim_star'
-      lvarname = 'alim_star'
-      CALL check_var3D(lfname, lvarname, alim_star, ngrid, klev, largest, .FALSE.)
-      lvarname = 'ztv'
-      CALL check_var3D(lfname, lvarname, ztv, ngrid, klev, largest, .FALSE.)
-      lvarname = 'zlev'
-      CALL check_var3D(lfname, lvarname, zlev, ngrid, klev+1, largest, .FALSE.)
-
-
 !------------------------------------------------------------------------------
 ! Calcul dans la premiere couche
@@ -820 +744 @@
    enddo
 
-
-      lfname='thermcellV1_plume after k=2'
-      lvarname = 'alim_star'
-      CALL check_var3D(lfname, lvarname, alim_star, ngrid, klev, largest, .FALSE.)
-      lvarname = 'entr_star'
-      CALL check_var3D(lfname, lvarname, entr_star, ngrid, klev, largest, .FALSE.)
-      lvarname = 'detr_star'
-      CALL check_var3D(lfname, lvarname, detr_star, ngrid, klev, largest, .FALSE.)
-      lvarname = 'f_star'
-      CALL check_var3D(lfname, lvarname, f_star, ngrid, klev, largest, .FALSE.)
-
 !----------------------------------------------------------------------------
 !calcul de la vitesse verticale en melangeant Tl et qt du thermique