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

Jump to bottom

New Mesh: ECwISC30to60E3r1 #666

Closed
wants to merge 4 commits into from
Closed

New Mesh: ECwISC30to60E3r1 #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd6d9b6
Update to GEBCO 2023 topography
xylar Aug 31, 2023
10ef7aa
Update docs
xylar Aug 31, 2023
476d159
Add PR URL for ECwISC30to60E3r1
xylar Aug 15, 2023
b533a8d
Reduce haney number for ECwISC30to60 to 10
xylar Aug 25, 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 compass/ocean/mesh/remap_topography.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[remap_topography]

# the name of the topography file in the bathymetry database
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2022_0.0125_degree_20230315.nc
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20230831.nc

# variable names in topo_filename
lon_var = lon
Expand All @@ -15,7 +15,7 @@ grounded_ice_frac_var = grounded_mask
ocean_frac_var = ocean_mask

# the description to include in metadata
description = Bathymetry is from GEBCO 2022, combined with BedMachine
description = Bathymetry is from GEBCO 2023, combined with BedMachine
Antarctica v3 around Antarctica.

# the target and minimum number of MPI tasks to use in remapping
Expand Down
2 changes: 1 addition & 1 deletion compass/ocean/tests/global_ocean/mesh/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def configure(self, config=None):
if 'remap_topography' in self.steps:
description = config.get('remap_topography', 'description')
else:
description = 'Bathymetry is from GEBCO 2022, combined with ' \
description = 'Bathymetry is from GEBCO 2023, combined with ' \
'BedMachine Antarctica v3 around Antarctica.'

config.set('global_ocean', 'bathy_description', description)
Expand Down
4 changes: 2 additions & 2 deletions compass/ocean/tests/global_ocean/mesh/ec30to60/ec30to60.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ transition_levels = 28
[global_ocean]

# Maximum allowed Haney number for configurations with ice-shelf cavities
rx1_max = 15
rx1_max = 10

# the approximate number of cells in the mesh
approx_cell_count = 240000
Expand All @@ -48,4 +48,4 @@ min_res = 30
# the maximum (coarsest) resolution in the mesh, can be the same as min_res
max_res = 60
# The URL of the pull request documenting the creation of the mesh
pull_request = <<<Missing>>>
pull_request = https://github.com/MPAS-Dev/compass/pull/666
2 changes: 1 addition & 1 deletion compass/ocean/tests/utility/extrap_woa/extrap_woa.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[extrap_woa]

# the name of the topography file in the bathymetry database
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2022_0.0125_degree_20230315.nc
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20230831.nc

# the target and minimum number of MPI tasks to use in remapping
remap_ntasks = 1024
Expand Down
4 changes: 2 additions & 2 deletions docs/developers_guide/organization.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,12 +1542,12 @@ To add an input file from a database, call

self.add_input_file(
filename='topography.nc',
target='BedMachineAntarctica_v2_and_GEBCO_2022_0.05_degree_20220729.nc',
target='BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20230831.nc',
database='bathymetry_database')

In this example from
:py:class:`compass.ocean.tests.global_ocean.init.initial_state.InitialState()`,
the file ``BedMachineAntarctica_v2_and_GEBCO_2022_0.05_degree_20220729.nc`` is
the file ``BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20230831.nc`` is
slated for later downloaded from
`MPAS-Ocean's bathymetry database <https://web.lcrc.anl.gov/public/e3sm/mpas_standalonedata/mpas-ocean/bathymetry_database/>`_.
The file will be stored in the subdirectory ``mpas-ocean/bathymetry_database``
Expand Down
4 changes: 2 additions & 2 deletions docs/users_guide/ocean/framework/mesh.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ controlled by the following config options:
[remap_topography]

# the name of the topography file in the bathymetry database
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2022_0.0125_degree_20230315.nc
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20230831.nc

# variable names in topo_filename
lon_var = lon
Expand All @@ -37,7 +37,7 @@ controlled by the following config options:
ocean_frac_var = ocean_mask

# the description to include in metadata
description = Bathymetry is from GEBCO 2022, combined with BedMachine
description = Bathymetry is from GEBCO 2023, combined with BedMachine
Antarctica v3 around Antarctica.

# the target and minimum number of MPI tasks to use in remapping
Expand Down
Loading