Changeset 3339 for LMDZ6/branches/IPSLCM6.0.15/libf

Timestamp:

Jun 1, 2018, 12:47:52 PM (7 years ago)

Author:

acozic

Message:

merge with rev 3338 of the trunk
(add a flag chemistry_couple to use Ozone offline or Ozone calcul by Inca)

Location:

LMDZ6/branches/IPSLCM6.0.15

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90 (modified) (2 diffs)
• libf/phylmd/conf_phys_m.F90 (modified) (7 diffs)
• libf/phylmd/physiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/IPSLCM6.0.15/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -110 +110 @@
   INTEGER :: iflag_radia, iflag_cldcon, iflag_ratqs
   REAL    :: ratqsbas, ratqshaut, tau_ratqs
-  LOGICAL :: ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple
+  LOGICAL :: ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple, chemistry_couple
   INTEGER :: flag_aerosol
   INTEGER :: flag_aerosol_strat
@@ -133 +133 @@
                    iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs,            &
                    ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple,     &
-                   flag_aerosol, flag_aerosol_strat, new_aod,           &
-                   flag_bc_internal_mixture, bl95_b0, bl95_b1,          &
-                   read_climoz,                                         &
-                   alp_offset)
+                   chemistry_couple, flag_aerosol, flag_aerosol_strat,  &
+                   new_aod, flag_bc_internal_mixture, bl95_b0, bl95_b1, &
+                   read_climoz, alp_offset)
   CALL phys_state_var_init(read_climoz)
 

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/conf_phys_m.F90

@@ -17 +17 @@
        iflag_cld_th, &
        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
-       ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple, &
+       ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple, chemistry_couple, &
        flag_aerosol, flag_aerosol_strat, new_aod, &
        flag_bc_internal_mixture, bl95_b0, bl95_b1,&
@@ -75 +75 @@
     LOGICAL              :: ok_LES
     LOGICAL              :: callstats
-    LOGICAL              :: ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple
+    LOGICAL              :: ok_ade, ok_aie, ok_alw, ok_cdnc
+    LOGICAL              :: aerosol_couple, chemistry_couple
     INTEGER              :: flag_aerosol
     INTEGER              :: flag_aerosol_strat
@@ -95 +96 @@
     LOGICAL, SAVE       :: ok_LES_omp   
     LOGICAL, SAVE       :: callstats_omp
-    LOGICAL, SAVE       :: ok_ade_omp, ok_aie_omp, ok_alw_omp, ok_cdnc_omp, aerosol_couple_omp
+    LOGICAL, SAVE       :: ok_ade_omp, ok_aie_omp, ok_alw_omp, ok_cdnc_omp
+    LOGICAL, SAVE       :: aerosol_couple_omp, chemistry_couple_omp
     INTEGER, SAVE       :: flag_aerosol_omp
     INTEGER, SAVE       :: flag_aerosol_strat_omp
@@ -403 +405 @@
     CALL getin('aerosol_couple',aerosol_couple_omp)
     !
+    !Config Key  = chemistry_couple
+    !Config Desc = read O3 chemistry in file or calcul by inca
+    !Config Def  = .FALSE.
+    !Config Help = Used in physiq.F
+    !
+    chemistry_couple_omp = .FALSE.
+    CALL getin('chemistry_couple',chemistry_couple_omp)
+    !
     !Config Key  = flag_aerosol
     !Config Desc = which aerosol is use for coupled model
@@ -2273 +2283 @@
     ok_cdnc = ok_cdnc_omp
     aerosol_couple = aerosol_couple_omp
+    chemistry_couple = chemistry_couple_omp
     flag_aerosol=flag_aerosol_omp
     flag_aerosol_strat=flag_aerosol_strat_omp
@@ -2454 +2465 @@
        CALL abort_physic('conf_phys', 'flag_aerosol cannot be to zero if aerosol_couple=y ', 1)
     ENDIF
+
+    ! Read_climoz need to be zero if we are in couple mode for chemistry 
+    IF (chemistry_couple .AND. read_climoz .ne. 0) THEN 
+       CALL abort_physic('conf_phys', 'read_climoz need to be to zero if chemistry_couple=y ', 1) 
+    ENDIF
+
 
     ! flag_aerosol need to be different to zero if ok_cdnc is activated
@@ -2599 +2616 @@
     write(lunout,*)' ok_alw = ',ok_alw
     write(lunout,*)' aerosol_couple = ', aerosol_couple
+    write(lunout,*)' chemistry_couple = ', chemistry_couple
     write(lunout,*)' flag_aerosol = ', flag_aerosol
     write(lunout,*)' flag_aerosol_strat= ', flag_aerosol_strat

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90

@@ -1046 +1046 @@
     ! false : lecture des aerosol dans un fichier
     !$OMP THREADPRIVATE(aerosol_couple)    
+    LOGICAL, SAVE :: chemistry_couple ! true  : use INCA chemistry O3 
+    ! false : use offline chemistry O3
+    !$OMP THREADPRIVATE(chemistry_couple)    
     INTEGER, SAVE :: flag_aerosol 
     !$OMP THREADPRIVATE(flag_aerosol) 
@@ -1212 +1215 @@
             fact_cldcon, facttemps,ok_newmicro,iflag_radia, &
             iflag_cld_th,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
-            ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple,  &
+            ok_ade, ok_aie, ok_alw, ok_cdnc, aerosol_couple,  chemistry_couple, &
             flag_aerosol, flag_aerosol_strat, new_aod, &
             flag_bc_internal_mixture, bl95_b0, bl95_b1, &
@@ -3815 +3818 @@
 #ifdef INCA
           CALL radlwsw_inca  &
-               (kdlon,kflev,dist, rmu0, fract, solaire, &
+               (chemistry_couple, kdlon,kflev,dist, rmu0, fract, solaire, &
                paprs, pplay,zxtsol,albsol1, albsol2, t_seri,q_seri, &
                size(wo,3), wo, &