Changeset 2723 for trunk/LMDZ.GENERIC/libf

Timestamp:

Jun 21, 2022, 11:05:46 AM (3 years ago)

Author:

aslmd

Message:

rainthreshold constant & delete useless lines

File:

• trunk/LMDZ.GENERIC/libf/phystd/rain_generic.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/rain_generic.F90

@@ -84 +84 @@
 
    ! for simple scheme : precip_scheme_generic=1
-   real,parameter :: t_crit=218.0 ! need to be modified to be generic for all species
    real lconvert
 
@@ -129 +128 @@
 
       if(call_ice_vap_generic) then ! to call only one time the ice/vap pair of a tracer
-
-         ! Let's get the index of our tracers (we look for igcm _generic_vap and igcm_generic_ice)
-         igcm_generic_vap=iq
-         igcm_generic_ice = -1
-
-         ! We look for the corresponding ice traceur (before or after in the list of traceurs, maybe could be generalised to the whole list)
-         if (iq .ne. nq) then
-            if ((noms(iq)(1:len(trim(noms(iq)))-4) .eq. noms(iq+1)(1:len(trim(noms(iq+1)))-4)) .and. (index(noms(iq+1),"ice") .ne. 0)) then
-               igcm_generic_ice = iq+1
-            end if
-         end if
-         if ((iq .gt. 1)) then
-            if ((noms(iq)(1:len(trim(noms(iq)))-4) .eq. noms(iq-1)(1:len(trim(noms(iq-1)))-4)) .and. (index(noms(iq-1),"ice") .ne. 0)) then
-                  igcm_generic_ice = iq-1
-            end if
-         end if
-         if (igcm_generic_ice .eq. -1) then
-            write(*,*) "ERROR : You set a vap traceur but you forgot to set the corresponding ice traceur, &
-            or the pair vap/ice is not written one after another in traceur.def"
-         endif
       
          m=constants_mass(iq)
@@ -314 +293 @@
 
                do i = 1, ngrid
-                  t_tmp = zt(i,k)
-                  if (t_tmp .ge. T_h2O_ice_liq) then
-                     lconvert=rainthreshold_generic
-                  elseif (t_tmp .gt. t_crit) then
-                     lconvert=rainthreshold_generic*(1.- t_crit/t_tmp)
-                     lconvert=MAX(0.0,lconvert)              
-                  else
-                     lconvert=0.
-                  endif
-
-                  ! lconvert is between 0. and rainthreshold_generic
-
+                  
+                  lconvert=rainthreshold_generic
 
                   if (ql(i,k).gt.1.e-9) then