Skip to content

Commit df17fc4

Browse files
committed
Update standard names, xml now fully validates!
1 parent 4ad56ea commit df17fc4

3 files changed

Lines changed: 35 additions & 32 deletions

File tree

Metadata-standard-names.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,11 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
344344
* `specific_heat_of_dry_air_at_constant_pressure`: Specific heat of dry air at constant pressure
345345
* `real`: units = J kg-1 K-1
346346
* `physics_state_due_to_dynamics`: Physics state due to dynamics
347-
* `physics_state`: units = none
347+
* `ddt`: units = none
348348
* `timestep_for_physics`: Timestep for physics
349349
* `integer`: units = s
350350
* `total_tendency_of_physics`: Total tendency of physics
351-
* `physics_tend`: units = none
351+
* `ddt`: units = none
352352
* `air_pressure_at_top_of_atmosphere_model`: Air pressure at top of atmosphere model
353353
* `real`: units = Pa
354354
* `air_pressure_at_sea_level`: Air pressure at sea level
@@ -804,7 +804,7 @@ Optional CCPP framework-provided variables
804804
* `ccpp_scheme_name`: CCPP physics scheme name
805805
* `character`: units = none
806806
* `ccpp_constituent_properties`: CCPP Constituent Properties
807-
* `ccpp_constituent_prop_ptr_t`: units = none
807+
* `ddt`: units = none
808808
* `ccpp_constituents`: Array of constituents managed by CCPP Framework
809809
* `real`: units = none
810810
* `ccpp_constituent_min_values`: CCPP constituent minimum values
@@ -1957,7 +1957,7 @@ Variables related to the compute environment
19571957
* `real`: units = 1
19581958
* `temperature_in_ice_layer`: Temperature in ice layer
19591959
* `real`: units = K
1960-
* `upward_flux_of_water_vapor_mixing_ratio_wrt_moist_air_at_surface`: Upward flux of water vapor mixing ratio wrt moist air at surface
1960+
* `upward_flux_of_water_vapor_mixing_ratio_wrt_moist_air_at_surface`: Upward specific humidity (water vapor mass mixing ratio with respect to moist air) flux at surface
19611961
* `real`: units = kg kg-1 m s-1
19621962
* `upward_temperature_flux_at_surface`: Upward temperature flux at surface
19631963
* `real`: units = K m s-1
@@ -1989,11 +1989,11 @@ Variables related to the compute environment
19891989
* `real`: units = fraction
19901990
* `nir_albedo_strong_cosz`: albedo for near-infrared radiation with strong dependence on cosine of the zenith angle
19911991
* `real`: units = fraction
1992-
* `nir_albedo_weak_cosz`: Nir albedo weak cosz
1992+
* `nir_albedo_weak_cosz`: albedo for near-infrared radiation with weak dependence on cosine of the zenith angle
19931993
* `real`: units = fraction
1994-
* `vis_albedo_strong_cosz`: Vis albedo strong cosz
1994+
* `vis_albedo_strong_cosz`: albedo for visible radiation with strong dependence on cosine of the zenith angle
19951995
* `real`: units = fraction
1996-
* `vis_albedo_weak_cosz`: Vis albedo weak cosz
1996+
* `vis_albedo_weak_cosz`: albedo for visible radiation with weak dependence on cosine of the zenith angle
19971997
* `real`: units = fraction
19981998
* `min_vegetation_area_fraction`: Min vegetation area fraction
19991999
* `real`: units = fraction
@@ -2292,7 +2292,7 @@ Variables related to the compute environment
22922292
* `real`: units = Pa
22932293
* `temperature_at_2m_for_coupling`: Temperature at 2m for coupling
22942294
* `real`: units = K
2295-
* `tendency_of_water_vapor_mixing_ratio_wrt_moist_air_due_to_moist_convection_for_coupling`: Tendency of water vapor mixing ratio wrt moist air due to moist convection for coupling
2295+
* `tendency_of_water_vapor_mixing_ratio_wrt_moist_air_due_to_moist_convection_for_coupling`: Tendency of specific humidity (water vapor mass mixing ratio with respect to moist air) due to moist convection used for coupling
22962296
* `real`: units = kg kg-1 s-1
22972297
* `x_wind_at_10m_for_coupling`: X wind at 10m for coupling
22982298
* `real`: units = m s-1
@@ -2438,15 +2438,15 @@ Variables related to the compute environment
24382438
* `cosine_of_solar_zenith_angle_on_radiation_timestep`: Cosine of solar zenith angle on radiation timestep
24392439
* `real`: units = 1
24402440
* `surface_lw_fluxes_assuming_total_and_clear_sky_on_radiation_timestep`: Surface lw fluxes assuming total and clear sky on radiation timestep
2441-
* `sfcflw_type`: units = W m-2
2441+
* `ddt`: units = W m-2
24422442
* `diffuse_shortwave_albedo_on_radiation_timestep`: surface albedo for diffuse shortwave radiation on the timestep for radiation physics
24432443
* `real`: units = fraction
24442444
* `surface_longwave_emissivity`: Surface longwave emissivity
24452445
* `real`: units = fraction
24462446
* `air_temperature_at_surface_adjacent_layer_on_radiation_timestep`: Air temperature at surface adjacent layer on radiation timestep
24472447
* `real`: units = K
24482448
* `surface_sw_fluxes_assuming_total_and_clear_sky_on_radiation_timestep`: Surface sw fluxes assuming total and clear sky on radiation timestep
2449-
* `sfcfsw_type`: units = W m-2
2449+
* `ddt`: units = W m-2
24502450
* `tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep`: Tendency of air temperature due to longwave heating assuming clear sky on radiation timestep
24512451
* `real`: units = K s-1
24522452
* `tendency_of_air_temperature_due_to_integrated_dynamics_through_earths_atmosphere`: Tendency of air temperature due to integrated dynamics through earths atmosphere

