- Timestamp:
- Jan 30, 2015, 2:57:13 PM (10 years ago)
- Location:
- LMDZ5/branches/testing
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
libf/phylmd/phys_output_ctrlout_mod.F90 (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/branches/testing
- Property svn:mergeinfo changed
/LMDZ5/trunk merged: 2159,2162,2166-2167,2169-2171,2177-2186
- Property svn:mergeinfo changed
-
LMDZ5/branches/testing/libf/phylmd/phys_output_ctrlout_mod.F90
r2160 r2187 477 477 TYPE(ctrl_out), SAVE :: o_alp_wk = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 478 478 'alp_wk', 'ALP WK', 'm2/s2', (/ ('', i=1, 9) /)) 479 !!! 480 !nrlmd+jyg< 481 type(ctrl_out),save :: o_dtvdf_x = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 482 'dtvdf_x', ' dtvdf off_wake','K/s', (/ ('', i=1, 9) /)) 483 type(ctrl_out),save :: o_dtvdf_w = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 484 'dtvdf_w', ' dtvdf within_wake','K/s', (/ ('', i=1, 9) /)) 485 type(ctrl_out),save :: o_dqvdf_x = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 486 'dqvdf_x', ' dqvdf off_wake','kg/kg/s', (/ ('', i=1, 9) /)) 487 type(ctrl_out),save :: o_dqvdf_w = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 488 'dqvdf_w', ' dqvdf within_wake','kg/kg/s', (/ ('', i=1, 9) /)) 489 !! 490 type(ctrl_out),save :: o_sens_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 491 'sens_x', 'ALP WK', 'm2/s2', (/ ('', i=1, 9) /)) 492 type(ctrl_out),save :: o_sens_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 493 'sens_w', 'ALP WK', 'm2/s2', (/ ('', i=1, 9) /)) 494 type(ctrl_out),save :: o_flat_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 495 'flat_x', 'ALP WK', 'm2/s2', (/ ('', i=1, 9) /)) 496 type(ctrl_out),save :: o_flat_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 497 'flat_w', 'ALP WK', 'm2/s2', (/ ('', i=1, 9) /)) 498 !! 499 type(ctrl_out),save :: o_delta_tsurf = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 500 'delta_tsurf', 'Temperature difference (w-x)', 'K', (/ ('', i=1, 9) /)) 501 type(ctrl_out),save :: o_cdragh_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 502 'cdragh_x', 'cdragh off-wake', '', (/ ('', i=1, 9) /)) 503 type(ctrl_out),save :: o_cdragh_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 504 'cdragh_w', 'cdragh within-wake', '', (/ ('', i=1, 9) /)) 505 type(ctrl_out),save :: o_cdragm_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 506 'cdragm_x', 'cdragm off-wake', '', (/ ('', i=1, 9) /)) 507 type(ctrl_out),save :: o_cdragm_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 508 'cdragm_w', 'cdrgam within-wake', '', (/ ('', i=1, 9) /)) 509 type(ctrl_out),save :: o_kh = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 510 'kh', 'Kh', 'kg/s/m2', (/ ('', i=1, 9) /)) 511 type(ctrl_out),save :: o_kh_x = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 512 'kh_x', 'Kh off-wake', 'kg/s/m2', (/ ('', i=1, 9) /)) 513 type(ctrl_out),save :: o_kh_w = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), & 514 'kh_w', 'Kh within-wake', 'kg/s/m2', (/ ('', i=1, 9) /)) 515 !>nrlmd+jyg 516 !!! 479 517 TYPE(ctrl_out), SAVE :: o_ale = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), & 480 518 'ale', 'ALE', 'm2/s2', (/ ('', i=1, 9) /)) … … 693 731 (/ "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)", & 694 732 "t_max(X)", "t_max(X)", "t_max(X)", "t_max(X)" /)) /) 733 734 TYPE(ctrl_out), SAVE, DIMENSION(4) :: o_dltpbltke_srf = (/ & 735 ctrl_out((/ 10, 4, 10, 10, 10, 10, 11, 11, 11 /),'dltpbltke_ter', & 736 "TKE difference (w - x) "//clnsurf(1),"-", (/ ('', i=1, 9) /)), & 737 ctrl_out((/ 10, 4, 10, 10, 10, 10, 11, 11, 11 /),'dltpbltke_lic', & 738 "TKE difference (w - x) "//clnsurf(2),"-", (/ ('', i=1, 9) /)), & 739 ctrl_out((/ 10, 4, 10, 10, 10, 10, 11, 11, 11 /),'dltpbltke_oce', & 740 "TKE difference (w - x) "//clnsurf(3),"-", (/ ('', i=1, 9) /)), & 741 ctrl_out((/ 10, 4, 10, 10, 10, 10, 11, 11, 11 /),'dltpbltke_sic', & 742 "TKE difference (w - x) "//clnsurf(4),"-", (/ ('', i=1, 9) /)) /) 695 743 696 744 TYPE(ctrl_out), SAVE :: o_kz = ctrl_out((/ 4, 10, 10, 10, 10, 10, 11, 11, 11 /), & … … 749 797 'sollwai', 'LW-AIE at SFR', 'W/m2', (/ ('', i=1, 9) /)) 750 798 751 type(ctrl_out),save,dimension(naero_tot) :: o_tausumaero = & 752 (/ ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(1), & 753 "Aerosol Optical depth at 550 nm "//name_aero_tau(1),"1", (/ ('', i=1, 9) /)), & 754 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(2), & 755 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"2", (/ ('', i=1, 9) /)), & 756 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(3), & 757 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"3", (/ ('', i=1, 9) /)), & 758 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(4), & 759 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"4", (/ ('', i=1, 9) /)), & 760 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(5), & 761 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"5", (/ ('', i=1, 9) /)), & 762 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(6), & 763 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"6", (/ ('', i=1, 9) /)), & 764 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(7), & 765 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"7", (/ ('', i=1, 9) /)), & 766 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(8), & 767 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"8", (/ ('', i=1, 9) /)), & 768 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(9), & 769 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"9", (/ ('', i=1, 9) /)), & 770 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(10), & 771 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"10", (/ ('', i=1, 9) /)), & 772 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(11), & 773 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"11", (/ ('', i=1, 9) /)), & 774 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(12), & 775 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"12", (/ ('', i=1, 9) /)), & 776 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(13), & 777 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"13", (/ ('', i=1, 9) /)), & 778 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(14), & 779 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"14", (/ ('', i=1, 9) /)) /) 799 800 TYPE(ctrl_out),SAVE,DIMENSION(naero_tot) :: o_tausumaero = & 801 (/ ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(1), & 802 "Aerosol Optical depth at 550 nm "//name_aero_tau(1),"1", (/ ('', i=1, 9) /)), & 803 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(2), & 804 "Aerosol Optical depth at 550 nm "//name_aero_tau(2),"2", (/ ('', i=1, 9) /)), & 805 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(3), & 806 "Aerosol Optical depth at 550 nm "//name_aero_tau(3),"3", (/ ('', i=1, 9) /)), & 807 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(4), & 808 "Aerosol Optical depth at 550 nm "//name_aero_tau(4),"4", (/ ('', i=1, 9) /)), & 809 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(5), & 810 "Aerosol Optical depth at 550 nm "//name_aero_tau(5),"5", (/ ('', i=1, 9) /)), & 811 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(6), & 812 "Aerosol Optical depth at 550 nm "//name_aero_tau(6),"6", (/ ('', i=1, 9) /)), & 813 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(7), & 814 "Aerosol Optical depth at 550 nm "//name_aero_tau(7),"7", (/ ('', i=1, 9) /)), & 815 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(8), & 816 "Aerosol Optical depth at 550 nm "//name_aero_tau(8),"8", (/ ('', i=1, 9) /)), & 817 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(9), & 818 "Aerosol Optical depth at 550 nm "//name_aero_tau(9),"9", (/ ('', i=1, 9) /)), & 819 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(10), & 820 "Aerosol Optical depth at 550 nm "//name_aero_tau(10),"10", (/ ('', i=1, 9) /)), & 821 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(11), & 822 "Aerosol Optical depth at 550 nm "//name_aero_tau(11),"11", (/ ('', i=1, 9) /)), & 823 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(12), & 824 "Aerosol Optical depth at 550 nm "//name_aero_tau(12),"12", (/ ('', i=1, 9) /)), & 825 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(13), & 826 "Aerosol Optical depth at 550 nm "//name_aero_tau(13),"13", (/ ('', i=1, 9) /)), & 827 ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(14), & 828 "Aerosol Optical depth at 550 nm "//name_aero_tau(14),"14", (/ ('', i=1, 9) /)) /) 829 780 830 781 831
Note: See TracChangeset
for help on using the changeset viewer.
