Changeset 3798 for LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm

Timestamp:

Jan 11, 2021, 11:24:08 PM (4 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/rrtm/lwu.F90 (modified) (3 diffs)
• libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (modified) (2 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/lwu.F90

@@ -74 +74 @@
 !USE YOERDI   , ONLY : RCH4     ,RN2O     ,RCFC11   ,RCFC12
 USE YOERDU   , ONLY : R10E     ,REPSCO   ,REPSCQ
+#ifdef REPROBUS
+USE chem_rep, ONLY: rch42d, rn2o2d, rcfc112d, rcfc122d, ok_rtime2d
+USE infotrac_phy, ONLY : type_trac
+#endif
 
 
@@ -316 +320 @@
       PABCU(JL,17,IC)=PABCU(JL,17,ICP1)+ ZUAER(JL,4)    *ZDUC(JL,IC)*ZDIFF
       PABCU(JL,18,IC)=PABCU(JL,18,ICP1)+ ZUAER(JL,5)    *ZDUC(JL,IC)*ZDIFF
+#ifdef REPROBUS
+        IF (type_trac=='repr'.and. ok_rtime2d) THEN
+!- CH4
+      PABCU(JL,19,IC)=PABCU(JL,19,ICP1)&
+       & + ZABLY(JL,2,IC)*RCH42D(JL, IC)/PCCO2*ZPHM6(JL)*ZDIFF
+      PABCU(JL,20,IC)=PABCU(JL,20,ICP1)&
+       & + ZABLY(JL,3,IC)*RCH42D(JL, IC)/PCCO2*ZPSM6(JL)*ZDIFF
+!- N2O
+      PABCU(JL,21,IC)=PABCU(JL,21,ICP1)&
+       & + ZABLY(JL,2,IC)*RN2O2D(JL, IC)/PCCO2*ZPHN6(JL)*ZDIFF
+      PABCU(JL,22,IC)=PABCU(JL,22,ICP1)&
+       & + ZABLY(JL,3,IC)*RN2O2D(JL, IC)/PCCO2*ZPSN6(JL)*ZDIFF
+!- CFC11
+      PABCU(JL,23,IC)=PABCU(JL,23,ICP1)&
+       & + ZABLY(JL,2,IC)*RCFC112D(JL, IC)/PCCO2        *ZDIFF
+!- CFC12
+      PABCU(JL,24,IC)=PABCU(JL,24,ICP1)&
+       & + ZABLY(JL,2,IC)*RCFC122D(JL, IC)/PCCO2        *ZDIFF
+
+         ELSE
+#endif
 !- CH4
       PABCU(JL,19,IC)=PABCU(JL,19,ICP1)&
@@ -332 +357 @@
       PABCU(JL,24,IC)=PABCU(JL,24,ICP1)&
        & + ZABLY(JL,2,IC)*RCFC12/PCCO2        *ZDIFF  
+#ifdef REPROBUS
+        END IF
+#endif
     ENDDO
   ENDDO

LMDZ6/branches/Ocean_skin/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

@@ -2 +2 @@
 !
 SUBROUTINE readaerosol_optic_rrtm(debut, aerosol_couple, ok_alw, ok_volcan, &
-     new_aod, flag_aerosol, flag_bc_internal_mixture, itap, rjourvrai, &
+     flag_aerosol, flag_bc_internal_mixture, itap, rjourvrai, &
      pdtphys, pplay, paprs, t_seri, rhcl, presnivs, &
      tr_seri, mass_solu_aero, mass_solu_aero_pi, &
@@ -33 +33 @@
   LOGICAL, INTENT(IN)                      :: ok_alw
   LOGICAL, INTENT(IN)                      :: ok_volcan
-  LOGICAL, INTENT(IN)                      :: new_aod
   INTEGER, INTENT(IN)                      :: flag_aerosol
   LOGICAL, INTENT(IN)                      :: flag_bc_internal_mixture