Changeset 3870 for LMDZ6/trunk/libf/phylmd/phytrac_mod.F90

Timestamp:

Apr 8, 2021, 10:58:58 PM (3 years ago)

Author:

Laurent Fairhead

Message:

Corrections to r3865 that will hopefully repair the debug compilation
TL

File:

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

LMDZ6/trunk/libf/phylmd/phytrac_mod.F90

@@ -56 +56 @@
   SUBROUTINE phytrac_init()
     USE dimphy
-    USE infotrac_phy, ONLY: nbtr, nqINCA, type_trac
+    USE infotrac_phy, ONLY: nbtr, nqCO2, type_trac
     USE tracco2i_mod, ONLY: tracco2i_init
     IMPLICIT NONE
@@ -124 +124 @@
     USE phys_cal_mod, only : hour
     USE dimphy
-    USE infotrac_phy, ONLY: nbtr, nqINCA, type_trac, conv_flg, solsym, pbl_flg
+    USE infotrac_phy, ONLY: nbtr, nqCO2, type_trac, conv_flg, solsym, pbl_flg
     USE mod_grid_phy_lmdz
     USE mod_phys_lmdz_para
@@ -508 +508 @@
           iflag_con_trac= 1
        CASE('inco')
-          source(:,1) = 0.                          ! from CO2i
-          source(:,2:nbtr)=init_source(:,:)         ! from INCA
-          aerosol(1) = .FALSE.                      ! from CO2i
-          CALL tracinca_init(aerosol(2:nbtr),lessivage)     ! from INCA
-          pbl_flg(1) = 1              ! From CO2i
+          source(:,1:nqCO2) = 0.                          ! from CO2i   ModThL
+          source(:,nqCO2+1:nbtr)=init_source(:,:)         ! from INCA   ModThL
+          aerosol(1:nqCO2) = .FALSE.                      ! from CO2i   ModThL
+          CALL tracinca_init(aerosol(nqCO2+1:nbtr),lessivage)     ! from INCA   ModThL
+          pbl_flg(1:nqCO2) = 1              ! From CO2i         ModThL
           iflag_the_trac= 1           ! From CO2i
           iflag_vdf_trac= 1           ! From CO2i
@@ -1108 +1108 @@
 
     !    -- CHIMIE INCA  config_inca = aero or chem --
-    IF (type_trac == 'inca') THEN
+    IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN  ! ModThL
 
        CALL tracinca(&
@@ -1120 +1120 @@
             tau_aero, piz_aero, cg_aero,        ccm,       &
             rfname,                                        &
-            tr_seri,  source)
-    ELSEIF (type_trac == 'inco') THEN       ! Add ThL
-       CALL tracinca(&
-            nstep,    julien,   gmtime,         lafin,     &
-            pdtphys,  t_seri,   paprs,          pplay,     &
-            pmfu,     upwd,     ftsol,  pctsrf, pphis,     &
-            pphi,     albsol,   sh,    ch,     rh,        &
-            cldfra,   rneb,     diafra,         cldliq,    &
-            itop_con, ibas_con, pmflxr,         pmflxs,    &
-            prfl,     psfl,     aerosol_couple, flxmass_w, &
-            tau_aero, piz_aero, cg_aero,        ccm,       &
-            rfname,                                        &
-            tr_seri(:,:,2:nbtr),  source(:,2:nbtr))     ! Difference with case 'inca'  
+            tr_seri(:,:,1+nqCO2:nbtr),  source(:,1+nqCO2:nbtr))  ! ModThL  
     ENDIF
     !=============================================================