Changeset 3340 for LMDZ5/branches/IPSLCM5A2.1

Timestamp:

Jun 1, 2018, 5:52:22 PM (6 years ago)

Author:

acozic

Message:

merge with trunk 3338
Add a flag chemistry_couple

Location:

LMDZ5/branches/IPSLCM5A2.1/libf

Files:

• dynphy_lonlat/phylmd/etat0phys_netcdf.F90 (modified) (2 diffs)
• phylmd/conf_phys_m.F90 (modified) (7 diffs)
• phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ5/branches/IPSLCM5A2.1/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -108 +108 @@
   INTEGER :: iflag_radia, iflag_cldcon, iflag_ratqs
   REAL    :: ratqsbas, ratqshaut, tau_ratqs
-  LOGICAL :: ok_ade, ok_aie, ok_cdnc, aerosol_couple
+  LOGICAL :: ok_ade, ok_aie, ok_cdnc
+  LOGICAL :: aerosol_couple, chemistry_couple
   INTEGER :: flag_aerosol
   INTEGER :: flag_aerosol_strat
@@ -123 +124 @@
 ! Physics configuration
 !*******************************************************************************
-  CALL conf_phys(  ok_journe, ok_mensuel, ok_instan, ok_hf, ok_LES,     &
-                   callstats,                                           &
-                   solarlong0,seuil_inversion,                          &
-                   fact_cldcon, facttemps,ok_newmicro,iflag_radia,      &
-                   iflag_cldcon,                                        &
-                   iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs,            &
-                   ok_ade, ok_aie, ok_cdnc, aerosol_couple,             &
-                   flag_aerosol, flag_aerosol_strat, new_aod,           &
-                   bl95_b0, bl95_b1,                                    &
-                   read_climoz,                                         &
+  CALL conf_phys(  ok_journe, ok_mensuel, ok_instan, ok_hf, ok_LES,           &
+                   callstats,                                                 &
+                   solarlong0,seuil_inversion,                                &
+                   fact_cldcon, facttemps,ok_newmicro,iflag_radia,            &
+                   iflag_cldcon,                                              &
+                   iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs,                  &
+                   ok_ade, ok_aie, ok_cdnc, aerosol_couple, chemistry_couple  &
+                   flag_aerosol, flag_aerosol_strat, new_aod,                 &
+                   bl95_b0, bl95_b1,                                          &
+                   read_climoz,                                               &
                    alp_offset)
   CALL phys_state_var_init(read_climoz)

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/conf_phys_m.F90

@@ -17 +17 @@
        iflag_cld_th, &
        iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
-       ok_ade, ok_aie, ok_cdnc, aerosol_couple, &
+       ok_ade, ok_aie, ok_cdnc, aerosol_couple, chemistry_couple,  &
        flag_aerosol, flag_aerosol_strat, new_aod, &
        bl95_b0, bl95_b1,&
@@ -74 +74 @@
     logical              :: ok_LES
     LOGICAL              :: callstats
-    LOGICAL              :: ok_ade, ok_aie, ok_cdnc, aerosol_couple
+    LOGICAL              :: ok_ade, ok_aie, ok_cdnc
+    LOGICAL              :: aerosol_couple, chemistry_couple
     INTEGER              :: flag_aerosol
     INTEGER              :: flag_aerosol_strat
@@ -92 +93 @@
     logical,SAVE        :: ok_LES_omp   
     LOGICAL,SAVE        :: callstats_omp
-    LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, ok_cdnc_omp, aerosol_couple_omp
+    LOGICAL,SAVE        :: ok_ade_omp, ok_aie_omp, ok_cdnc_omp
+    LOGICAL, SAVE       :: aerosol_couple_omp, chemistry_couple_omp
     INTEGER, SAVE       :: flag_aerosol_omp
     INTEGER, SAVE       :: flag_aerosol_strat_omp
@@ -370 +372 @@
     aerosol_couple_omp = .false.
     CALL getin('aerosol_couple',aerosol_couple_omp)
+    !
+    !Config Key  = chemistry_couple
+    !Config Desc = read 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
@@ -2134 +2144 @@
     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
@@ -2307 +2318 @@
        CALL abort_physic('conf_phys', 'flag_aerosol cannot be to zero if ok_cdnc is activated ', 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
+
 
     ! ok_cdnc must be set to y if ok_aie is activated
@@ -2417 +2434 @@
     write(lunout,*)' ok_aie = ',ok_aie
     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

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/physiq_mod.F90

@@ -983 +983 @@
     ! 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) 
@@ -1142 +1144 @@
             fact_cldcon, facttemps,ok_newmicro,iflag_radia, &
             iflag_cld_th,iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs, &
-            ok_ade, ok_aie, ok_cdnc, aerosol_couple,  &
+            ok_ade, ok_aie, ok_cdnc, aerosol_couple, chemistry_couple,  &
             flag_aerosol, flag_aerosol_strat, new_aod, &
             bl95_b0, bl95_b1, &
@@ -1588 +1590 @@
                date0, &
                io_lon, &
-               io_lat)
+               io_lat, &
+               chemistry_couple)
 
           CALL VTe(VTinca)
@@ -3755 +3758 @@
 #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(:, :, 1), &