Changeset 2630

Timestamp:

Sep 22, 2016, 6:33:09 PM (8 years ago)

Author:

fhourdin

Message:

Importation du modèle d'aérosols de Boucher, Escribano et al.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• Dust (added)
• Dust/aeropt_spl.F (added)
• Dust/bcscav_spl.F (added)
• Dust/bl_for_dms.F (added)
• Dust/blcloud_scav.F (added)
• Dust/blcloud_scav_lsc.F (added)
• Dust/checkmass.F90 (added)
• Dust/checknanqfi.F90 (added)
• Dust/chem_spla.h (added)
• Dust/cltrac_spl.F (added)
• Dust/cm3_to_kg.F (added)
• Dust/coarsemission.F (added)
• Dust/condsurfc.F (added)
• Dust/condsurfc_new.F (added)
• Dust/condsurfs.F (added)
• Dust/condsurfs_new.F (added)
• Dust/deposition.F (added)
• Dust/dustemission_mod.F90 (added)
• Dust/finemission.F (added)
• Dust/gastoparticle.F (added)
• Dust/incloud_scav.F (added)
• Dust/incloud_scav_lsc.F (added)
• Dust/inscav_spl.F (added)
• Dust/kg_to_cm3.F (added)
• Dust/lsc_scav_orig.F90 (added)
• Dust/lsc_scav_spl.F90 (added)
• Dust/minmaxqfi2.F (added)
• Dust/minmaxsource.F (added)
• Dust/neutral.F (added)
• Dust/nightingale.F (added)
• Dust/phys_output_write_spl_mod.F90 (added)
• Dust/phytracr_spl_mod.F90 (added)
• Dust/precuremission.F (added)
• Dust/read_dust.F (added)
• Dust/read_newemissions.F (added)
• Dust/read_surface.F90 (added)
• Dust/read_vent.F (added)
• Dust/satellite_out_spla.F90 (added)
• Dust/seasalt.F (added)
• Dust/sediment_mod.F (added)
• Dust/spla_output_dat.h (added)
• Dust/spla_output_write.h (added)
• Dust/tiedqneg.F (added)
• Dust/trconvect.F (added)
• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (9 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -1658 +1658 @@
        "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)"  /))                                                                                  
 
+#ifdef CPP_Dust
+#include "Dust/spla_output_dat.h"
+#endif
+
 END MODULE phys_output_ctrlout_mod

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -1763 +1763 @@
     ENDIF
 
+
   END SUBROUTINE phys_output_write
 

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -34 +34 @@
     USE change_srf_frac_mod
     USE surface_data,     ONLY : type_ocean, ok_veget, ok_snow
+#ifdef CPP_Dust
+    USE phytracr_spl_mod, ONLY: phytracr_spl
+#endif
     USE phys_local_var_mod, ONLY: phys_local_var_init, phys_local_var_end, &
        ! [Variables internes non sauvegardees de la physique]
@@ -178 +181 @@
        !
     USE phys_state_var_mod ! Variables sauvegardees de la physique
+#ifdef CPP_Dust
+  USE phys_output_write_spl_mod
+#else
     USE phys_output_var_mod ! Variables pour les ecritures des sorties
+#endif
+
     USE phys_output_write_mod
     USE fonte_neige_mod, ONLY  : fonte_neige_get_vars
     USE phys_output_mod
     USE phys_output_ctrlout_mod
-    USE iophy
     use open_climoz_m, only: open_climoz ! ozone climatology from a file
     use regr_pr_av_m, only: regr_pr_av
@@ -905 +912 @@
     REAL zx_lat(nbp_lon,nbp_lat)
     !
-    INTEGER nid_day_seri, nid_ctesGCM
-    SAVE nid_day_seri, nid_ctesGCM
-    !$OMP THREADPRIVATE(nid_day_seri,nid_ctesGCM)
+    INTEGER nid_ctesGCM
+    SAVE nid_ctesGCM
+    !$OMP THREADPRIVATE(nid_ctesGCM)
     !
     !IM 280405 BEG
@@ -2479 +2486 @@
           !jyg   iflag_con est dans clesphys
           !c          CALL concvl (iflag_con,iflag_clos,
+          clw=0.
           CALL concvl (iflag_clos, &
                dtime, paprs, pplay, k_upper_cv, t_undi,q_undi, &
@@ -2498 +2506 @@
                wdtrainA,wdtrainM,wght_cvfd,qtc_cv,sigt_cv, &
                tau_cld_cv,coefw_cld_cv,epmax_diag)
+
           ! RomP <<<
 
@@ -4264 +4273 @@
     END IF
 
+#ifdef CPP_Dust
+      CALL       phytracr_spl ( debut,lafin , jD_cur,jH_cur,iflag_con,       &  ! I
+                      pdtphys,ftsol,                                   &  ! I
+                      t,q_seri,paprs,pplay,RHcl,                  &  ! I
+                      pmfu, pmfd, pen_u, pde_u, pen_d, pde_d,          &  ! I
+                      coefh(1:klon,1:klev,is_ave), cdragh, cdragm, u1, v1,                 &  ! I
+                      u_seri, v_seri, latitude_deg, longitude_deg,  &
+                      pphis,pctsrf,pmflxr,pmflxs,prfl,psfl,            &  ! I
+                      da,phi,phi2,d1a,dam,mp,ep,sigd,sij,clw,elij,     &  ! I
+                      epmlmMm,eplaMm,upwd,dnwd,itop_con,ibas_con,      &  ! I
+                      ev,wdtrainA,  wdtrainM,wght_cvfd,              &  ! I
+                      fm_therm, entr_therm, rneb,                      &  ! I
+                      beta_prec_fisrt,beta_prec, & !I
+                      zu10m,zv10m,wstar,ale_bl,ale_wake,               &  ! I
+                      d_tr_dyn,tr_seri)
+
+#else
+
     call phytrac ( &
          itap,     days_elapsed+1,    jH_cur,   debut, &
@@ -4288 +4315 @@
          d_tr_dyn, &                                 !<<RomP
          tr_seri)
+#endif
 
     IF (offline) THEN
@@ -4619 +4647 @@
     !On effectue les sorties:
 
+#ifdef CPP_Dust
+  CALL phys_output_write_spl(itap, pdtphys, paprs, pphis,  &
+       pplay, lmax_th, aerosol_couple,                 &
+       ok_ade, ok_aie, ivap, new_aod, ok_sync,         &
+       ptconv, read_climoz, clevSTD,                   &
+       ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse,      &
+       flag_aerosol, flag_aerosol_strat, ok_cdnc)
+#else
     CALL phys_output_write(itap, pdtphys, paprs, pphis,  &
          pplay, lmax_th, aerosol_couple,                 &
@@ -4625 +4661 @@
          ptconvth, d_t, qx, d_qx, zmasse,                &
          flag_aerosol, flag_aerosol_strat, ok_cdnc)
+#endif
+
 
     CALL write_paramLMDZ_phy(itap,nid_ctesGCM,ok_sync)