Skip to content

Commit

Permalink
Build(deps): Bump msys2/setup-msys2 from 2.24.1 to 2.25.0 (#550)
Browse files Browse the repository at this point in the history 
* Build(deps): Bump msys2/setup-msys2 from 2.24.1 to 2.25.0

Bumps [msys2/setup-msys2](https://github.com/msys2/setup-msys2) from 2.24.1 to 2.25.0.
- [Release notes](https://github.com/msys2/setup-msys2/releases)
- [Changelog](https://github.com/msys2/setup-msys2/blob/main/CHANGELOG.md)
- [Commits](msys2/setup-msys2@ddf331a...c52d1fa)

---
updated-dependencies:
- dependency-name: msys2/setup-msys2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Committing clang-format changes

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@dependabot @github-actions
dependabot[bot] and github-actions[bot] authored Nov 18, 2024
1 parent 0b23ae7 commit 4574c5f
Show file tree
Hide file tree
Showing 10 changed files with 90 additions and 95 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/msys2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
egress-policy: audit

- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: msys2/setup-msys2@ddf331adaebd714795f1042345e6ca57bd66cea8 # v2.24.1
- uses: msys2/setup-msys2@c52d1fa9c7492275e60fe763540fb601f5f232a1 # v2.25.0
with:
msystem: MINGW64
update: true
Expand Down
8 changes: 3 additions & 5 deletions packages/seacas/applications/exodiff/ED_SystemInterface.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ namespace {
}

std::string Parse_Variables(std::string xline, std::ifstream &cmd_file, bool &all_flag,
Tolerance &def_tol, NameList &names,
std::vector<Tolerance> &toler);
Tolerance &def_tol, NameList &names, std::vector<Tolerance> &toler);

bool str_equal(const std::string &s1, const std::string &s2)
{
Expand Down Expand Up @@ -490,7 +489,7 @@ void SystemInterface::enroll_options()
options_.enroll("T", GetLongOption::MandatoryValue,
"Backward-compatible option for -TimeStepOffset", nullptr);
options_.enroll("x", GetLongOption::MandatoryValue, "Backward-compatible option for -exclude",
nullptr);
nullptr);
}

bool SystemInterface::parse_options(int argc, char **argv)
Expand Down Expand Up @@ -1375,8 +1374,7 @@ void SystemInterface::Parse_Command_File()

namespace {
std::string Parse_Variables(std::string xline, std::ifstream &cmd_file, bool &all_flag,
Tolerance &def_tol, NameList &names,
std::vector<Tolerance> &toler)
Tolerance &def_tol, NameList &names, std::vector<Tolerance> &toler)
{
toler.clear();
names.clear();
Expand Down
48 changes: 24 additions & 24 deletions packages/seacas/applications/exodiff/ED_SystemInterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,37 +48,37 @@ class SystemInterface

int max_warnings{100};

NameList glob_var_names{};
Tolerance glob_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> glob_var{};
NameList glob_var_names{};
Tolerance glob_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> glob_var{};

NameList node_var_names{};
Tolerance node_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> node_var{};
NameList node_var_names{};
Tolerance node_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> node_var{};

NameList elmt_var_names{};
Tolerance elmt_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> elmt_var{};
NameList elmt_var_names{};
Tolerance elmt_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> elmt_var{};

NameList elmt_att_names{};
Tolerance elmt_att_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> elmt_att{};
NameList elmt_att_names{};
Tolerance elmt_att_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> elmt_att{};

NameList ns_var_names{};
Tolerance ns_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> ns_var{};
NameList ns_var_names{};
Tolerance ns_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> ns_var{};

NameList ss_var_names{};
Tolerance ss_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> ss_var{};
NameList ss_var_names{};
Tolerance ss_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> ss_var{};

NameList eb_var_names{};
Tolerance eb_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> eb_var{};
NameList eb_var_names{};
Tolerance eb_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> eb_var{};

NameList fb_var_names{};
Tolerance fb_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> fb_var{};
NameList fb_var_names{};
Tolerance fb_var_default{ToleranceMode::RELATIVE_, 1.0e-6, 0.0};
std::vector<Tolerance> fb_var{};

// time step exclusion data
std::vector<int> exclude_steps{};
Expand Down
38 changes: 18 additions & 20 deletions packages/seacas/applications/exodiff/create_file.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,16 @@
template <typename INT> class Exo_Read;

namespace {
void build_variable_names(const char *type, NameList &names,
std::vector<Tolerance> &tols, const Tolerance &default_tol,
bool do_all_flag, const NameList &var_names1,
const NameList &var_names2, bool *diff_found);
void build_variable_names(const char *type, NameList &names, std::vector<Tolerance> &tols,
const Tolerance &default_tol, bool do_all_flag,
const NameList &var_names1, const NameList &var_names2,
bool *diff_found);

template <typename INT>
void build_truth_table(EXOTYPE type, const char *label, NameList &names,
size_t num_entity, Exo_Read<INT> &file1, Exo_Read<INT> &file2,
const NameList &var_names1,
const NameList &var_names2, std::vector<int> &truth_tab,
bool quiet_flag, bool *diff_found);
void build_truth_table(EXOTYPE type, const char *label, NameList &names, size_t num_entity,
Exo_Read<INT> &file1, Exo_Read<INT> &file2, const NameList &var_names1,
const NameList &var_names2, std::vector<int> &truth_tab, bool quiet_flag,
bool *diff_found);

void output_exodus_names(int file_id, EXOTYPE type, const NameList &names);
void output_diff_names(const char *type, const NameList &names);
Expand Down Expand Up @@ -309,10 +308,10 @@ namespace {
}
}

void build_variable_names(const char *type, NameList &names,
std::vector<Tolerance> &tols, const Tolerance &default_tol,
bool do_all_flag, const NameList &var_names1,
const NameList &var_names2, bool *diff_found)
void build_variable_names(const char *type, NameList &names, std::vector<Tolerance> &tols,
const Tolerance &default_tol, bool do_all_flag,
const NameList &var_names1, const NameList &var_names2,
bool *diff_found)
{
NameList x_list; // exclusion list
for (auto name : names) {
Expand Down Expand Up @@ -380,8 +379,8 @@ namespace {
}
}

NameList tmp_list;
std::vector<Tolerance> tmp_tols;
NameList tmp_list;
std::vector<Tolerance> tmp_tols;
for (size_t n = 0; n < names.size(); ++n) {
std::string name = names[n];
chop_whitespace(name);
Expand Down Expand Up @@ -425,11 +424,10 @@ namespace {
}

template <typename INT>
void build_truth_table(EXOTYPE type, const char *label, NameList &names,
size_t num_entity, Exo_Read<INT> &file1, Exo_Read<INT> &file2,
const NameList &var_names1,
const NameList &var_names2, std::vector<int> &truth_tab,
bool quiet_flag, bool *diff_found)
void build_truth_table(EXOTYPE type, const char *label, NameList &names, size_t num_entity,
Exo_Read<INT> &file1, Exo_Read<INT> &file2, const NameList &var_names1,
const NameList &var_names2, std::vector<int> &truth_tab, bool quiet_flag,
bool *diff_found)
{
if (!names.empty()) {
int num_vars = names.size();
Expand Down
8 changes: 4 additions & 4 deletions packages/seacas/applications/exodiff/exo_entity.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ class Exo_Entity
const double *Get_Attributes(int attr_index) const;
void Free_Attributes();

const std::string &Get_Attribute_Name(int attr_index) const;
const std::string &Name() const { return name_; }
const NameList &Attribute_Names() const { return attributeNames; }
int Find_Attribute_Index(const std::string &name) const;
const std::string &Get_Attribute_Name(int attr_index) const;
const std::string &Name() const { return name_; }
const NameList &Attribute_Names() const { return attributeNames; }
int Find_Attribute_Index(const std::string &name) const;

// Return "Element Block", "Nodeset", "Sideset, depending on underlying type.
virtual const char *label() const = 0;
Expand Down
3 changes: 1 addition & 2 deletions packages/seacas/applications/exodiff/exo_read.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1337,8 +1337,7 @@ template <typename INT> void Exo_Read<INT>::Get_Init_Data()
} // End of EXODIFF

namespace {
void read_vars(int file_id, EXOTYPE flag, const char *type, int num_vars,
NameList &varlist)
void read_vars(int file_id, EXOTYPE flag, const char *type, int num_vars, NameList &varlist)
{
if (num_vars != 0) {
int name_size = ex_inquire_int(file_id, EX_INQ_MAX_READ_NAME_LENGTH);
Expand Down
50 changes: 25 additions & 25 deletions packages/seacas/applications/exodiff/exo_read.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ template <typename INT> class Exo_Read

// Variables:

size_t Num_Global_Vars() const { return global_vars.size(); }
size_t Num_Nodal_Vars() const { return nodal_vars.size(); }
size_t Num_Element_Vars() const { return elmt_vars.size(); }
size_t Num_Element_Atts() const { return elmt_atts.size(); }
size_t Num_NS_Vars() const { return ns_vars.size(); }
size_t Num_SS_Vars() const { return ss_vars.size(); }
size_t Num_EB_Vars() const { return eb_vars.size(); }
size_t Num_FB_Vars() const { return fb_vars.size(); }
size_t Num_Global_Vars() const { return global_vars.size(); }
size_t Num_Nodal_Vars() const { return nodal_vars.size(); }
size_t Num_Element_Vars() const { return elmt_vars.size(); }
size_t Num_Element_Atts() const { return elmt_atts.size(); }
size_t Num_NS_Vars() const { return ns_vars.size(); }
size_t Num_SS_Vars() const { return ss_vars.size(); }
size_t Num_EB_Vars() const { return eb_vars.size(); }
size_t Num_FB_Vars() const { return fb_vars.size(); }
const NameList &Global_Var_Names() const { return global_vars; }
const NameList &Nodal_Var_Names() const { return nodal_vars; }
const NameList &Element_Var_Names() const { return elmt_vars; }
Expand Down Expand Up @@ -197,22 +197,22 @@ template <typename INT> class Exo_Read

// GENESIS info:

std::string title{};
NameList coord_names{};
size_t num_nodes{0};
int dimension{0};
size_t num_elmts{0};
size_t num_faces{0};
size_t num_edges{0};
size_t num_elmt_blocks{0};
size_t num_node_sets{0};
size_t num_side_sets{0};
size_t num_edge_blocks{0};
size_t num_face_blocks{0};
size_t num_assemblies{0};
float db_version{0.0};
float api_version{0.0};
int io_word_size{0}; // Note: The "compute word size" is always 8.
std::string title{};
NameList coord_names{};
size_t num_nodes{0};
int dimension{0};
size_t num_elmts{0};
size_t num_faces{0};
size_t num_edges{0};
size_t num_elmt_blocks{0};
size_t num_node_sets{0};
size_t num_side_sets{0};
size_t num_edge_blocks{0};
size_t num_face_blocks{0};
size_t num_assemblies{0};
float db_version{0.0};
float api_version{0.0};
int io_word_size{0}; // Note: The "compute word size" is always 8.

Exo_Block<INT> *eblocks{nullptr}; // Array.
Node_Set<INT> *nsets{nullptr}; // Array.
Expand All @@ -239,7 +239,7 @@ template <typename INT> class Exo_Read
NameList fb_vars{};

std::vector<int> change_set_ids{};
NameList change_set_names{};
NameList change_set_names{};

double time_scale{1.0};
double time_offset{0.0};
Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/applications/exodiff/node_set.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// See packages/seacas/LICENSE for details
#pragma once

#include "util.h"
#include "exo_entity.h"
#include "util.h"

template <typename INT> class Exo_Read;

Expand Down
2 changes: 1 addition & 1 deletion packages/seacas/applications/exodiff/stringx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
// See packages/seacas/LICENSE for details
#pragma once

#include "util.h"
#include <string>
#include <vector>
#include "util.h"

//! Compare a string against another "master" string, where the string, str,
//! can be abbreiviated to as little as min_length characters. Returns true
Expand Down
24 changes: 12 additions & 12 deletions packages/seacas/libraries/exodus/src/ex_get_init_ext.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,22 +186,22 @@ int ex_get_init_ext(int exoid, ex_init_params *info)
* trailing null */
if (title_len > 0) {
if (title_len > MAX_LINE_LENGTH) {
char *title = malloc(title_len + 1);
if ((status = nc_get_att_text(rootid, NC_GLOBAL, ATT_TITLE, title)) == NC_NOERR) {
ex_copy_string(info->title, title, MAX_LINE_LENGTH + 1);
info->title[MAX_LINE_LENGTH] = '\0';
}
free(title);
char *title = malloc(title_len + 1);
if ((status = nc_get_att_text(rootid, NC_GLOBAL, ATT_TITLE, title)) == NC_NOERR) {
ex_copy_string(info->title, title, MAX_LINE_LENGTH + 1);
info->title[MAX_LINE_LENGTH] = '\0';
}
free(title);
}
else {
status = nc_get_att_text(rootid, NC_GLOBAL, ATT_TITLE, info->title);
info->title[title_len] = '\0';
status = nc_get_att_text(rootid, NC_GLOBAL, ATT_TITLE, info->title);
info->title[title_len] = '\0';
}
if (status != NC_NOERR) {
char errmsg[MAX_ERR_LENGTH];
snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get title in file id %d", rootid);
ex_err_fn(exoid, __func__, errmsg, status);
EX_FUNC_LEAVE(EX_FATAL);
char errmsg[MAX_ERR_LENGTH];
snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: failed to get title in file id %d", rootid);
ex_err_fn(exoid, __func__, errmsg, status);
EX_FUNC_LEAVE(EX_FATAL);
}
}
}
Expand Down

0 comments on commit 4574c5f

Please sign in to comment.