enhance a2o control and river map handling - #13
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request adds support for generating land↔river coupling maps (in addition to existing ocean and land maps), introduces per-component configuration for the direction of the
--a2oswitch to ensure correct grid ordering, and allows specifying remap algorithms per component. It also updates documentation and tests to reflect these new features.Major new features and improvements:
1. Land↔River Coupling Map Generation
create_maps_roffunction to generate river coupling maps between land and river grids, only whengrid.rof_fileis set. The river grid is now paired with the land grid, matching the actual coupling, and the logic ensures only one grid entry generates these maps. [1] [2] [3] [4]2. Per-Component --a2o Direction Control
grid.ocn_flip_a2o_direction,grid.lnd_flip_a2o_direction, andgrid.rof_flip_a2o_directionsettings inproject.yamland code, allowing each component to control which direction gets the--a2oswitch. This prevents errors in TempestRemap due to incorrect grid ordering, especially for cases where the component grid is coarser than its reference grid. [1] [2] [3] [4] [5] [6]3. Per-Component Remap Algorithm Selection
maps.algorithms.rof: [traave]), with sensible defaults (only conservative for river maps). This enables more flexible and concise configuration. [1] [2] [3]Documentation and Testing:
4. Documentation Updates
taos/maps.pyto document the new river map logic, per-component--a2ocontrol, and algorithm selection. [1] [2] [3]5. Expanded Unit Tests
_resolve_algorithmsand_resolve_flip_a2ohelpers, as well as for the new river map logic and--a2odirection switching. [1] [2] [3]