Metadata-standard-names.yaml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ section:
752752
units: J kg-1 K-1
753753
- name: physics_state_due_to_dynamics
754754
description: Physics state due to dynamics
755-
type: physics_state
755+
type: ddt
756756
kind: null
757757
units: none
758758
- name: timestep_for_physics
@@ -762,7 +762,7 @@ section:
762762
units: s
763763
- name: total_tendency_of_physics
764764
description: Total tendency of physics
765-
type: physics_tend
765+
type: ddt
766766
kind: null
767767
units: none
768768
- name: air_pressure_at_top_of_atmosphere_model
@@ -1953,7 +1953,7 @@ section:
19531953
units: none
19541954
- name: ccpp_constituent_properties
19551955
description: CCPP Constituent Properties
1956-
type: ccpp_constituent_prop_ptr_t
1956+
type: ddt
19571957
kind: null
19581958
units: none
19591959
- name: ccpp_constituents
@@ -4975,7 +4975,8 @@ section:
49754975
kind: null
49764976
units: K
49774977
- name: upward_flux_of_water_vapor_mixing_ratio_wrt_moist_air_at_surface
4978-
description: Upward flux of water vapor mixing ratio wrt moist air at surface
4978+
description: Upward specific humidity (water vapor mass mixing ratio with respect
4979+
to moist air) flux at surface
49794980
type: real
49804981
kind: null
49814982
units: kg kg-1 m s-1
@@ -5059,17 +5060,20 @@ section:
50595060
kind: null
50605061
units: fraction
50615062
- name: nir_albedo_weak_cosz
5062-
description: Nir albedo weak cosz
5063+
description: albedo for near-infrared radiation with weak dependence on cosine
5064+
of the zenith angle
50635065
type: real
50645066
kind: null
50655067
units: fraction
50665068
- name: vis_albedo_strong_cosz
5067-
description: Vis albedo strong cosz
5069+
description: albedo for visible radiation with strong dependence on cosine of
5070+
the zenith angle
50685071
type: real
50695072
kind: null
50705073
units: fraction
50715074
- name: vis_albedo_weak_cosz
5072-
description: Vis albedo weak cosz
5075+
description: albedo for visible radiation with weak dependence on cosine of the
5076+
zenith angle
50735077
type: real
50745078
kind: null
50755079
units: fraction
@@ -5855,8 +5859,8 @@ section:
58555859
kind: null
58565860
units: K
58575861
- name: tendency_of_water_vapor_mixing_ratio_wrt_moist_air_due_to_moist_convection_for_coupling
5858-
description: Tendency of water vapor mixing ratio wrt moist air due to moist convection
5859-
for coupling
5862+
description: Tendency of specific humidity (water vapor mass mixing ratio with
5863+
respect to moist air) due to moist convection used for coupling
58605864
type: real
58615865
kind: null
58625866
units: kg kg-1 s-1
@@ -6247,7 +6251,7 @@ section:
62476251
units: 1
62486252
- name: surface_lw_fluxes_assuming_total_and_clear_sky_on_radiation_timestep
62496253
description: Surface lw fluxes assuming total and clear sky on radiation timestep
6250-
type: sfcflw_type
6254+
type: ddt
62516255
kind: null
62526256
units: W m-2
62536257
- name: diffuse_shortwave_albedo_on_radiation_timestep
@@ -6268,7 +6272,7 @@ section:
62686272
units: K
62696273
- name: surface_sw_fluxes_assuming_total_and_clear_sky_on_radiation_timestep
62706274
description: Surface sw fluxes assuming total and clear sky on radiation timestep
6271-
type: sfcfsw_type
6275+
type: ddt
62726276
kind: null
62736277
units: W m-2
62746278
- name: tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep

