Changeset 4171 for LMDZ6/branches/LMDZ-ECRAD/libf/phylmd/Dust/splaeropt_5wv_rrtm.F90

Timestamp:

Jun 17, 2022, 4:24:49 PM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ-ECRAD.

Location:

LMDZ6/branches/LMDZ-ECRAD

Files:

• . (modified) (1 prop)
• libf/phylmd/Dust/splaeropt_5wv_rrtm.F90 (modified) (3 diffs)

LMDZ6/branches/LMDZ-ECRAD/libf/phylmd/Dust/splaeropt_5wv_rrtm.F90

@@ -9 +9 @@
   USE DIMPHY
   USE aero_mod
-  USE infotrac_phy
+  USE infotrac_phy, ONLY: nqtot, nbtr, tracers
   USE phys_local_var_mod, ONLY: od550aer,od865aer,ec550aer,od550lt1aer
   !
@@ -34 +34 @@
   LOGICAL :: soluble
   
-  INTEGER :: i, k, m, itr, irh, aerindex
+  INTEGER :: i, k, m, iq, itr, irh, aerindex
   INTEGER :: spsol, spinsol, la
   INTEGER :: RH_num(klon,klev)
@@ -112 +112 @@
   ENDDO
 
-  DO itr=1,nbtr    !--loop over tracers  
-
-    IF (tname(itr+nqo)=='PREC') THEN       !--fine mode accumulation mode
-      CYCLE
-    ELSE IF (tname(itr+nqo)=='FINE') THEN  !--fine mode accumulation mode
-      soluble=.TRUE.
-      spsol=1
-      aerindex=1
-    ELSE IF (tname(itr+nqo)=='COSS') THEN  !--coarse mode sea salt
-      soluble=.TRUE.
-      spsol=2
-      aerindex=2
-    ELSE IF (tname(itr+nqo)=='CODU') THEN  !--coarse mode dust
-      soluble=.FALSE.
-      spinsol=1
-      aerindex=3
-    ELSE IF (tname(itr+nqo)=='SCDU') THEN  !--super coarse mode dust
-      soluble=.FALSE.
-      spinsol=2
-      aerindex=4
-    ELSE
-       CALL abort_physic(modname,'I cannot do aerosol optics for '//tname(itr+nqo),1)
-    ENDIF
+  itr = 0
+  DO iq = 1, nqtot
+    IF(.NOT.tracers(iq)%isInPhysics) CYCLE
+    itr = itr+1
+    SELECT CASE(tracers(iq)%name)
+      CASE('PREC'); CYCLE                                  !--precursor
+      CASE('FINE'); soluble=.TRUE.;  spsol=1; aerindex=1   !--fine mode accumulation mode
+      CASE('COSS'); soluble=.TRUE.;  spsol=2; aerindex=2   !--coarse mode sea salt
+      CASE('CODU'); soluble=.FALSE.; spinsol=1; aerindex=3   !--coarse mode dust
+      CASE('SCDU'); soluble=.FALSE.; spinsol=2; aerindex=4   !--super coarse mode dust
+      CASE DEFAULT; CALL abort_physic(modname,'I cannot do aerosol optics for '//tracers(iq)%name,1)
+    END SELECT
 
     DO la=1,las