Changeset 5330 for LMDZ6/trunk

Timestamp:

Nov 15, 2024, 5:21:57 PM (5 weeks ago)

Author:

abarral

Message:

Incorrect use of CPPKEY_STRATAER in phytrac_mod.f90

File:

• LMDZ6/trunk/libf/phylmd/phytrac_mod.f90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/phytrac_mod.f90

@@ -512 +512 @@
           iflag_vdf_trac = 1                              ! From CO2i
           iflag_con_trac = 1                              ! From CO2i
-IF (CPPKEY_STRATAER) THEN
-       ELSE IF (type_trac == 'coag') THEN
+       ELSE IF (type_trac == 'coag' .AND. CPPKEY_STRATAER) THEN
           source(:,:)=0.
           CALL tracstrataer_init(aerosol,lessivage)       ! init aerosols and lessivage param
-END IF
        ELSE IF (type_trac == 'lmdz') THEN
           CALL traclmdz_init(pctsrf,xlat,xlon,ftsol,tr_seri,t_seri,pplay,sh,pdtphys,aerosol,lessivage)
@@ -563 +561 @@
              ELSE IF (type_trac == 'inco') THEN     ! Add ThL
                 flag_cvltr(it)=.FALSE.
-IF (CPPKEY_STRATAER) THEN
-             ELSE IF (type_trac == 'coag') THEN
+             ELSE IF (type_trac == 'coag' .AND. CPPKEY_STRATAER) THEN
                 IF (convscav.and.aerosol(it)) THEN
                    flag_cvltr(it)=.TRUE.
@@ -573 +570 @@
                    flag_cvltr(it)=.FALSE.
                 ENDIF
-END IF
              ELSE IF (type_trac == 'lmdz') THEN
                 IF (convscav.and.aerosol(it)) THEN
@@ -657 +653 @@
             t_seri, pplay, paprs, tr_seri, source)
 
-IF (CPPKEY_STRATAER) THEN
-    ELSE IF (type_trac == 'coag') THEN
+    ELSE IF (type_trac == 'coag' .AND. CPPKEY_STRATAER) THEN
        !   --STRATOSPHERIC AER IN THE STRAT --
        CALL traccoag(pdtphys, gmtime, debutphy, julien, &
@@ -664 +659 @@
             t_seri, pplay, paprs, sh, rh , &
             tr_seri)
-END IF
     ELSE IF (type_trac == 'lmdz') THEN
        !    -- Traitement des traceurs avec traclmdz