Index: /cf-standard-names/trunk/src/cf-standard-name-table.xml
===================================================================
--- /cf-standard-names/trunk/src/cf-standard-name-table.xml (revision 61)
+++ /cf-standard-names/trunk/src/cf-standard-name-table.xml (revision 62)
@@ -1236,4 +1236,8 @@
     <description>Mass fraction is used in the construction mass_fraction_of_X_in_Y, where X is a material constituent of Y. It means the ratio of the mass of X to the mass of Y (including X).</description>
   </entry>
+  <entry id="mass_fraction_of_convective_cloud_condensed_water_in_air">
+    <canonical_units>1</canonical_units>
+    <description>&quot;condensed_water&quot; means liquid and ice. Mass fraction is used in the construction mass_fraction_of_X_in_Y, where X is a material constituent of Y. It means the ratio of the mass of X to the mass of Y (including X).</description>
+  </entry>
   <entry id="mass_fraction_of_convective_cloud_ice_in_air">
     <canonical_units>1</canonical_units>
@@ -1243,8 +1247,4 @@
     <canonical_units>1</canonical_units>
     <description>Mass fraction is used in the construction mass_fraction_of_X_in_Y, where X is a material constituent of Y. It means the ratio of the mass of X to the mass of Y (including X). Convective cloud is that produced by the convection schemes in an atmosphere model.</description>
-  </entry>
-  <entry id="mass_fraction_of_convective_cloud_condensed_water_in_air">
-    <canonical_units>1</canonical_units>
-    <description>&quot;condensed_water&quot; means liquid and ice. Mass fraction is used in the construction mass_fraction_of_X_in_Y, where X is a material constituent of Y. It means the ratio of the mass of X to the mass of Y (including X).</description>
   </entry>
   <entry id="mass_fraction_of_dimethyl_sulfide_in_air">
@@ -2405,8 +2405,4 @@
     <canonical_units>m2 s rad-1</canonical_units>
     <description>Sea surface wave directional variance spectral density is the variance of the amplitude of the waves within given ranges of direction and wave frequency.</description>
-  </entry>
-  <entry id="wave_frequency">
-    <canonical_units>s-1</canonical_units>
-    <description>Frequency is the number of oscillations of a wave per unit time.</description>
   </entry>
   <entry id="sea_surface_wave_from_direction">
@@ -2939,12 +2935,4 @@
     <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere.</description>
   </entry>
-  <entry id="surface_geostrophic_eastward_sea_water_velocity">
-    <canonical_units>m s-1</canonical_units>
-    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Eastward&quot; indicates a vector component which is positive when directed eastward (negative westward). &quot;Geostrophic&quot; indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. surface_geostrophic_eastward_sea_water_velocity is the sum of a variable part, surface_geostrophic_eastward_sea_water_velocity_assuming_sea_level_for_geoid, and a constant part due to the stationary component of ocean circulation.</description>
-  </entry>
-  <entry id="surface_geostrophic_eastward_sea_water_velocity_assuming_sea_level_for_geoid">
-    <canonical_units>m s-1</canonical_units>
-    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Eastward&quot; indicates a vector component which is positive when directed eastward (negative westward). "Geostrophic" indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. &quot;sea_level&quot; means mean sea level. The geoid is a surface of constant geopotential with which mean sea level would coincide if the ocean were at rest. surface_geostrophic_eastward_sea_water_velocity_assuming_sea_level_for_geoid is the variable part of surface_geostrophic_eastward_sea_water_velocity. The assumption that sea level is equal to the geoid means that the stationary component of ocean circulation is equal to zero.</description>
-  </entry>
   <entry id="surface_eastward_sea_water_velocity">
     <canonical_units>m s-1</canonical_units>
@@ -2955,4 +2943,20 @@
     <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. Geopotential is the sum of the specific gravitational potential energy relative to the geoid and the specific centripetal potential energy.</description>
   </entry>
