Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/DefLists/field_def_lmdz.xml

    r2298 r2408  
    1515        <field id="flat"    long_name="Latent heat flux"        unit="W/m2" />
    1616        <field id="slp"     long_name="Sea Level Pressure"      unit="Pa" />
     17        <field id="ptstar"  long_name="Air Surface Temperature" unit="K" />
     18        <field id="pt0"     long_name="Standard Air Surface Temperature"      unit="K" />
    1719        <field id="tsol"    long_name="Surface Temperature"     unit="K" />
    1820        <field id="t2m"        long_name="Temperature 2m" unit="K" />
    … …  
    111113        <field id="du_gwd_rando"    long_name="peu importe"    unit="W/m2" />
    112114        <field id="dv_gwd_rando"    long_name="peu importe"    unit="W/m2" />
    113         <field id="vstr_gwd_rando"    long_name="peu importe"    unit="W/m2" />
     115        <field id="ustr_gwd_hines"    long_name="zonal wind stress Hines gravity waves"    unit="Pa" />
     116        <field id="vstr_gwd_hines"    long_name="meridional wind stress Hines gravity waves"    unit="Pa" />
     117        <field id="ustr_gwd_front"    long_name="zonal wind stress fronts gravity waves"    unit="Pa" />
     118        <field id="vstr_gwd_front"    long_name="meridional wind stress fronts gravity waves"    unit="Pa" />
     119        <field id="ustr_gwd_rando"    long_name="zonal wind stress random gravity waves"    unit="Pa" />
     120        <field id="vstr_gwd_rando"    long_name="meridinal wind stress random gravity waves"    unit="Pa" />
    114121        <field id="sens"    long_name="Sensible heat flux"    unit="W/m2" />
    115122        <field id="fder"    long_name="Heat flux derivation"    unit="W/m2" />
    … …  
    510517        <field id="dulif"    long_name="Orography dU"    unit="m/s2" />
    511518        <field id="dvlif"    long_name="Orography dV"    unit="m/s2" />
    512         <field id="duhin"    long_name="Hines GWD dU"    unit="m/s2" />
    513         <field id="dvhin"    long_name="Hines GWD dV"    unit="m/s2" />
     519        <field id="du_gwd_hines" long_name="Hines GWD dU" unit="m/s2" />
     520        <field id="dv_gwd_hines" long_name="Hines GWD dV" unit="m/s2" />
     521        <field id="du_gwd_front" long_name="Fronts GWD dU" unit="m/s2" />
     522        <field id="dv_gwd_front" long_name="Fronts GWD dV" unit="m/s2" />
     523        <field id="east_gwstress" long_name="Eastward GW Stress" unit="Pa" />
     524        <field id="west_gwstress" long_name="Westward GW Stress" unit="Pa" />
    514525        <field id="dtoro"    long_name="Orography dT"    unit="K/s" />
    515526        <field id="dtlif"    long_name="Orography dT"    unit="K/s" />
    … …  
    693704
    694705</field_definition>
     706

  • LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml

    r2298 r2408  
    1919                <field field_ref="flat" level="5" />
    2020                <field field_ref="slp" level="10" />
     21                <field field_ref="ptstar" level="10" />
     22                <field field_ref="pt0" level="10" />
    2123                <field field_ref="tsol" level="10" />
    2224                <field field_ref="t2m" level="10" />
    … …  
    491493                <field field_ref="dulif" level="10" />
    492494                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     495                <field field_ref="du_gwd_hines" level="10" />
     496                <field field_ref="dv_gwd_hines" level="10" />
     497                <field field_ref="du_gwd_front" level="10" />
     498                <field field_ref="dv_gwd_front" level="10" />
     499                <field field_ref="east_gwstress" level="10" />
     500                <field field_ref="west_gwstress" level="10" />
    495501                <field field_ref="dtoro" level="10" />
    496502                <field field_ref="dtlif" level="10" />

  • LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml

    r2298 r2408  
    1919                <field field_ref="flat" level="1" />
    2020                <field field_ref="slp" level="1" />
     21                <field field_ref="ptstar" level="1" />
     22                <field field_ref="pt0" level="1" />
    2123                <field field_ref="tsol" level="1" />
    2224                <field field_ref="t2m" level="1" />
    … …  
    491493                <field field_ref="dulif" level="10" />
    492494                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     495                <field field_ref="du_gwd_hines" level="10" />
     496                <field field_ref="dv_gwd_hines" level="10" />
     497                <field field_ref="du_gwd_front" level="10" />
     498                <field field_ref="dv_gwd_front" level="10" />
     499                <field field_ref="east_gwstress" level="10" />
     500                <field field_ref="west_gwstress" level="10" />
    495501                <field field_ref="dtoro" level="10" />
    496502                <field field_ref="dtlif" level="10" />

  • LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml

    r2298 r2408  
    1919                <field field_ref="flat" level="10" />
    2020                <field field_ref="slp" level="10" />
     21                <field field_ref="ptstar" level="10" />
     22                <field field_ref="pt0" level="10" />
    2123                <field field_ref="tsol" level="5" />
    2224                <field field_ref="t2m" level="5" />
    … …  
    491493                <field field_ref="dulif" level="10" />
    492494                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     495                <field field_ref="du_gwd_hines" level="10" />
     496                <field field_ref="dv_gwd_hines" level="10" />
     497                <field field_ref="du_gwd_front" level="10" />
     498                <field field_ref="dv_gwd_front" level="10" />
     499                <field field_ref="east_gwstress" level="10" />
     500                <field field_ref="west_gwstress" level="10" />
    495501                <field field_ref="dtoro" level="10" />
    496502                <field field_ref="dtlif" level="10" />

  • LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml

    r2298 r2408  
    1919                <field field_ref="flat" level="10" />
    2020                <field field_ref="slp" level="1" />
     21                <field field_ref="ptstar" level="1" />
     22                <field field_ref="pt0" level="1" />
    2123                <field field_ref="tsol" level="1" />
    2224                <field field_ref="t2m" level="1" />
    … …  
    491493                <field field_ref="dulif" level="10" />
    492494                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     495                <field field_ref="du_gwd_hines" level="10" />
     496                <field field_ref="dv_gwd_hines" level="10" />
     497                <field field_ref="du_gwd_front" level="10" />
     498                <field field_ref="dv_gwd_front" level="10" />
     499                <field field_ref="east_gwstress" level="10" />
     500                <field field_ref="west_gwstress" level="10" />
    495501                <field field_ref="dtoro" level="10" />
    496502                <field field_ref="dtlif" level="10" />

  • LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

    r2298 r2408  
    1919                <field field_ref="flat"         level="5" />
    2020                <field field_ref="slp"          level="1" />
     21                <field field_ref="ptstar"       level="1" />
     22                <field field_ref="pt0"          level="1" />
    2123                <field field_ref="tsol"         level="1" />
    2224                <field field_ref="t2m"          level="1" />
    … …  
    491493                <field field_ref="dulif" level="4" />
    492494                <field field_ref="dvlif" level="4" />
    493                 <field field_ref="duhin" level="4" />
    494                 <field field_ref="dvhin" level="4" />
     495                <field field_ref="du_gwd_hines" level="4" />
     496                <field field_ref="dv_gwd_hines" level="4" />
     497                <field field_ref="du_gwd_front" level="4" />
     498                <field field_ref="dv_gwd_front" level="4" />
     499                <field field_ref="east_gwstress" level="4" />
     500                <field field_ref="west_gwstress" level="4" />
    495501                <field field_ref="dtoro" level="4" />
    496502                <field field_ref="dtlif" level="4" />

  • LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml

    r2298 r2408  
    1919                <field field_ref="flat" level="10" />
    2020                <field field_ref="slp" level="10" />
     21                <field field_ref="ptstar" level="10" />
     22                <field field_ref="pt0" level="10" />
    2123                <field field_ref="tsol" level="10" />
    2224                <field field_ref="t2m" level="10" />
    … …  
    491493                <field field_ref="dulif" level="10" />
    492494                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     495                <field field_ref="du_gwd_hines" level="10" />
     496                <field field_ref="dv_gwd_hines" level="10" />
     497                <field field_ref="du_gwd_front" level="10" />
     498                <field field_ref="dv_gwd_front" level="10" />
     499                <field field_ref="east_gwstress" level="10" />
     500                <field field_ref="west_gwstress" level="10" />
    495501                <field field_ref="dtoro" level="10" />
    496502                <field field_ref="dtlif" level="10" />

  • LMDZ5/branches/testing/DefLists/physiq.def_L39_AR40.0

    • Property svn:keywords set to Id
    r2160 r2408  
    1 ##############################################################################
     1#
     2# $Id$
     3#
     4###############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
    36##############################################################################

  • LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv0.0

    • Property svn:keywords set to Id
    r1910 r2408  
    1 ##############################################################################
     1#
     2# $Id$
     3#
     4###############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
    36##############################################################################

  • LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv1.0

    • Property svn:keywords set to Id
    r1910 r2408  
    1 ##############################################################################
     1#
     2# $Id$
     3#
     4###############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
    36##############################################################################

  • LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv2.0

    • Property svn:keywords set to Id
    r1910 r2408  
     1#
     2# $Id$
     3#
    14##############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ

  • LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.0

    • Property svn:keywords set to Id
    r1910 r2408  
    1 ##############################################################################
     1#
     2# $Id$
     3#
     4###############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
    36##############################################################################

  • LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.1

    • Property svn:keywords set to Id
    r1910 r2408  
    1 ##############################################################################
     1#
     2# $Id$
     3#
     4###############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
    36##############################################################################

  • LMDZ5/branches/testing/DefLists/physiq.def_L39_NPv3.2

    • Property svn:keywords set to Id
    r1910 r2408  
    1 ##############################################################################
     1#
     2# $Id$
     3#
     4###############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
    36##############################################################################

  • LMDZ5/branches/testing/DefLists/physiq.def_L59_NPv4.12

    • Property svn:keywords set to Id
    r2073 r2408  
    1 ##############################################################################
     1#
     2# $Id$
     3#
     4###############################################################################
    25# PARAMETRES ET CLES DE LA PHYSIQUE LMDZ
    36##############################################################################
Note: See TracChangeset for help on using the changeset viewer.