standard_names.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -640,13 +640,13 @@
640640
<type units="J kg-1 K-1">real</type>
641641
</standard_name>
642642
<standard_name name="physics_state_due_to_dynamics">
643-
<type units="none">physics_state</type>
643+
<type units="none">ddt</type>
644644
</standard_name>
645645
<standard_name name="timestep_for_physics">
646646
<type units="s">integer</type>
647647
</standard_name>
648648
<standard_name name="total_tendency_of_physics">
649-
<type units="none">physics_tend</type>
649+
<type units="none">ddt</type>
650650
</standard_name>
651651
<standard_name name="air_pressure_at_top_of_atmosphere_model">
652652
<type units="Pa">real</type>
@@ -1509,7 +1509,7 @@
15091509
</standard_name>
15101510
<standard_name name="ccpp_constituent_properties"
15111511
description="CCPP Constituent Properties">
1512-
<type units="none">ccpp_constituent_prop_ptr_t</type>
1512+
<type units="none">ddt</type>
15131513
</standard_name>
15141514
<standard_name name="ccpp_constituents"
15151515
description="Array of constituents managed by CCPP Framework">
@@ -2042,7 +2042,6 @@
20422042
</standard_name>
20432043
<standard_name name="do_nsstm_analysis_in_gcycle"
20442044
description="Do GFS near-surface sea temperature scheme analysis in gcycle">
2045-
GFS near-surface sea temperature scheme
20462045
<type units="flag">logical</type>
20472046
</standard_name>
20482047
<standard_name name="control_for_nsstm"
@@ -3397,7 +3396,7 @@ GFS near-surface sea temperature scheme
33973396
<standard_name name="temperature_in_ice_layer">
33983397
<type units="K">real</type>
33993398
</standard_name>
3400-
<standard_name name="upward_flux_of_water_vapor_mixing_ratio_wrt_moist_air_at_surface">
3399+
<standard_name name="upward_flux_of_water_vapor_mixing_ratio_wrt_moist_air_at_surface"
34013400
description="Upward specific humidity (water vapor mass mixing ratio with respect to moist air) flux at surface">
34023401
<type units="kg kg-1 m s-1">real</type>
34033402
</standard_name>
@@ -3452,15 +3451,15 @@ GFS near-surface sea temperature scheme
34523451
description="albedo for near-infrared radiation with strong dependence on cosine of the zenith angle">
34533452
<type units="fraction">real</type>
34543453
</standard_name>
3455-
<standard_name name="nir_albedo_weak_cosz">
3454+
<standard_name name="nir_albedo_weak_cosz"
34563455
description="albedo for near-infrared radiation with weak dependence on cosine of the zenith angle">
34573456
<type units="fraction">real</type>
34583457
</standard_name>
3459-
<standard_name name="vis_albedo_strong_cosz">
3458+
<standard_name name="vis_albedo_strong_cosz"
34603459
description="albedo for visible radiation with strong dependence on cosine of the zenith angle">
34613460
<type units="fraction">real</type>
34623461
</standard_name>
3463-
<standard_name name="vis_albedo_weak_cosz">
3462+
<standard_name name="vis_albedo_weak_cosz"
34643463
description="albedo for visible radiation with weak dependence on cosine of the zenith angle">
34653464
<type units="fraction">real</type>
34663465
</standard_name>
@@ -3970,7 +3969,7 @@ GFS near-surface sea temperature scheme
39703969
<standard_name name="temperature_at_2m_for_coupling">
39713970
<type units="K">real</type>
39723971
</standard_name>
3973-
<standard_name name="tendency_of_water_vapor_mixing_ratio_wrt_moist_air_due_to_moist_convection_for_coupling">
3972+
<standard_name name="tendency_of_water_vapor_mixing_ratio_wrt_moist_air_due_to_moist_convection_for_coupling"
39743973
description="Tendency of specific humidity (water vapor mass mixing ratio with respect to moist air) due to moist convection used for coupling">
39753974
<type units="kg kg-1 s-1">real</type>
39763975
</standard_name>
@@ -4225,7 +4224,7 @@ GFS near-surface sea temperature scheme
42254224
<type units="1">real</type>
42264225
</standard_name>
42274226
<standard_name name="surface_lw_fluxes_assuming_total_and_clear_sky_on_radiation_timestep">
4228-
<type units="W m-2">sfcflw_type</type>
4227+
<type units="W m-2">ddt</type>
42294228
</standard_name>
42304229
<standard_name name="diffuse_shortwave_albedo_on_radiation_timestep"
42314230
description="surface albedo for diffuse shortwave radiation on the timestep for radiation physics">
@@ -4238,7 +4237,7 @@ GFS near-surface sea temperature scheme
42384237
<type units="K">real</type>
42394238
</standard_name>
42404239
<standard_name name="surface_sw_fluxes_assuming_total_and_clear_sky_on_radiation_timestep">
4241-
<type units="W m-2">sfcfsw_type</type>
4240+
<type units="W m-2">ddt</type>
42424241
</standard_name>
42434242
<standard_name name="tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep">
42444243
<type units="K s-1">real</type>

0 commit comments

Comments
 (0)