+  <entry id="surface_geostrophic_eastward_sea_water_velocity">
+    <canonical_units>m s-1</canonical_units>
+    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Eastward&quot; indicates a vector component which is positive when directed eastward (negative westward). &quot;Geostrophic&quot; indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. surface_geostrophic_eastward_sea_water_velocity is the sum of a variable part, surface_geostrophic_eastward_sea_water_velocity_assuming_sea_level_for_geoid, and a constant part due to the stationary component of ocean circulation.</description>
+  </entry>
+  <entry id="surface_geostrophic_eastward_sea_water_velocity_assuming_sea_level_for_geoid">
+    <canonical_units>m s-1</canonical_units>
+    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Eastward&quot; indicates a vector component which is positive when directed eastward (negative westward). "Geostrophic" indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. &quot;sea_level&quot; means mean sea level. The geoid is a surface of constant geopotential with which mean sea level would coincide if the ocean were at rest. surface_geostrophic_eastward_sea_water_velocity_assuming_sea_level_for_geoid is the variable part of surface_geostrophic_eastward_sea_water_velocity. The assumption that sea level is equal to the geoid means that the stationary component of ocean circulation is equal to zero.</description>
+  </entry>
+  <entry id="surface_geostrophic_northward_sea_water_velocity">
+    <canonical_units>m s-1</canonical_units>
+    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Northward&quot; indicates a vector component which is positive when directed northward (negative southward). &quot;Geostrophic&quot; indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. surface_geostrophic_northward_sea_water_velocity is the sum of a variable part, surface_geostrophic_northward_sea_water_velocity_assuming_sea_level_for_geoid, and a constant part due to the stationary component of ocean circulation.</description>
+  </entry>
+  <entry id="surface_geostrophic_northward_sea_water_velocity_assuming_sea_level_for_geoid">
+    <canonical_units>m s-1</canonical_units>
+    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Northward&quot; indicates a vector component which is positive when directed northward (negative southward). &quot;Geostrophic&quot; indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. &quot;sea_level&quot; means mean sea level. The geoid is a surface of constant geopotential with which mean sea level would coincide if the ocean were at rest. surface_geostrophic_northward_sea_water_velocity_assuming_sea_level_for_geoid is the variable part of surface_geostrophic_northward_sea_water_velocity. The assumption that sea level is equal to the geoid means that the stationary component of ocean circulation is equal to zero.</description>
+  </entry>
   <entry id="surface_geostrophic_sea_water_x_velocity">
     <canonical_units>m s-1</canonical_units>
@@ -3012,12 +3016,4 @@
     <grib>111 E177</grib>
     <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. &quot;shortwave&quot; means shortwave radiation. &quot;Upward&quot; indicates a vector component which is positive when directed upward (negative downward). Net upward radiation is the difference between radiation from below (upwelling) and radiation from above (downwelling). In accordance with common usage in geophysical disciplines, &quot;flux&quot; implies per unit area, called &quot;flux density&quot; in physics.</description>
-  </entry>
-  <entry id="surface_geostrophic_northward_sea_water_velocity">
-    <canonical_units>m s-1</canonical_units>
-    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Northward&quot; indicates a vector component which is positive when directed northward (negative southward). &quot;Geostrophic&quot; indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. surface_geostrophic_northward_sea_water_velocity is the sum of a variable part, surface_geostrophic_northward_sea_water_velocity_assuming_sea_level_for_geoid, and a constant part due to the stationary component of ocean circulation.</description>
-  </entry>
-  <entry id="surface_geostrophic_northward_sea_water_velocity_assuming_sea_level_for_geoid">
-    <canonical_units>m s-1</canonical_units>
-    <description>The surface called &quot;surface&quot; means the lower boundary of the atmosphere. A velocity is a vector quantity. &quot;Northward&quot; indicates a vector component which is positive when directed northward (negative southward). &quot;Geostrophic&quot; indicates that geostrophic balance is assumed. &quot;Water&quot; means water in all phases. &quot;sea_level&quot; means mean sea level. The geoid is a surface of constant geopotential with which mean sea level would coincide if the ocean were at rest. surface_geostrophic_northward_sea_water_velocity_assuming_sea_level_for_geoid is the variable part of surface_geostrophic_northward_sea_water_velocity. The assumption that sea level is equal to the geoid means that the stationary component of ocean circulation is equal to zero.</description>
   </entry>
   <entry id="surface_northward_sea_water_velocity">
@@ -4378,4 +4374,8 @@
     <description>&quot;Water&quot; means water in all phases. The water flux or volume transport into the ocean from rivers is the inflow to the ocean, often applied to the surface in ocean models.</description>
   </entry>
+  <entry id="wave_frequency">
+    <canonical_units>s-1</canonical_units>
+    <description>Frequency is the number of oscillations of a wave per unit time.</description>
+  </entry>
   <entry id="wet_bulb_temperature">
     <canonical_units>K</canonical_units>