Skip to content

Commit

Permalink
Merge branch 'main' into feature/at_surface
Browse files Browse the repository at this point in the history
  • Loading branch information
climbfuji authored Sep 19, 2024
2 parents 64df1db + 0aa3039 commit f7a2e0c
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 13 deletions.
14 changes: 1 addition & 13 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,7 @@

# These owners will be the default owners for everything in the repo.

* @cacraigucar # NCAR/CGD
* @climbfuji # NRL
* @dustinswales # NOAA/GSL
* @gold2718 # Norway MET
* @grantfirl # NOAA/GSL
* @mattldawson # NCAR/ACOM
* @mkavulich # DTC
* @mwaxmonsky # NCAR/CGD
* @nusbaume # NCAR/CGD
* @peverwhee # NCAR/CGD
* @svahl991 # JCSDA
* @MayeulDestouches # UKMO
* @ss421 # UKMO
* @cacraigucar @climbfuji @dustinswales @gold2718 @grantfirl @mattldawson @mkavulich @mwaxmonsky @nusbaume @peverwhee @svahl991 @MayeulDestouches @ss421

# Order is important. The last matching pattern has the most precedence.
# So if a pull request only touches javascript files, only these owners
Expand Down
16 changes: 16 additions & 0 deletions Metadata-standard-names.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
* `real(kind=kind_phys)`: units = m s-1
* `northward_wind`: Wind vector component, positive when directed northward
* `real(kind=kind_phys)`: units = m s-1
* `eastward_wind_at_10m`: Wind vector component at 10m, positive when directed eastward
* `real(kind=kind_phys)`: units = m s-1
* `northward_wind_at_10m`: Wind vector component at 10m, positive when directed northward
* `real(kind=kind_phys)`: units = m s-1
* `dry_static_energy`: Dry static energy Content of Atmosphere Layer
* `real(kind=kind_phys)`: units = J kg-1
* `do_lagrangian_vertical_coordinate`: flag indicating if vertical coordinate is lagrangian
Expand Down Expand Up @@ -217,6 +221,14 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
* `real(kind=kind_phys)`: units = m s-2
* `tendency_of_northward_wind_due_to_model_physics`: Total change in northward wind from a physics suite
* `real(kind=kind_phys)`: units = m s-2
* `atmosphere_horizontal_streamfunction`: Scalar function describing the stream lines of the wind
* `real(kind=kind_phys)`: units = m2 s-1
* `atmosphere_horizontal_velocity_potential`: Scalar potential of the wind
* `real(kind=kind_phys)`: units = m2 s-1
* `atmosphere_upward_absolute_vorticity`: The curl of the vector wind field
* `real(kind=kind_phys)`: units = s-1
* `divergence_of_wind`: The (horizontal) divergence of the 2-D vector wind field
* `real(kind=kind_phys)`: units = s-1
* `surface_upward_heat_flux_in_air`: Surface upward heat flux in air
* `real(kind=kind_phys)`: units = W m-2
* `cumulative_boundary_flux_of_total_energy`: Cumulative boundary flux of total energy
Expand All @@ -241,6 +253,8 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
* `real(kind=kind_phys)`: units = K
* `virtual_temperature`: virtual temperature
* `real(kind=kind_phys)`: units = K
* `virtual_potential_temperature`: virtual potential temperature
* `real(kind=kind_phys)`: units = K
* `composition_dependent_gas_constant_of_dry_air`: Composition dependent gas constant of dry air
* `real(kind=kind_phys)`: units = J kg-1 K-1
* `composition_dependent_specific_heat_of_dry_air_at_constant_pressure`: composition dependent specific heat of dry air at constant pressure
Expand All @@ -265,6 +279,8 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
* `real(kind=kind_phys)`: units = fraction
* `relative_humidity`: Relative humidity
* `real(kind=kind_phys)`: units = fraction
* `relative_humidity_at_2m`: Relative humidity at 2m
* `real(kind=kind_phys)`: units = fraction
* `gravitational_acceleration`: Gravitational acceleration
* `real(kind=kind_phys)`: units = m s-2
## land_surface
Expand Down
31 changes: 31 additions & 0 deletions standard_names.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,14 @@
long_name="Wind vector component, positive when directed northward">
<type kind="kind_phys" units="m s-1">real</type>
</standard_name>
<standard_name name="eastward_wind_at_10m"
long_name="Wind vector component at 10m, positive when directed eastward">
<type kind="kind_phys" units="m s-1">real</type>
</standard_name>
<standard_name name="northward_wind_at_10m"
long_name="Wind vector component at 10m, positive when directed northward">
<type kind="kind_phys" units="m s-1">real</type>
</standard_name>
<standard_name name="dry_static_energy"
long_name="Dry static energy Content of Atmosphere Layer">
<type kind="kind_phys" units="J kg-1">real</type>
Expand Down Expand Up @@ -339,6 +347,22 @@
long_name="Total change in northward wind from a physics suite">
<type kind="kind_phys" units="m s-2">real</type>
</standard_name>
<standard_name name="atmosphere_horizontal_streamfunction"
long_name="Scalar function describing the stream lines of the wind">
<type kind="kind_phys" units="m2 s-1">real</type>
</standard_name>
<standard_name name="atmosphere_horizontal_velocity_potential"
long_name="Scalar potential of the wind">
<type kind="kind_phys" units="m2 s-1">real</type>
</standard_name>
<standard_name name="atmosphere_upward_absolute_vorticity"
long_name="The curl of the vector wind field">
<type kind="kind_phys" units="s-1">real</type>
</standard_name>
<standard_name name="divergence_of_wind"
long_name="The (horizontal) divergence of the 2-D vector wind field">
<type kind="kind_phys" units="s-1">real</type>
</standard_name>
<standard_name name="surface_upward_heat_flux_in_air">
<type kind="kind_phys" units="W m-2">real</type>
</standard_name>
Expand Down Expand Up @@ -384,6 +408,10 @@
long_name="virtual temperature">
<type kind="kind_phys" units="K">real</type>
</standard_name>
<standard_name name="virtual_potential_temperature"
long_name="virtual potential temperature">
<type kind="kind_phys" units="K">real</type>
</standard_name>
<standard_name name="composition_dependent_gas_constant_of_dry_air">
<type kind="kind_phys" units="J kg-1 K-1">real</type>
</standard_name>
Expand Down Expand Up @@ -426,6 +454,9 @@
<standard_name name="relative_humidity">
<type kind="kind_phys" units="fraction">real</type>
</standard_name>
<standard_name name="relative_humidity_at_2m">
<type kind="kind_phys" units="fraction">real</type>
</standard_name>
<standard_name name="gravitational_acceleration">
<type kind="kind_phys" units="m s-2">real</type>
</standard_name>
Expand Down

0 comments on commit f7a2e0c

Please sign in to comment.