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

Add support for custom critical passages and land blockages #586

Merged
merged 3 commits into from
Aug 18, 2020
Merged

Add support for custom critical passages and land blockages #586

merged 3 commits into from
Aug 18, 2020

Conversation

xylar
Copy link
Collaborator

@xylar xylar commented Jun 2, 2020

This is added to support potential addition of "custom" passages or blockages in #555 and #584. The custom transects could come from a local file or it could be pulled in from geometric_features, e.g. with the merge_features command.

@xylar xylar requested a review from mark-petersen June 2, 2020 10:22
@xylar xylar mentioned this pull request Jun 2, 2020
Merged
@xylar xylar removed the in progress label Jun 2, 2020
@xylar xylar marked this pull request as ready for review June 2, 2020 13:31
@xylar
Copy link
Collaborator Author

xylar commented Jun 2, 2020

Testing

I tested this by adding a transect.geojson file that put a canal through the US. I modified config_culled_mesh.xml in the QU240/init test case to use this new file as a custom critical passage and the result is a mesh with a horrible canal through the US (as expected):

US canal

@xylar xylar requested a review from pwolfram June 2, 2020 13:34
@xylar
Copy link
Collaborator Author

xylar commented Jun 2, 2020

@pwolfram, I simplified the logic of cull_mesh.py a bit to accommodate my changes here. This included a modification to code involving preserving floodplain. I don't anticipate any problems but it wouldn't hurt to have you run a test case of yours that preserves the floodplain using this branch and let me know if you have any trouble.

@xylar xylar force-pushed the ocean/compass_add_local_passages branch from 3244d3c to dbf1fcd Compare June 2, 2020 13:41
xylar
xylar commented Jun 2, 2020
View reviewed changes
testing_and_setup/compass/ocean/global_ocean/scripts/cull_mesh.py Outdated
Comment on lines 58 to 63
help="Whether to to use the cellSeedMask field in the base "
"mesh to preserve a floodplain at elevations above z=0")
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@pwolfram, can you tell me if this is correct? I think it is based on my recent work on inject_preserve_floodpalin.

Copy link
Contributor

Choose a reason for hiding this comment

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

@pwolfram any comment? It is just a help text, so I may merge to get this in.

@xylar xylar mentioned this pull request Jun 4, 2020
Merged
mark-petersen
mark-petersen approved these changes Jun 12, 2020
View reviewed changes
Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Thanks, this looks good by visual inspection, and passes the QU240 init in the nightly regression, bfb with ocean/develop. I did not test it with custom channels, but will take your word for it.

@mark-petersen mark-petersen removed the request for review from pwolfram August 17, 2020 23:05
@mark-petersen mark-petersen force-pushed the ocean/compass_add_local_passages branch from bdd0ea0 to 2261d50 Compare August 17, 2020 23:16
@mark-petersen mark-petersen merged commit dd86f4e into MPAS-Dev:ocean/develop Aug 18, 2020
mark-petersen added a commit that referenced this pull request Aug 18, 2020
@mark-petersen
Merge branch 'ocean/develop' into e3sm/develop
805bba1 
* ocean/develop:
Fix ISOMIP+ viz scripts #642
Add support for custom critical passages and land blockages #586
New Mesh: WC12to60kmL60E3SMv2r01 #555
@mark-petersen mark-petersen mentioned this pull request Aug 18, 2020
Merged
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Aug 18, 2020
@jonbob
Merge branch 'mark-petersen/update_mpas_200817' into next (PR #3776)
72e0ed9 
Update MPAS-Source: COMPASS and Documentation files

This PRi brings in a new mpas-source submdoule with changes only to the ocean
core. It updates files unrelated to the E3SM forward model, including:
* Move load_compass_env.sh to the ocean dir  (MPAS-Dev/MPAS-Model#618);
* Update ISOMIP+ docs, including tutorial for Ocean0 on LANL IC
  (MPAS-Dev/MPAS-Model#653);
* Fix path to docs in Travis CI  (MPAS-Dev/MPAS-Model#644);
* atmosphere core init changes  (MPAS-Dev/MPAS-Model#637);
* New Mesh: WC14to60kmL60E3SMv2r03  (MPAS-Dev/MPAS-Model#628);
* Fix ISOMIP+ viz scripts  (MPAS-Dev/MPAS-Model#642);
* Add support for custom critical passages and land blockages
  (MPAS-Dev/MPAS-Model#586); and
* New Mesh: WC12to60kmL60E3SMv2r01  (MPAS-Dev/MPAS-Model#555)

[BFB]
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Aug 19, 2020
@jonbob
Merge branch 'mark-petersen/update_mpas_200817' (PR #3776)
b84ab6c 
Update MPAS-Source: COMPASS and Documentation files

This PR brings in a new mpas-source submdoule with changes only to the ocean
core. It updates files unrelated to the E3SM forward model, including:
* Move load_compass_env.sh to the ocean dir  (MPAS-Dev/MPAS-Model#618);
* Update ISOMIP+ docs, including tutorial for Ocean0 on LANL IC
  (MPAS-Dev/MPAS-Model#653);
* Fix path to docs in Travis CI  (MPAS-Dev/MPAS-Model#644);
* atmosphere core init changes  (MPAS-Dev/MPAS-Model#637);
* New Mesh: WC14to60kmL60E3SMv2r03  (MPAS-Dev/MPAS-Model#628);
* Fix ISOMIP+ viz scripts  (MPAS-Dev/MPAS-Model#642);
* Add support for custom critical passages and land blockages
  (MPAS-Dev/MPAS-Model#586); and
* New Mesh: WC12to60kmL60E3SMv2r01  (MPAS-Dev/MPAS-Model#555)

[BFB]
@xylar xylar deleted the ocean/compass_add_local_passages branch August 21, 2020 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mark-petersen mark-petersen mark-petersen approved these changes

Assignees

@mark-petersen mark-petersen

Labels
COMPASS Ocean
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@xylar @mark-petersen @matthewhoffman