Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MPAS-Ocean standalone] Allow land-ice topo to come from MPAS variables #5553

Merged
merged 3 commits into from
Mar 30, 2023
Merged

[MPAS-Ocean standalone] Allow land-ice topo to come from MPAS variables #5553

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
980407d
Remove trailing whitespace
xylar Mar 22, 2023
b540d3d
Allow land-ice topo to come from MPAS variables
xylar Mar 22, 2023
f396fb9
Add error message with unexpected topo source
xylar Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/mpas-ocean/src/mode_init/Registry_global_ocean.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
possible_values="Any real positive number."
/>
<nml_option name="config_global_ocean_topography_source" type="character" default_value="latlon_file" units="unitless"
description="If 'latlon_file', reads in topography from file specified in config_global_ocean_topography_file. If 'mpas_variable', reads in topography from mpas variable bed_elevation"
description="If 'latlon_file', reads in topography from file specified in config_global_ocean_topography_file. If 'mpas_variable', reads in topography from mpas variable bed_elevation, and optionally oceanFracObserved, landIceDraftObserved, landIceThkObserved, landIceFracObserved, and landIceGroundedFracObserved"
possible_values="'latlon_file' or 'mpas_variable'"
/>
<nml_option name="config_global_ocean_topography_file" type="character" default_value="none" units="unitless"
Expand Down Expand Up @@ -168,7 +168,7 @@
possible_values="Variable name from input file."
/>
<nml_option name="config_global_ocean_topography_has_ocean_frac" type="logical" default_value=".false." units="unitless"
description="Logical flag that controls if topograhy file contains a field for the fraction of each cell that contains ocean (vs. land or grounded ice)."
description="Logical flag that controls if topography file contains a field for the fraction of each cell that contains ocean (vs. land or grounded ice)."
possible_values=".true. or .false."
/>
<nml_option name="config_global_ocean_topography_ocean_frac_varname" type="character" default_value="none" units="unitless"
Expand Down
Loading