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

Fix masking of ice draft and ice thickness in combine_topo #854

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Fix masking of ice draft and ice thickness in combine_topo #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06f42ec
Fix masking of ice draft and ice thickness in combine_topo
xylar Aug 28, 2024
a06b08e
Bump the datestamp on the topography file
xylar Aug 28, 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
2 changes: 1 addition & 1 deletion 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_2023_0.0125_degree_20240611.nc
topo_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240828.nc

# variable names in topo_filename
lon_var = lon
Expand Down
9 changes: 6 additions & 3 deletions compass/ocean/tests/utility/combine_topo/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,17 @@ def _combine(self):
for field in ['bathymetry', 'ice_draft', 'thickness']:
combined[field].attrs['unit'] = 'meters'

for field in ['ice_mask', 'grounded_mask', 'ocean_mask']:
combined[field] = bedmachine[field]

combined['bathymetry_mask'] = bathy_mask

fill = {'ice_draft': 0., 'thickness': 0., 'ice_mask': 0.,
'grounded_mask': 0., 'ocean_mask': combined.bathymetry_mask}
'grounded_mask': 0., 'ocean_mask': bathy_mask}

for field, fill_val in fill.items():
valid = bedmachine[field].notnull()
combined[field] = bedmachine[field].where(valid, fill_val)
valid = combined[field].notnull()
combined[field] = combined[field].where(valid, fill_val)

combined['water_column'] = \
combined['ice_draft'] - combined['bathymetry']
Expand Down
2 changes: 1 addition & 1 deletion compass/ocean/tests/utility/combine_topo/combine_topo.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ antarctic_filename = BedMachineAntarctica-v3.nc
global_filename = GEBCO_2023.nc

# the name of the output topography file, to be copied to the bathymetry database
cobined_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240611.nc
cobined_filename = BedMachineAntarctica_v3_and_GEBCO_2023_0.0125_degree_20240828.nc

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