Skip to content

Commit 3cd4daa

Browse files
mgdudamgduda
committed
Merge branch 'atmosphere/fix_gwdo_descriptions' into hotfix-v7.2 (PR #955)
This merge corrects the units and description attributes for the GWDO fields var2d, con, oa1, oa2, oa3, oa4, ol1, ol2, ol3, and ol4 in both the init_atmosphere and atmosphere core Registry.xml files. * atmosphere/fix_gwdo_descriptions: Correct units and descriptions for GWDO fields var2d, con, oa[1-4], ol[1-4]
2 parents 66f6ae0 + 6065bd4 commit 3cd4daa

2 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎src/core_atmosphere/Registry.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3067,35 +3067,35 @@
30673067
<!-- ... PARAMETERIZATION OF GRAVITY WAVE DRAG OVER OROGRAPHY: -->
30683068
<!-- ================================================================================================== -->
30693069

3070-
<var name="var2d" type="real" dimensions="nCells" units="m^{2}"
3071-
description="variance of orography"/>
3070+
<var name="var2d" type="real" dimensions="nCells" units="m"
3071+
description="standard deviation of subgrid-scale orography"/>
30723072

3073-
<var name="con" type="real" dimensions="nCells" units="m^{2}"
3074-
description="convexity of orography"/>
3073+
<var name="con" type="real" dimensions="nCells" units="unitless"
3074+
description="orographic convexity"/>
30753075

30763076
<var name="oa1" type="real" dimensions="nCells" units="unitless"
3077-
description="directional asymmetry function of orography"/>
3077+
description="asymmetry of subgrid-scale orography for westerly flow"/>
30783078

30793079
<var name="oa2" type="real" dimensions="nCells" units="unitless"
3080-
description="directional asymmetry function of orography"/>
3080+
description="asymmetry of subgrid-scale orography for southerly flow"/>
30813081

30823082
<var name="oa3" type="real" dimensions="nCells" units="unitless"
3083-
description="directional asymmetry function of orography"/>
3083+
description="asymmetry of subgrid-scale orography for south-westerly flow"/>
30843084

30853085
<var name="oa4" type="real" dimensions="nCells" units="unitless"
3086-
description="directional asymmetry function of orography"/>
3086+
description="asymmetry of subgrid-scale orography for north-westerly flow"/>
30873087

30883088
<var name="ol1" type="real" dimensions="nCells" units="unitless"
3089-
description="directional asymmetry function of orography"/>
3089+
description="effective orographic length for westerly flow"/>
30903090

30913091
<var name="ol2" type="real" dimensions="nCells" units="unitless"
3092-
description="directional asymmetry function of orography"/>
3092+
description="effective orographic length for southerly flow"/>
30933093

30943094
<var name="ol3" type="real" dimensions="nCells" units="unitles"
3095-
description="directional asymmetry function of orography"/>
3095+
description="effective orographic length for south-westerly flow"/>
30963096

30973097
<var name="ol4" type="real" dimensions="nCells" units="unitless"
3098-
description="directional asymmetry function of orography"/>
3098+
description="effective orographic length for north-westerly flow"/>
30993099
</var_struct>
31003100

31013101
<var_struct name="tend_iau" time_levs="1" packages="iau">

‎src/core_init_atmosphere/Registry.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245

246246
<nml_option name="config_native_gwd_static" type="logical" default_value="true"
247247
units="-"
248-
description="Whether to recompute sub-grid-scale orography statistics directly on the native MPAS mesh (case 7 only)"
248+
description="Whether to recompute subgrid-scale orography statistics directly on the native MPAS mesh (case 7 only)"
249249
possible_values="true or false"/>
250250

251251
<nml_option name="config_gwd_cell_scaling" type="real" default_value="1.0" in_defaults="false"
@@ -773,35 +773,35 @@
773773
description="Index category for water"/>
774774

775775
<!-- GWDO fields -->
776-
<var name="var2d" type="real" dimensions="nCells" units="m^{2}"
777-
description="variance of orography"/>
776+
<var name="var2d" type="real" dimensions="nCells" units="m"
777+
description="standard deviation of subgrid-scale orography"/>
778778

779-
<var name="con" type="real" dimensions="nCells" units="m^{2}"
780-
description="convexity of orography"/>
779+
<var name="con" type="real" dimensions="nCells" units="unitless"
780+
description="orographic convexity"/>
781781

782782
<var name="oa1" type="real" dimensions="nCells" units="unitless"
783-
description="directional asymmetry function of orography"/>
783+
description="asymmetry of subgrid-scale orography for westerly flow"/>
784784

785785
<var name="oa2" type="real" dimensions="nCells" units="unitless"
786-
description="directional asymmetry function of orography"/>
786+
description="asymmetry of subgrid-scale orography for southerly flow"/>
787787

788788
<var name="oa3" type="real" dimensions="nCells" units="unitless"
789-
description="directional asymmetry function of orography"/>
789+
description="asymmetry of subgrid-scale orography for south-westerly flow"/>
790790

791791
<var name="oa4" type="real" dimensions="nCells" units="unitless"
792-
description="directional asymmetry function of orography"/>
792+
description="asymmetry of subgrid-scale orography for north-westerly flow"/>
793793

794794
<var name="ol1" type="real" dimensions="nCells" units="unitless"
795-
description="directional asymmetry function of orography"/>
795+
description="effective orographic length for westerly flow"/>
796796

797797
<var name="ol2" type="real" dimensions="nCells" units="unitless"
798-
description="directional asymmetry function of orography"/>
798+
description="effective orographic length for southerly flow"/>
799799

800800
<var name="ol3" type="real" dimensions="nCells" units="unitles"
801-
description="directional asymmetry function of orography"/>
801+
description="effective orographic length for south-westerly flow"/>
802802

803803
<var name="ol4" type="real" dimensions="nCells" units="unitless"
804-
description="directional asymmetry function of orography"/>
804+
description="effective orographic length for north-westerly flow"/>
805805

806806
<!-- description of the vertical grid structure -->
807807
<var name="hx" type="real" dimensions="nVertLevelsP1 nCells" units="m"

0 commit comments

Comments
 (0)