Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion geometric_features/aggregation/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from geometric_features.aggregation.ocean import basins, subbasins, \
antarctic, ice_shelves, ismip6, arctic as arctic_ocean, transport
antarctic, ice_shelves, ismip6, arctic as arctic_ocean, transport, \
moc
from geometric_features.aggregation.seaice import arctic as arctic_seaice


Expand Down Expand Up @@ -52,6 +53,9 @@ def get_aggregator_by_name(region_group):
'ISMIP6 Regions': {'prefix': 'ismip6Regions',
'date': '20210201',
'function': ismip6},
'MOC Basins': {'prefix': 'mocBasins',
'date': '20210331',
Comment on lines +56 to +57
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mask files without the southern transects will be named <mesh>_mocBasins20210331.nc. Then, the ones with the southern transect (calculated via MPAS-Tools) will be <mesh>_mocBasinsAndTransects20210331.nc. Does that seem right?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we need both? just _mocBasinsAndTransects would be enough in my view, since these masks are only used in the MOC and MHT am's?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a practical consideration, at the moment I don't have a good way of checking if <mesh>_mocBasinsAndTransects20210331.nc and not creating <mesh>_mocBasins20210331.nc if it does. I'll have to think about how to do this without making things unnecessarily complicated.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never mind, that's quite easy to handle.

'function': moc},
'Transport Transects': {'prefix': 'transportTransects',
'date': '20200621',
'function': transport}}
Expand Down