Skip to content

Conversation

@bartgol
Copy link
Contributor

@bartgol bartgol commented Sep 4, 2025

Avoids annoying ugly formatting of all EKAT_REQUIRE_MSG macros.

[BFB]


E.g., before this branch, the following code

  EKAT_REQUIRE_MSG (dims.size()==tags.size(),
      "Error! Tags and dims vectors dimensions mismatch.\n"
      "  tags size: " + std::to_string(tags.size()) + "\n"
      "  dims size: " + std::to_string(dims.size()) + "\n");

was formatted as

  EKAT_REQUIRE_MSG(dims.size() == tags.size(), "Error! Tags and dims vectors dimensions mismatch.\n"
                                               "  tags size: " +
                                                   std::to_string(tags.size()) +
                                                   "\n"
                                                   "  dims size: " +
                                                   std::to_string(dims.size()) + "\n");

With these mods (namely, the Macros: ... mod for this setting), it is left untouched, which is for the best.

The other two options avoid multiple empty lines, and excessive indenting in the constructor initializer list (I was getting like 4 spaces, despite the tab size being 2).

@bartgol bartgol requested a review from mjschmidt271 September 4, 2025 21:54
@bartgol bartgol self-assigned this Sep 4, 2025
@bartgol bartgol added BFB PR leaves answers BFB EAMxx C++ based E3SM atmosphere model (aka SCREAM) CI: workflow change approved Allow gh action PR testing on ghci-snl-* machines for PRs that alter a worfklow file labels Sep 4, 2025
@bartgol bartgol force-pushed the bartgol/eamxx/clang-format-options branch from f68b9ab to 7e83e98 Compare September 5, 2025 19:10
Copy link
Contributor

@mjschmidt271 mjschmidt271 left a comment

Choose a reason for hiding this comment

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

Looks good to me!

However, this has revealed a shortcoming of my recently merged changes. Namely, my find command picks up a LOT of suppression (.supp) files.

... will fix shortly

@mjschmidt271
Copy link
Contributor

Ended up just pushing to this branch since it was a tiny fix

bartgol added a commit that referenced this pull request Sep 5, 2025
Avoids annoying ugly formatting of all EKAT_REQUIRE_MSG macros.

[BFB]
@bartgol bartgol merged commit a685cd4 into master Sep 5, 2025
21 of 22 checks passed
@bartgol bartgol deleted the bartgol/eamxx/clang-format-options branch September 5, 2025 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

BFB PR leaves answers BFB CI: workflow change approved Allow gh action PR testing on ghci-snl-* machines for PRs that alter a worfklow file EAMxx C++ based E3SM atmosphere model (aka SCREAM)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants