Changeset 2327 for LMDZ5/trunk/libf
- Timestamp:
- Jul 11, 2015, 11:19:49 AM (9 years ago)
- Location:
- LMDZ5/trunk/libf/phylmd
- Files:
-
- 3 edited
-
cv3_routines.F90 (modified) (2 diffs)
-
phys_output_ctrlout_mod.F90 (modified) (3 diffs)
-
phys_output_mod.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/phylmd/cv3_routines.F90
r2311 r2327 2819 2819 2820 2820 !inputs: 2821 INTEGER iflag_mix 2822 INTEGER ncum, nd, na, ntra, nloc 2823 LOGICAL ok_conserv_q 2824 INTEGER icb(nloc), inb(nloc) 2825 REAL delt 2826 REAL t(nloc, nd), rr(nloc, nd), u(nloc, nd), v(nloc, nd) 2827 REAL t_wake(nloc, nd), rr_wake(nloc, nd) 2828 REAL s_wake(nloc) 2829 REAL tra(nloc, nd, ntra), sig(nloc, nd) 2830 REAL gz(nloc, na), ph(nloc, nd+1), h(nloc, na), hp(nloc, na) 2831 REAL th(nloc, na), p(nloc, nd), tp(nloc, na) 2832 REAL lv(nloc, na), cpn(nloc, na), ep(nloc, na), clw(nloc, na) 2833 REAL lf(nloc, na) 2834 REAL m(nloc, na), mp(nloc, na), rp(nloc, na), up(nloc, na) 2835 REAL vp(nloc, na), wt(nloc, nd), trap(nloc, nd, ntra) 2836 REAL water(nloc, na), evap(nloc, na), b(nloc, na), sigd(nloc) 2837 REAL fondue(nloc, na), faci(nloc, na), ice(nloc, na) 2838 REAL ment(nloc, na, na), qent(nloc, na, na), uent(nloc, na, na) 2839 REAL hent(nloc, na, na) 2840 !IM bug real vent(nloc,na,na), nent(nloc,na), elij(nloc,na,na) 2841 REAL vent(nloc, na, na), elij(nloc, na, na) 2842 INTEGER nent(nloc, nd) 2843 REAL traent(nloc, na, na, ntra) 2844 REAL tv(nloc, nd), tvp(nloc, nd), wghti(nloc, nd) 2821 INTEGER, INTENT (IN) :: iflag_mix 2822 INTEGER, INTENT (IN) :: ncum, nd, na, ntra, nloc 2823 LOGICAL, INTENT (IN) :: ok_conserv_q 2824 INTEGER, DIMENSION (nloc), INTENT (IN) :: icb, inb 2825 REAL, INTENT (IN) :: delt 2826 REAL, DIMENSION (nloc, nd), INTENT (IN) :: t, rr, u, v 2827 REAL, DIMENSION (nloc, nd), INTENT (IN) :: t_wake, rr_wake 2828 REAL, DIMENSION (nloc), INTENT (IN) :: s_wake 2829 REAL, DIMENSION (nloc, nd, ntra), INTENT (IN) :: tra 2830 REAL, DIMENSION (nloc, nd), INTENT (IN) :: p 2831 REAL, DIMENSION (nloc, nd+1), INTENT (IN) :: ph 2832 REAL, DIMENSION (nloc, na), INTENT (IN) :: gz, h, hp 2833 REAL, DIMENSION (nloc, na), INTENT (IN) :: th, tp 2834 REAL, DIMENSION (nloc, na), INTENT (IN) :: lv, cpn, ep, clw 2835 REAL, DIMENSION (nloc, na), INTENT (IN) :: lf 2836 REAL, DIMENSION (nloc, na), INTENT (IN) :: rp, up 2837 REAL, DIMENSION (nloc, na), INTENT (IN) :: vp 2838 REAL, DIMENSION (nloc, nd), INTENT (IN) :: wt 2839 REAL, DIMENSION (nloc, nd, ntra), INTENT (IN) :: trap 2840 REAL, DIMENSION (nloc, na), INTENT (IN) :: water, evap, b 2841 REAL, DIMENSION (nloc, na), INTENT (IN) :: fondue, faci, ice 2842 REAL, DIMENSION (nloc, na, na), INTENT (IN) :: qent, uent 2843 REAL, DIMENSION (nloc, na, na), INTENT (IN) :: hent 2844 REAL, DIMENSION (nloc, na, na), INTENT (IN) :: vent, elij 2845 INTEGER, DIMENSION (nloc, nd), INTENT (IN) :: nent 2846 REAL, DIMENSION (nloc, na, na, ntra), INTENT (IN) :: traent 2847 REAL, DIMENSION (nloc, nd), INTENT (IN) :: tv, tvp, wghti 2848 REAL,INTENT(IN) :: tau_cld_cv, coefw_cld_cv 2845 2849 ! 2846 2850 !input/output: 2847 INTEGER iflag(nloc) 2848 REAL,INTENT(in) :: tau_cld_cv, coefw_cld_cv 2851 REAL, DIMENSION (nloc, na), INTENT (INOUT) :: m, mp 2852 REAL, DIMENSION (nloc, na, na), INTENT (INOUT) :: ment 2853 INTEGER, DIMENSION (nloc), INTENT (INOUT) :: iflag 2854 REAL, DIMENSION (nloc, nd), INTENT (INOUT) :: sig 2855 REAL, DIMENSION (nloc), INTENT (INOUT) :: sigd 2849 2856 ! 2850 2857 !outputs: 2851 REAL precip(nloc)2852 REAL ft(nloc, nd), fr(nloc, nd), fu(nloc, nd), fv(nloc, nd)2853 REAL ftd(nloc, nd), fqd(nloc, nd)2854 REAL ftra(nloc, nd, ntra)2855 REAL upwd(nloc, nd), dnwd(nloc, nd), ma(nloc, nd)2856 REAL dnwd0(nloc, nd), mip(nloc, nd)2857 REAL Vprecip(nloc, nd+1)2858 REAL Vprecipi(nloc, nd+1) ! jyg: Vprecipi2859 !! REAL tls(nloc, nd), tps(nloc, nd) ! useless . jyg2860 REAL qcondc(nloc, nd)! cld2861 REAL qtc(nloc,nd), sigt(nloc,nd)! cld2862 REAL wd(nloc)! gust2863 REAL cbmf(nloc)2858 REAL, DIMENSION (nloc), INTENT (OUT) :: precip 2859 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: ft, fr, fu, fv 2860 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: ftd, fqd 2861 REAL, DIMENSION (nloc, nd, ntra), INTENT (OUT) :: ftra 2862 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: upwd, dnwd, ma 2863 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: dnwd0, mip 2864 REAL, DIMENSION (nloc, nd+1), INTENT (OUT) :: Vprecip 2865 REAL, DIMENSION (nloc, nd+1), INTENT (OUT) :: Vprecipi 2866 !! REAL tls(nloc, nd), tps(nloc, nd) ! useless . jyg 2867 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: qcondc ! cld 2868 REAL, DIMENSION (nloc, nd), INTENT (OUT) :: qtc, sigt ! cld 2869 REAL, DIMENSION (nloc), INTENT (OUT) :: wd ! gust 2870 REAL, DIMENSION (nloc), INTENT (OUT) :: cbmf 2864 2871 ! 2865 2872 !local variables: … … 3594 3601 END IF 3595 3602 END DO 3603 ! 3604 print *,' YIELD : alpha_qpos ',alpha_qpos(1) 3605 ! 3596 3606 DO il = 1, ncum 3597 3607 IF (iflag(il)<=1) THEN -
LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90
r2295 r2327 481 481 'ale_bl', 'ALE BL', 'm2/s2', (/ ('', i=1, 9) /)) 482 482 TYPE(ctrl_out), SAVE :: o_alp_bl = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 483 'alp_bl', 'ALP BL', ' m2/s2', (/ ('', i=1, 9) /))483 'alp_bl', 'ALP BL', 'W/m2', (/ ('', i=1, 9) /)) 484 484 TYPE(ctrl_out), SAVE :: o_ale_wk = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 485 485 'ale_wk', 'ALE WK', 'm2/s2', (/ ('', i=1, 9) /)) 486 486 TYPE(ctrl_out), SAVE :: o_alp_wk = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 487 'alp_wk', 'ALP WK', ' m2/s2', (/ ('', i=1, 9) /))487 'alp_wk', 'ALP WK', 'W/m2', (/ ('', i=1, 9) /)) 488 488 !!! 489 489 !nrlmd+jyg< 490 type(ctrl_out),save :: o_dtvdf_x = ctrl_out((/ 1, 1 , 1, 10, 10, 10, 11, 11, 11 /), &490 type(ctrl_out),save :: o_dtvdf_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 491 491 'dtvdf_x', ' dtvdf off_wake','K/s', (/ ('', i=1, 9) /)) 492 type(ctrl_out),save :: o_dtvdf_w = ctrl_out((/ 1, 1 , 1, 10, 10, 10, 11, 11, 11 /), &492 type(ctrl_out),save :: o_dtvdf_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 493 493 'dtvdf_w', ' dtvdf within_wake','K/s', (/ ('', i=1, 9) /)) 494 type(ctrl_out),save :: o_dqvdf_x = ctrl_out((/ 1, 1 , 1, 10, 10, 10, 11, 11, 11 /), &494 type(ctrl_out),save :: o_dqvdf_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 495 495 'dqvdf_x', ' dqvdf off_wake','kg/kg/s', (/ ('', i=1, 9) /)) 496 type(ctrl_out),save :: o_dqvdf_w = ctrl_out((/ 1, 1 , 1, 10, 10, 10, 11, 11, 11 /), &496 type(ctrl_out),save :: o_dqvdf_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 497 497 'dqvdf_w', ' dqvdf within_wake','kg/kg/s', (/ ('', i=1, 9) /)) 498 498 !! 499 499 type(ctrl_out),save :: o_sens_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 500 'sens_x', ' ALP WK', 'm2/s2', (/ ('', i=1, 9) /))500 'sens_x', 'sens off_wake', 'W/m2', (/ ('', i=1, 9) /)) 501 501 type(ctrl_out),save :: o_sens_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 502 'sens_w', ' ALP WK', 'm2/s2', (/ ('', i=1, 9) /))502 'sens_w', 'sens within_wake', 'W/m2', (/ ('', i=1, 9) /)) 503 503 type(ctrl_out),save :: o_flat_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 504 'flat_x', ' ALP WK', 'm2/s2', (/ ('', i=1, 9) /))504 'flat_x', 'flat off_wake', 'W/m2', (/ ('', i=1, 9) /)) 505 505 type(ctrl_out),save :: o_flat_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 506 'flat_w', ' ALP WK', 'm2/s2', (/ ('', i=1, 9) /))506 'flat_w', 'flat within_wake', 'W/m2', (/ ('', i=1, 9) /)) 507 507 !! 508 508 type(ctrl_out),save :: o_delta_tsurf = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & … … 531 531 'cin', 'Convective INhibition', 'm2/s2', (/ ('', i=1, 9) /)) 532 532 TYPE(ctrl_out), SAVE :: o_wape = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 533 'wape', '', ' ', (/ ('', i=1, 9) /))533 'wape', '', 'm2/s2', (/ ('', i=1, 9) /)) 534 534 535 535 !!! nrlmd le 10/04/2012 536 536 537 537 !-------Spectre de thermiques de type 2 au LCL 538 TYPE(ctrl_out), SAVE :: o_n2 = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &538 TYPE(ctrl_out), SAVE :: o_n2 = ctrl_out((/ 1, 6, 6, 6, 10, 10, 11, 11, 11 /), & 539 539 'n2', 'Nombre de panaches de type 2', ' ', (/ ('', i=1, 9) /)) 540 TYPE(ctrl_out), SAVE :: o_s2 = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &540 TYPE(ctrl_out), SAVE :: o_s2 = ctrl_out((/ 1, 6, 6, 6, 10, 10, 11, 11, 11 /), & 541 541 's2', 'Surface moyenne des panaches de type 2', 'm2', (/ ('', i=1, 9) /)) 542 542 543 543 !-------Déclenchement stochastique 544 TYPE(ctrl_out), SAVE :: o_proba_notrig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &544 TYPE(ctrl_out), SAVE :: o_proba_notrig = ctrl_out((/ 1, 6, 6, 6, 10, 10, 11, 11, 11 /), & 545 545 'proba_notrig', & 546 546 'Probabilite de non-declenchement', ' ', (/ ('', i=1, 9) /)) 547 TYPE(ctrl_out), SAVE :: o_random_notrig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &547 TYPE(ctrl_out), SAVE :: o_random_notrig = ctrl_out((/ 1, 6, 6, 6, 10, 10, 11, 11, 11 /), & 548 548 'random_notrig', & 549 549 'Tirage aleatoire de non-declenchement', ' ', (/ ('', i=1, 9) /)) 550 TYPE(ctrl_out), SAVE :: o_ale_bl_stat = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &550 TYPE(ctrl_out), SAVE :: o_ale_bl_stat = ctrl_out((/ 1, 6, 6, 6, 10, 10, 11, 11, 11 /), & 551 551 'ale_bl_stat', & 552 552 'ALE_BL_STAT', 'm2/s2', (/ ('', i=1, 9) /)) 553 TYPE(ctrl_out), SAVE :: o_ale_bl_trig = ctrl_out((/ 1, 1, 1, 6, 10, 10, 11, 11, 11 /), &553 TYPE(ctrl_out), SAVE :: o_ale_bl_trig = ctrl_out((/ 1, 6, 6, 6, 10, 10, 11, 11, 11 /), & 554 554 'ale_bl_trig', & 555 'ALE_BL_STAT + Condition P>Pseuil', 'm2/s2', (/ ('', i=1, 9) /))555 'ALE_BL_STAT + Condition S>Sthreshold', 'm2/s2', (/ ('', i=1, 9) /)) 556 556 557 557 !-------Fermeture statistique … … 1085 1085 TYPE(ctrl_out), SAVE :: o_wake_omg = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), & 1086 1086 'wake_omg', 'wake_omg', ' ', (/ ('', i=1, 9) /)) 1087 TYPE(ctrl_out), SAVE :: o_wdtrainA = ctrl_out((/ 4, 5, 10, 4, 1, 10, 11, 11, 110 /), &1087 TYPE(ctrl_out), SAVE :: o_wdtrainA = ctrl_out((/ 4, 5, 10, 4, 10, 10, 11, 11, 110 /), & 1088 1088 'wdtrainA', 'precipitation from AA', '-', (/ ('', i=1, 9) /)) 1089 TYPE(ctrl_out), SAVE :: o_wdtrainM = ctrl_out((/ 4, 5, 10, 4, 1, 10, 11, 11, 110 /), &1089 TYPE(ctrl_out), SAVE :: o_wdtrainM = ctrl_out((/ 4, 5, 10, 4, 10, 10, 11, 11, 110 /), & 1090 1090 'wdtrainM', 'precipitation from mixture', '-', (/ ('', i=1, 9) /)) 1091 1091 TYPE(ctrl_out), SAVE :: o_Vprecip = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), & -
LMDZ5/trunk/libf/phylmd/phys_output_mod.F90
r2320 r2327 418 418 DO iq=nqo+1,nqtot 419 419 iiq=niadv(iq) 420 o_trac(iq-nqo) = ctrl_out((/ 4, 5, 1, 1, 1, 10, 11, 11, 11 /), &420 o_trac(iq-nqo) = ctrl_out((/ 4, 5, 5, 5, 10, 10, 11, 11, 11 /), & 421 421 tname(iiq),'Tracer '//ttext(iiq), "-", & 422 422 (/ '', '', '', '', '', '', '', '', '' /))
Note: See TracChangeset
for help on using the changeset viewer.
