Ignore:
Timestamp:
Jul 11, 2015, 11:19:49 AM (9 years ago)
Author:
jyg
Message:

Changes in output levels of some variables and
Fixes of units for Ale and Alp variables.
Cleaning of variable declarations in cv3_yield.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

    r2295 r2327  
    481481    'ale_bl', 'ALE BL', 'm2/s2', (/ ('', i=1, 9) /))
    482482  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) /))
    484484  TYPE(ctrl_out), SAVE :: o_ale_wk = ctrl_out((/ 1, 1, 1, 10, 10, 10, 11, 11, 11 /), &
    485485    'ale_wk', 'ALE WK', 'm2/s2', (/ ('', i=1, 9) /))
    486486  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) /))
    488488!!!
    489489!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 /), &
    491491    '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 /), &
    493493    '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 /), &
    495495    '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 /), &
    497497    'dqvdf_w', ' dqvdf within_wake','kg/kg/s', (/ ('', i=1, 9) /))
    498498!!
    499499  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) /))
    501501  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) /))                                                                                   
    503503  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) /))                                                                                   
    505505  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) /))
    507507!!
    508508  type(ctrl_out),save :: o_delta_tsurf    = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11 /), &
    … …  
    531531    'cin', 'Convective INhibition', 'm2/s2', (/ ('', i=1, 9) /))
    532532  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) /))
    534534
    535535!!! nrlmd le 10/04/2012
    536536
    537537!-------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 /), &
    539539    '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 /), &
    541541    's2', 'Surface moyenne des panaches de type 2', 'm2', (/ ('', i=1, 9) /))
    542542                                                                             
    543543!-------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 /), &
    545545    'proba_notrig', &
    546546                         '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 /), &
    548548    'random_notrig', &
    549549                         '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 /), &
    551551    'ale_bl_stat', &
    552552       '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 /), &
    554554    '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) /))
    556556
    557557!-------Fermeture statistique
    … …  
    10851085  TYPE(ctrl_out), SAVE :: o_wake_omg = ctrl_out((/ 4, 5, 10, 10, 10, 10, 11, 11, 11 /), &
    10861086    '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 /), &
    10881088    '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 /), &
    10901090    'wdtrainM', 'precipitation from mixture', '-', (/ ('', i=1, 9) /))
    10911091  TYPE(ctrl_out), SAVE :: o_Vprecip = ctrl_out((/ 10, 10, 10, 10, 10, 10, 11, 11, 11 /), &
Note: See TracChangeset for help on using the changeset viewer.