Changeset 955 for LMDZ4/trunk

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

Location:

LMDZ4/trunk/libf/phylmd

Files:

• conf_phys.F90 (modified) (6 diffs)
• phys_state_var_mod.F90 (modified) (6 diffs)
• physiq.F (modified) (13 diffs)
• phytrac.F (modified) (7 diffs)

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -10 +10 @@
  &                     iflag_cldcon, &
  &                     iflag_ratqs,ratqsbas,ratqshaut, &
- &                     ok_ade, ok_aie, &
+ &                     ok_ade, ok_aie, aerosol_couple, &
  &                     bl95_b0, bl95_b1,&
  &                     iflag_thermals,nsplit_thermals, &
@@ -51 +51 @@
   integer              :: iflag_radia
   logical              :: ok_journe, ok_mensuel, ok_instan, ok_hf
-  LOGICAL              :: ok_ade, ok_aie
+  LOGICAL              :: ok_ade, ok_aie, aerosol_couple
   REAL                 :: bl95_b0, bl95_b1
   real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut
@@ -60 +60 @@
   logical,SAVE              :: ok_veget_omp, ok_newmicro_omp
   logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
-  LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp
+  LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, aerosol_couple_omp
   REAL,SAVE           :: bl95_b0_omp, bl95_b1_omp
   REAL,SAVE           :: freq_ISCCP_omp, ecrit_ISCCP_omp
@@ -184 +184 @@
   ok_aie_omp = .false.
   call getin('ok_aie', ok_aie_omp)
+
+!
+!Config Key  = aerosol_couple
+!Config Desc = read aerosol in file or calcul by inca
+!Config Def  = .false.
+!Config Help = Used in physiq.F
+!
+  aerosol_couple_omp = .false.
+  CALL getin('aerosol_couple',aerosol_couple_omp)
 
 !
@@ -968 +977 @@
     ok_ade = ok_ade_omp
     ok_aie = ok_aie_omp
+    aerosol_couple = aerosol_couple_omp
     bl95_b0 = bl95_b0_omp
     bl95_b1 = bl95_b1_omp
@@ -1057 +1067 @@
   write(numout,*)' ok_ade = ',ok_ade
   write(numout,*)' ok_aie = ',ok_aie
+  write(numout,*)' aerosol_couple = ', aerosol_couple
   write(numout,*)' bl95_b0 = ',bl95_b0
   write(numout,*)' bl95_b1 = ',bl95_b1

LMDZ4/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -170 +170 @@
 !topswai, solswai : Aerosol indirect effect
       REAL,SAVE,ALLOCATABLE :: topswai(:), solswai(:)
-#ifdef INCA_AER
-#ifdef CPP_COUPLE
+#ifdef INCA
 ! topswad_inca, solswad_inca : Aerosol direct effect
       REAL,SAVE,ALLOCATABLE :: topswad_inca(:), solswad_inca(:)
@@ -184 +183 @@
       REAL,SAVE,ALLOCATABLE :: cg_inca(:,:,:,:)
       REAL,SAVE,ALLOCATABLE :: ccm(:,:,:)
-#endif
 #endif
       REAL,SAVE,ALLOCATABLE :: tau_ae(:,:,:), piz_ae(:,:,:)
@@ -292 +290 @@
       ALLOCATE(topswad(klon), solswad(klon))
       ALLOCATE(topswai(klon), solswai(klon))
-#ifdef INCA_AER
-#ifdef CPP_COUPLE
+#ifdef INCA
       ALLOCATE(topswad_inca(klon), solswad_inca(klon))
       ALLOCATE(topswad0_inca(klon), solswad0_inca(klon))
@@ -303 +300 @@
       ALLOCATE(cg_inca(klon,klev,9,2))
       ALLOCATE(ccm(klon,klev,2))
-#endif
 #endif
       ALLOCATE(tau_ae(klon,klev,2), piz_ae(klon,klev,2))
@@ -391 +387 @@
       deallocate(topswad, solswad)
       deallocate(topswai, solswai)
-#ifdef INCA_AER
-#ifdef CPP_COUPLE
+#ifdef INCA
       deallocate(topswad_inca, solswad_inca)
       deallocate(topswad0_inca, solswad0_inca)
@@ -403 +398 @@
       deallocate(ccm)
 #endif
-#endif
       deallocate(tau_ae, piz_ae)
       deallocate(cg_ae)

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)

LMDZ4/trunk/libf/phylmd/phytrac.F

@@ -57 +57 @@
      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, 
@@ -65 +65 @@
      I                   ccm,
      I                   rfname,
-#endif
 #endif
      O                    tr_seri)
@@ -143 +142 @@
       REAL pmflxr(klon,klev+1), pmflxs(klon,klev+1)   !--lessivage convection
       REAL prfl(klon,klev+1),   psfl(klon,klev+1)     !--lessivage large-scale
-
+      LOGICAL aerosol_couple
 #ifdef INCA
       REAL flxmass_w(klon,klev)
       CHARACTER(len=8) :: solsym(nqmax)
-#if defined(INCA_AER) && defined(CPP_COUPLE)
       integer la
       REAL              ::    tau_inca(klon,klev,9,2)
@@ -154 +152 @@
       character*4       ::    rfname(9) 
       REAL              ::    ccm(klon,klev,2) 
-#endif
 #endif
 c      integer iflag_con
@@ -521 +518 @@
 
 #ifdef INCA_AER
-        CALL aerosolmain (tr_seri,
+        CALL aerosolmain (aerosol_couple,
+     $                 tr_seri,
      $                 pdtphys,
      $                 pplay,
@@ -538 +536 @@
      $                 t_seri,       ! for chimiaq
      $                 rh,
-#ifdef CPP_COUPLE
      $                 tau_inca,
      $                 piz_inca,
@@ -544 +541 @@
      $                 rfname,
      $                 ccm,
-#endif
      $                 lafin)
 #endif