Skip to content

Commit

Permalink
Committing clang-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Nov 27, 2024
1 parent 627f3a1 commit cecd4ed
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 20 deletions.
1 change: 1 addition & 0 deletions packages/seacas/applications/exodiff/ED_SystemInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ class SystemInterface
bool fb_var_do_all_flag{false};

bool has_change_sets{false};

private:
void enroll_options();
GetLongOption options_{}; //!< Options parsing
Expand Down
40 changes: 22 additions & 18 deletions packages/seacas/applications/exodiff/create_file.C
Original file line number Diff line number Diff line change
Expand Up @@ -400,30 +400,34 @@ namespace {
if (!interFace.quiet_flag) {
std::ostringstream diff;
fmt::print(diff,
"exodiff: DIFFERENCE .. The {} variable \"{}\" is in the first file, but not the second file.\n",
"exodiff: DIFFERENCE .. The {} variable \"{}\" is in the first file, but "
"not the second file.\n",
type, name);
DIFF_OUT(diff);
}
}
}
else {
// Variable is in `names`, but not in `var_names1`. This is a difference unless the file has changesets
// in which case the variable might exist in a different change set. In this case, we check that if the
// variable does not exist in in either `var_names1` or `var_names2` and there are change sets, there is no diff.
if (interFace.has_change_sets && (interFace.summary_flag || find_string(var_names2, name, interFace.nocase_var_names) < 0)) {
// OK that variable not found in file1 and file2
}
else {
*diff_found = true;
if (!interFace.quiet_flag) {
std::ostringstream diff;
fmt::print(
diff,
"exodiff: DIFFERENCE .. Specified {} variable \"{}\" is not in the first file.\n",
type, name);
DIFF_OUT(diff);
}
}
// Variable is in `names`, but not in `var_names1`. This is a difference unless the file
// has changesets in which case the variable might exist in a different change set. In this
// case, we check that if the variable does not exist in in either `var_names1` or
// `var_names2` and there are change sets, there is no diff.
if (interFace.has_change_sets &&
(interFace.summary_flag ||
find_string(var_names2, name, interFace.nocase_var_names) < 0)) {
// OK that variable not found in file1 and file2
}
else {
*diff_found = true;
if (!interFace.quiet_flag) {
std::ostringstream diff;
fmt::print(
diff,
"exodiff: DIFFERENCE .. Specified {} variable \"{}\" is not in the first file.\n",
type, name);
DIFF_OUT(diff);
}
}
}
}
names = tmp_list;
Expand Down
4 changes: 2 additions & 2 deletions packages/seacas/applications/exodiff/exodiff.C
Original file line number Diff line number Diff line change
Expand Up @@ -516,9 +516,9 @@ namespace {
auto [cs1, cs2] = create_change_set_list(file1, file2, interFace.change_sets);
SMART_ASSERT(cs1.size() == cs2.size());

bool has_change_sets = !cs1.empty() && (interFace.summary_flag || !cs2.empty());
bool has_change_sets = !cs1.empty() && (interFace.summary_flag || !cs2.empty());
interFace.has_change_sets = has_change_sets;
bool diff_flag = false;
bool diff_flag = false;

if (has_change_sets) {
for (size_t i = 0; i < cs1.size(); i++) {
Expand Down

0 comments on commit cecd4ed

Please sign in to comment.