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

Update global ocean init mode for meshes with ice-shelf cavities #6375

Merged
merged 8 commits into from
Jun 25, 2024
Merged

Update global ocean init mode for meshes with ice-shelf cavities #6375

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11ae9ce
Disable reading land-ice topography from lat-lon file
xylar Apr 6, 2024
e8363b8
Read topo variable landIcePressureObserved
xylar Apr 6, 2024
46fcffe
Use land-ice topography from file
xylar Apr 6, 2024
f372331
Compute density in global ocean init mode
xylar Apr 8, 2024
0569e25
Don't set ssh from landIceDraft in global ocean init
xylar Apr 8, 2024
2389f6f
Rename modifyLandIcePressureMask to sshAdjustmentMask
xylar Apr 14, 2024
e0c0c07
Leave the landIce(Floating)Fraction unmasked
xylar Jun 10, 2024
266c9d6
Use sshAdjustmentMask instead of landIceMask for rx1 smoothing mask
xylar Jun 11, 2024
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/Registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2934,8 +2934,8 @@
<var name="pressure" type="real" dimensions="nVertLevels nCells Time" units="N m^-2"
description="pressure used in the momentum equation"
/>
<var name="modifyLandIcePressureMask" type="integer" dimensions="nCells Time"
description="A mask indicating where landIcePressure can be modified during iterative init. The mask is 1 under (and perhaps near) ice shelves and 0 elsewhere."
<var name="sshAdjustmentMask" type="integer" dimensions="nCells Time"
description="A mask indicating where ssh or landIcePressure can be modified during iterative init. The mask is 1 under (and perhaps near) ice shelves and 0 elsewhere."
packages="initMode"
/>
<var name="normalTransportVelocity" type="real" dimensions="nVertLevels nEdges Time" units="m s^-1"
Expand Down
49 changes: 6 additions & 43 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, and optionally oceanFracObserved, landIceDraftObserved, landIceThkObserved, landIceFracObserved, and landIceGroundedFracObserved"
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 landIceFloatingFracObserved"
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 @@ -199,46 +199,6 @@
description="Logical flag that controls if sea surface pressure and layer thicknesses should be altered by an overlying ice sheet/shelf."
possible_values=".true. or .false."
/>
<nml_option name="config_global_ocean_land_ice_topo_file" type="character" default_value="none" units="unitless"
description="Path to the land ice topography initial condition file."
possible_values="path/to/land_ice_topography/file.nc"
/>
<nml_option name="config_global_ocean_land_ice_topo_nlat_dimname" type="character" default_value="none" units="unitless"
description="Dimension name for the latitude in the land ice topography file."
possible_values="Dimension name from input file."
/>
<nml_option name="config_global_ocean_land_ice_topo_nlon_dimname" type="character" default_value="none" units="unitless"
description="Dimension name for the longitude in the land ice topography file."
possible_values="Dimension name from input file."
/>
<nml_option name="config_global_ocean_land_ice_topo_latlon_degrees" type="logical" default_value=".true." units="unitless"
description="Logical flag that controls if the Lat/Lon fields for land ice topography should be converted to radians. True means input is degrees, false means input is radians."
possible_values=".true. or .false."
/>
<nml_option name="config_global_ocean_land_ice_topo_lat_varname" type="character" default_value="none" units="unitless"
description="Variable name for the latitude in the land ice topography file."
possible_values="Variable name from input file."
/>
<nml_option name="config_global_ocean_land_ice_topo_lon_varname" type="character" default_value="none" units="unitless"
description="Variable name for the longitude in the land ice topography file."
possible_values="Variable name from input file."
/>
<nml_option name="config_global_ocean_land_ice_topo_thickness_varname" type="character" default_value="none" units="unitless"
description="Variable name for the land ice thickness in the land ice topography file."
possible_values="Variable name from input file."
/>
<nml_option name="config_global_ocean_land_ice_topo_draft_varname" type="character" default_value="none" units="unitless"
description="Variable name for the land ice draft in the land ice topography file."
possible_values="Variable name from input file."
/>
<nml_option name="config_global_ocean_land_ice_topo_ice_frac_varname" type="character" default_value="none" units="unitless"
description="Variable name for the land ice fraction in the land ice topography file."
possible_values="Variable name from input file."
/>
<nml_option name="config_global_ocean_land_ice_topo_grounded_frac_varname" type="character" default_value="none" units="unitless"
description="Variable name for the grounded land ice fraction in the land ice topography file."
possible_values="Variable name from input file."
/>
<nml_option name="config_global_ocean_use_constant_land_ice_cavity_temperature" type="logical" default_value=".false." units="unitless"
description="Logical flag that controls if ocean temperature in land-ice cavities is set to a constant temperature."
possible_values=".true. or .false."
Expand Down Expand Up @@ -397,14 +357,17 @@
<var name="landIceDraftObserved" type="real" dimensions="nCells" units="m"
description="z-coordinate of land ice bottom, read in from data file"
/>
<var name="landIcePressureObserved" type="real" dimensions="nCells" units="m"
description="Pressure of land ice on the ocean surface, read in from data file"
/>
<var name="landIceThkObserved" type="real" dimensions="nCells" units="m"
description="Thickness of land ice, read in from data file"
/>
<var name="landIceFracObserved" type="real" dimensions="nCells" units="unitless"
description="Fraction of land ice, read in from data file"
/>
<var name="landIceGroundedFracObserved" type="real" dimensions="nCells" units="unitless"
description="Fraction of grounded land ice, read in from data file"
<var name="landIceFloatingFracObserved" type="real" dimensions="nCells" units="unitless"
description="Fraction of floating land ice, read in from data file"
/>
</var_struct>
<var_struct name="criticalPassages" time_levs="1" mode="init" packages="criticalPassages">
Expand Down
Loading