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.

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

add ocean version to tile file header info #860

Merged
merged 4 commits into from
Nov 30, 2023

Conversation

biljanaorescanin
Copy link
Contributor

@biljanaorescanin biljanaorescanin commented Nov 29, 2023

In one of the previous merges, PR #695, we also changed the tile header information to update the ocean grid name.
To minimize confusion and help people better understand tile files and what they see in boundary conditions, we are adding an ocean version descriptor to coupled tile file header info. This tile header change is not a bug; users can run experiments and use these new sets of boundary conditions by adjusting the AGCM.rc file; this PR is to make it cleaner and easier to understand; with this change, it is easier for MAPL and AGCM.rc to recognize coupled grid based on tile header information.

In legacy, how it used to be: (MOM6/CF0090x6C_TM0540xTM0458/CF0090x6C_TM0540xTM0458-Pfafstetter.til)

841477 291284 43200 21600
2
PE90x540-CF
90
540
PE540x458-TM
540
458

Now on develop (Nov 2023):
( NL3/geometry/CF0090x6C_M6TP0540x0458/CF0090x6C_M6TP0540x0458-Pfafstetter.til )

841477 291284 43200 21600
2
PE90x540-CF
90
540
PE540x458-
540
458

With this PR :

841477 291284 43200 21600
2
PE90x540-CF
90
540
PE540x458-M6TP
540
458

Changes for this PR are zero diff trivial since all changes are within the boundary conditions package (we are just adding info to the header of the coupled tile file as seen in the example above)

Boundary conditions in bcs_shared area created with these new ocean names will be updated to match information package will produce in tile file. @mathomp4 @gmao-rreichle

@biljanaorescanin biljanaorescanin added the 0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) label Nov 29, 2023
@gmao-rreichle
Copy link
Contributor

@biljanaorescanin: This looks like a bug fix to me. It looks like #695 inadvertently omitted the trailing string ("TM") in the ocean grid descriptor, or else the dash would have also been removed. I suppose it is true that bcs generated with this bug can still be used by adjusting AGCM.rc, but it may be better to recreate (or manually fix) the coupled model bcs once the present PR has been approved and merged.
Having said that, the ocean grid descriptor (e.g., "PE540x458-M6TP") in the til file header seems inconsistent with the corresponding string in the til file name ("M6TP0540x0458"). Is this something that also needs to be addressed? Although this inconsistency seems to also be present for atm grid strings, and making this consistent would presumably be much more far-reaching. Oh well.

@biljanaorescanin
Copy link
Contributor Author

All looks good now in tile file.
@mathomp4 after we merge this PR I will edit files on bcs_shared.

@biljanaorescanin biljanaorescanin marked this pull request as ready for review November 30, 2023 19:53
@biljanaorescanin biljanaorescanin requested a review from a team as a code owner November 30, 2023 19:53
@mathomp4 mathomp4 merged commit a08a760 into develop Nov 30, 2023
3 checks passed
@mathomp4 mathomp4 deleted the feature/borescan_edit_tile_name branch November 30, 2023 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants