Changeset 2694

Timestamp:

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

Author:

aslmd

Message:

fixed uninitialized variable Lcp in largescale_generic+ typo in index of tendencies after largescale_generic in physiq_mod

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• evap_generic.F90 (modified) (3 diffs)
• genericcommon_h.F90 (modified) (7 diffs)
• largescale_generic_mod.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (1 diff)

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

@@ -36 +36 @@
     real zlvdcp
     integer l,ig ! Used for loops on the layers and grid and the tracers respectively
+
     !   Evaporate all the ice from the tracer
     zlvdcp = RLVTT/cpp ! RLVTT is the latent heat of vaporization (comes from genericcommon_h attention)
+ 
     DO l=1,nlayer
         DO ig=1,ngrid 
@@ -45 +47 @@
                     +pdq(ig,l,igcm_generic_ice)*dtime
             tevap(ig,l) = pt(ig,l)+pdt(ig,l)*dtime 
-            dqevap(ig,l) = max(0.,qevap(ig,l,igcm_generic_ice)/dtime)
+            dqevap(ig,l) = max(0.,qevap(ig,l,igcm_generic_ice))/dtime
             dtevap(ig,l) = -dqevap(ig,l)*zlvdcp 
             qevap(ig,l,igcm_generic_vap) = qevap(ig,l,igcm_generic_vap) &
@@ -54 +56 @@
     ENDDO ! nlayer 
 
-
 end subroutine evap_generic
 

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

@@ -34 +34 @@
             Tref = 2303.0 !K
             Pref =   1.0E5 !in Pa
+            m = 24.3055
             RLVTT = delta_vapH/(m/1000.)
             metallicity_coeff=1.0*log(10.0)
-            m = 24.3055
+            
         else if (trim(specname) .eq. "Na") then
             print*,"Loading data for Na"
@@ -42 +43 @@
             Tref = 1624.0
             Pref =  1.0E5
+            m = 22.9898
             RLVTT = delta_vapH/(m/1000.)
             metallicity_coeff=0.5*log(10.0)
-            m = 22.9898
+            
         else if (trim(specname) .eq. "Fe") then 
             print*,"Loading data for Fe"
@@ -50 +52 @@
             Tref = 2903.0
             Pref  = 1.0E5
+            m = 55.8450
             RLVTT = delta_vapH/(m/1000.)
             metallicity_coeff=0.0*log(10.0)
-            m = 55.8450
+            
         else if (trim(specname) .eq. "Cr") then
             print*,"Loading data for Cr"
@@ -58 +61 @@
             Tref = 2749.0
             Pref  = 1.0E5
+            m = 51.9961
             RLVTT = delta_vapH/(m/1000.)
             metallicity_coeff=0.0*log(10.0)
-            m = 51.9961
+            
         else if (trim(specname) .eq. "KCl") then 
             print*,"Loading data for KCl"
@@ -68 +72 @@
             metallicity_coeff=0.0*log(10.0)
             m = 74.5498
+            RLVTT = delta_vapH/(m/1000.)
         else if (trim(specname) .eq. "Mn") then 
             print*,"Loading data for Mn"
@@ -75 +80 @@
             metallicity_coeff=1.0*log(10.0)
             m = 54.9380
+            RLVTT = delta_vapH/(m/1000.)
         else if (trim(specname) .eq. "Zn") then 
             print*,"Loading data for Zn"
@@ -82 +88 @@
             metallicity_coeff=1.0*log(10.0)
             m = 65.38
+            RLVTT = delta_vapH/(m/1000.)
         else
             print*,"Unknow species (not in Mg, Fe, Na, KCl, Cr, Mn or Zn)"

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

@@ -78 +78 @@
         pdqvaplsc(1:ngrid,1:nlayer)  = 0.0
         pdqliqlsc(1:ngrid,1:nlayer) = 0.0
-        Lcp=RLVTT/cpp
         igcm_generic_vap = -1
         igcm_generic_ice = -1
@@ -93 +92 @@
         call specie_parameters(trim(adjustl(tname_vap(9:len(tname_ice)-4))))
         ! Evaporate generic clouds (all of them)
+        Lcp=RLVTT/cpp !need to be init here, otherwise we don't know RLVTT yet
         call evap_generic(ngrid,nlayer,nq,ptimestep,pt,pq,pdq,pdt,&
                 igcm_generic_vap,igcm_generic_ice, &

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

@@ -1556 +1556 @@
                                        dqvaplscale_generic,dqcldlscale_generic)
                pdt(1:ngrid,1:nlayer) = pdt(1:ngrid,1:nlayer)+dtlscale_generic(1:ngrid,1:nlayer)
-               pdq(1:ngrid,1:nlayer,ig) = pdq(1:ngrid,1:nlayer,ig)+dtlscale_generic(1:ngrid,1:nlayer)
-               pdq(1:ngrid,1:nlayer,ig+1) = pdq(1:ngrid,1:nlayer,ig+1)+dqcldlscale_generic(1:ngrid,1:nlayer)
+               pdq(1:ngrid,1:nlayer,iq) = pdq(1:ngrid,1:nlayer,iq)+dtlscale_generic(1:ngrid,1:nlayer)
+               pdq(1:ngrid,1:nlayer,iq+1) = pdq(1:ngrid,1:nlayer,iq+1)+dqcldlscale_generic(1:ngrid,1:nlayer)
                !!!!huge assumption in the last line : ice tracer has index +1 of vap tracer
             endif ! (is_generic(iq)==1 .and. (index(noms(iq),"vap")==1))