Changeset 2810 for trunk/LMDZ.GENERIC/libf

Timestamp:

Oct 29, 2022, 8:09:31 PM (2 years ago)

Author:

emillour

Message:

Generic GCM:
Minor fix related to the RGCS scheme: when not using it, "iaero_generic(1)"
was tested although not defined; using tests on "aerogeneric" (number
of generic aerosols) works better.
EM

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• aeropacity.F90 (modified) (4 diffs)
• callkeys_mod.F90 (modified) (2 diffs)

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

@@ -3 +3 @@
 
        use radinc_h, only : L_TAUMAX,naerkind
-       use aerosol_mod
+       use aerosol_mod, only: iaero_nlay, iaero_generic, &
+                              iaero_aurora, iaero_back2lay, iaero_co2, &
+                              iaero_dust, iaero_h2o, iaero_h2so4, &
+                              iaero_nh3, i_rgcs_ice, noaero
        USE tracer_h, only: noms,rho_co2,rho_ice,rho_q,mmol
        use comcstfi_mod, only: g, pi, mugaz, avocado
@@ -145 +148 @@
           print*,'iaero_aurora= ',iaero_aurora
         endif
-        if (iaero_generic(1) .ne. 0) then 
+        if (aerogeneric .ne. 0) then 
           print*,"iaero_generic= ",iaero_generic(:)
         endif
@@ -658 +661 @@
 !    Lucas Teinturier (2022)
 !===========================================================================
-      if (iaero_generic(1) .ne. 0) then ! we enter the scheme
+      if (aerogeneric .ne. 0) then ! we enter the scheme
         do ia=1,aerogeneric
           iaer = iaero_generic(ia)
@@ -674 +677 @@
           enddo !ig=1,ngrid
         enddo !ia=1,aerogeneric
-      endif !iaergo_generic(1) .ne. 0
+      endif !aerogeneric .ne. 0
 
 ! --------------------------------------------------------------------------

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

@@ -8 +8 @@
       logical,save :: season,diurnal,tlocked,rings_shadow,lwrite
 !$OMP THREADPRIVATE(season,diurnal,tlocked,rings_shadow,lwrite)
-      logical,save :: callstats,calleofdump
-!$OMP THREADPRIVATE(callstats,calleofdump)
+      logical,save :: callstats ! .true. to output stats.nc files
+!$OMP THREADPRIVATE(callstats)
       logical,save :: callgasvis,continuum,graybody
 !$OMP THREADPRIVATE(callgasvis,continuum,graybody)
@@ -50 +50 @@
       logical,save :: aerofixco2,aerofixh2o
 !$OMP THREADPRIVATE(aerofixco2,aerofixh2o)
-      integer,save :: aerogeneric
+      integer,save :: aerogeneric ! number of aerosols of "generic" kind
 !$OMP THREADPRIVATE(aerogeneric)
       logical,save :: hydrology