Changeset 2499 for LMDZ5/trunk/libf/phylmd/phyetat0.F90

Timestamp:

Apr 24, 2016, 12:38:19 PM (9 years ago)

Author:

oboucher

Message:

Various changes to diagnose properly 2D tendency in q, ql, qs from dynamics
as previous diagnostics were incorrect.
Cleaned up all such diagnostics in physiq_mod.F90 as well

File:

• LMDZ5/trunk/libf/phylmd/phyetat0.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/phyetat0.F90

@@ -12 +12 @@
        qsol, fevap, z0m, z0h, agesno, &
        du_gwd_rando, du_gwd_front, entr_therm, f0, fm_therm, &
-       falb_dir, falb_dif, &
+       falb_dir, falb_dif, prw_ancien, prlw_ancien, prsw_ancien, &
        ftsol, pbl_tke, pctsrf, q_ancien, ql_ancien, qs_ancien, radpas, radsol, rain_fall, ratqs, &
        rnebcon, rugoro, sig1, snow_fall, solaire_etat0, sollw, sollwdown, &
        solsw, t_ancien, u_ancien, v_ancien, w01, wake_cstar, wake_deltaq, &
        wake_deltat, wake_delta_pbl_TKE, delta_tsurf, wake_fip, wake_pe, &
-       wake_s, zgam, &
-       zmax0, zmea, zpic, zsig, &
+       wake_s, zgam, zmax0, zmea, zpic, zsig, &
        zstd, zthe, zval, ale_bl, ale_bl_trig, alp_bl
   USE geometry_mod, ONLY : longitude_deg, latitude_deg
@@ -322 +321 @@
 
   ancien_ok=.true.
-  ql_ancien=0.;qs_ancien=0.
   ancien_ok=ancien_ok.AND.phyetat0_get(klev,t_ancien,"TANCIEN","TANCIEN",0.)
   ancien_ok=ancien_ok.AND.phyetat0_get(klev,q_ancien,"QANCIEN","QANCIEN",0.)
@@ -329 +327 @@
   ancien_ok=ancien_ok.AND.phyetat0_get(klev,u_ancien,"UANCIEN","UANCIEN",0.)
   ancien_ok=ancien_ok.AND.phyetat0_get(klev,v_ancien,"VANCIEN","VANCIEN",0.)
+  ancien_ok=ancien_ok.AND.phyetat0_get(1,prw_ancien,"PRWANCIEN","PRWANCIEN",0.)
+  ancien_ok=ancien_ok.AND.phyetat0_get(1,prlw_ancien,"PRLWANCIEN","PRLWANCIEN",0.)
+  ancien_ok=ancien_ok.AND.phyetat0_get(1,prsw_ancien,"PRSWANCIEN","PRSWANCIEN",0.)
 
   ! Ehouarn: addtional tests to check if t_ancien, q_ancien contain
   !          dummy values (as is the case when generated by ce0l,
   !          or by iniaqua)
-  if ( (maxval(q_ancien).eq.minval(q_ancien)) .or. &
+  if ( (maxval(q_ancien).eq.minval(q_ancien))       .or. &
+       (maxval(ql_ancien).eq.minval(ql_ancien))     .or. &
+       (maxval(qs_ancien).eq.minval(qs_ancien))     .or. &
+       (maxval(prw_ancien).eq.minval(prw_ancien))   .or. &
+       (maxval(prlw_ancien).eq.minval(prlw_ancien)) .or. &
+       (maxval(prsw_ancien).eq.minval(prsw_ancien)) .or. &
        (maxval(t_ancien).eq.minval(t_ancien)) ) then
     ancien_ok=.false.