Changeset 955 for LMDZ4/trunk/libf/phylmd/physiq.F

Timestamp:

Apr 30, 2008, 3:30:22 PM (16 years ago)

Author:

lsce

Message:

ACo+JG

Ajout du flag aerosol_couple :
false=lecture des sulfates dans un fichier(par defaut) - configuration existante
true=calcul des aerosol par INCA

File:

• LMDZ4/trunk/libf/phylmd/physiq.F (modified) (13 diffs)

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -1074 +1074 @@
 
       ! Aerosol optical properties
-#ifdef INCA_AER
-#ifdef CPP_COUPLE
+#ifdef INCA
 ! Aerosol optical properties by INCA model 
       CHARACTER*4              ::    rfname(9) 
-
-#endif
 #endif
       REAL aerindex(klon)       ! POLDER aerosol index
@@ -1089 +1086 @@
       SAVE ok_ade, ok_aie, bl95_b0, bl95_b1
 c$OMP THREADPRIVATE(ok_ade, ok_aie, bl95_b0, bl95_b1)
+      LOGICAL, SAVE :: aerosol_couple ! true  : calcul des aerosols dans INCA
+                                      ! false : lecture des aerosol dans un fichier
+c$OMP THREADPRIVATE(aerosol_couple)    
 
 c
@@ -1209 +1209 @@
          solswai(:)=0.
          solswad(:)=0.
-#ifdef INCA_AER
-#ifdef CPP_COUPLE
+#ifdef INCA
          tau_inca(:,:,:,:) = 0.
          piz_inca(:,:,:,:) = 0.
@@ -1226 +1225 @@
          solsw0_inca(:,:)  = 0.
 #endif
-#endif
 !rv
 !ACo
@@ -1245 +1243 @@
      .                  fact_cldcon, facttemps,ok_newmicro,iflag_radia,
      .                  iflag_cldcon,iflag_ratqs,ratqsbas,ratqshaut,
-     .                  ok_ade, ok_aie, 
+     .                  ok_ade, ok_aie, aerosol_couple, 
      .                  bl95_b0, bl95_b1,
      .                  iflag_thermals,nsplit_thermals,
@@ -2580 +2578 @@
 cjq - Johannes Quaas, 27/11/2003 (quaas@lmd.jussieu.fr)
       IF (ok_ade.OR.ok_aie) THEN
-#if defined(CPP_COUPLE) && !defined(INCA_AER)
-         ! Get sulfate aerosol distribution
-         CALL readsulfate(rjourvrai, debut, sulfate)
-         CALL readsulfate_preind(rjourvrai, debut, sulfate_pi)
-
-         ! Calculate aerosol optical properties (Olivier Boucher)
-         CALL aeropt(pplay, paprs, t_seri, sulfate, rhcl,
-     .        tau_ae, piz_ae, cg_ae, aerindex)
-#endif
-#if !defined(CPP_COUPLE)
-         ! Get sulfate aerosol distribution
-         CALL readsulfate(rjourvrai, debut, sulfate)
-         CALL readsulfate_preind(rjourvrai, debut, sulfate_pi)
-
-         ! Calculate aerosol optical properties (Olivier Boucher)
-         CALL aeropt(pplay, paprs, t_seri, sulfate, rhcl,
-     .        tau_ae, piz_ae, cg_ae, aerindex)
-#endif
-cym
+         IF ( .NOT. aerosol_couple ) THEN 
+            ! Get sulfate aerosol distribution
+            CALL readsulfate(rjourvrai, debut, sulfate)
+            CALL readsulfate_preind(rjourvrai, debut, sulfate_pi)
+
+            ! Calculate aerosol optical properties (Olivier Boucher)
+            CALL aeropt(pplay, paprs, t_seri, sulfate, rhcl,
+     .           tau_ae, piz_ae, cg_ae, aerindex)
+         ENDIF
       ELSE
         tau_ae(:,:,:)=0.0
         piz_ae(:,:,:)=0.0
         cg_ae(:,:,:)=0.0
-cym     
       ENDIF
 
@@ -2768 +2755 @@
 c parametres pour diagnostiques:
 c
+      IF (aerosol_couple ) THEN 
+#ifdef INCA
+         sulfate(:,:) = ccm(:,:,1) 
+         sulfate_pi(:,:) = ccm(:,:,2) 
+#endif
+      ENDIF
+
       if (ok_newmicro) then
       CALL newmicro (paprs, pplay,ok_newmicro,
@@ -2774 +2768 @@
      .            flwp, fiwp, flwc, fiwc,
      e            ok_aie,
-#if defined(CPP_COUPLE) && defined(INCA_AER)  
-     e            ccm(:,:,1), ccm(:,:,2),
-#else
      e            sulfate, sulfate_pi,
-#endif
      e            bl95_b0, bl95_b1,
      s            cldtaupi, re, fl)
@@ -2814 +2804 @@
       endif
       
-
-#if defined(CPP_COUPLE) && defined(INCA_AER)
-      CALL radlwsw_inca ! nouveau rayonnement (compatible Arpege-IFS)
-     e            (kdlon,kflev,dist, rmu0, fract, 
+      IF (aerosol_couple) THEN 
+#ifdef INCA_AER
+         CALL radlwsw_inca   
+     e            (kdlon,kflev,dist, rmu0, fract, solaire,
      e             paprs, pplay,zxtsol,albsol, albsollw, t_seri,q_seri,
      e             wo,
@@ -2827 +2817 @@
      s             lwdn0, lwdn, lwup0, lwup, 
      s             swdn0, swdn, swup0, swup,
-     e             ok_ade, ok_aie, ! new for aerosol radiative effects
-     e             tau_inca, piz_inca, cg_inca, ! ="=
-     s             topswad_inca, solswad_inca, ! ="=
-     s             topswad0_inca, solswad0_inca, ! ="=
+     e             ok_ade, ok_aie,
+     e             tau_inca, piz_inca, cg_inca,
+     s             topswad_inca, solswad_inca,
+     s             topswad0_inca, solswad0_inca,
      s             topsw_inca, topsw0_inca,
      s             solsw_inca, solsw0_inca,
-     e             cldtaupi, ! ="=
-     s             topswai_inca, solswai_inca) ! ="=
-#else
-      CALL radlwsw ! nouveau rayonnement (compatible Arpege-IFS)
+     e             cldtaupi,
+     s             topswai_inca, solswai_inca)
+#endif
+      ELSE
+         CALL radlwsw ! nouveau rayonnement (compatible Arpege-IFS)
      e            (dist, rmu0, fract, 
      e             paprs, pplay,zxtsol,albsol1, albsol2, t_seri,q_seri,
@@ -2852 +2843 @@
      e             cldtaupi, ! ="=
      s             topswai, solswai) ! ="=
-#endif
+      ENDIF
+
       itaprad = 0
       ENDIF
@@ -3088 +3080 @@
      I                   upwd,
      I                   dnwd,
+     I                   aerosol_couple,
 #ifdef INCA
      I                   flxmass_w,
-#if defined(INCA_AER) && defined(CPP_COUPLE)
      I                   tau_inca, 
      I                   piz_inca, 
@@ -3096 +3088 @@
      I                   ccm,
      I                   rfname,
-#endif
 #endif
      O                   tr_seri)