Fix portability issue in parse_macros function used by the MPAS registry#1229
Merged
mgduda merged 1 commit intoMPAS-Dev:hotfix-v8.2.2from Sep 13, 2024
Merged
Conversation
The parse_macros function that is used by the MPAS registry 'parse' tool previously made use of the state/saveptr/lasts argument to strtok_r when parsing command-line macro definitions. This was not portable and resulted in incorrectly generated output on some systems. This commit reworks the parse_macros function so that it no longer uses the state/saveptr/lasts argument to strtok_r and instead relies only on the return value of strtok_r to provide portability across systems with different strtok_r implementations.
mgduda
force-pushed
the
framework/strtok_portability_fix
branch
from
0331cfd to
b74756f
Compare
mgduda
added a commit
that referenced
this pull request
Sep 20, 2024
This merge addresses several issues in the MPAS-Atmosphere model and in the MPAS infrastructure. Specific changes in this merge include: * Fix to a portability issue in the MPAS registry 'parse' tool, which caused files in the src/core_<CORE>/inc directory to not be generated correctly at build time on some systems (PR #1229). * Addition of two fields, brtemp and cldmask, that are needed by MPAS-JEDI. Although not needed by stand-alone MPAS-Atmosphere, these fields are associated with the 'jedi_da' package and therefore have no effect when MPAS-Atmosphere is run without setting config_jedi_da = true (PR #1232). * Removal of a redundant query of the nCellsSolve dimension in the physics_run_init routine. The extra query had no impact on results, and its removal can be considered clean-up (PR #1236).
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
2 participants
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 PR fixes a portability issue in the
parse_macrosfunction used by the MPAS registry.The
parse_macrosfunction that is used by the MPAS registryparsetool previously made use of the state/saveptr/lasts argument tostrtok_rwhen parsing command-line macro definitions. This was not portable and resulted in incorrectly generated output on some systems.This PR reworks the
parse_macrosfunction so that it no longer uses the state/saveptr/lasts argument tostrtok_rand instead relies only on the return value ofstrtok_rto provide portability across systems with differentstrtok_rimplementations.