Skip to content

Commit 6cf9369

Browse files
committed
Merge branch 'master' into coverity
2 parents 4e3cc19 + a079e70 commit 6cf9369

25 files changed

+74
-49
lines changed

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# Initializes the CodeQL tools for scanning.
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
53+
uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
5454
with:
5555
languages: ${{ matrix.language }}
5656
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
6060
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6161
# If this step fails, then you should remove it and run the build manually (see below)
6262
- name: Autobuild
63-
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
63+
uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
6464

6565
# ℹ️ Command-line programs to run using the OS shell.
6666
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
7373
# ./location_of_script_within_repo/buildscript.sh
7474

7575
- name: Perform CodeQL Analysis
76-
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
76+
uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
7777
with:
7878
category: "/language:${{matrix.language}}"

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ jobs:
7171

7272
# Upload the results to GitHub's code scanning dashboard.
7373
- name: "Upload to code-scanning"
74-
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
74+
uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
7575
with:
7676
sarif_file: results.sarif

packages/seacas/applications/ejoin/EJoin.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
215215
if (dbi[p]->int_byte_size_api() > int_byte_size) {
216216
int_byte_size = dbi[p]->int_byte_size_api();
217217
}
218-
dbi[p]->set_lower_case_database_names(false);
218+
dbi[p]->set_lowercase_database_names(false);
219219
}
220220

221221
for (size_t p = 0; p < interFace.inputFiles_.size(); p++) {

packages/seacas/applications/exomatlab/exomatlab.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ namespace {
114114
}
115115

116116
dbi->set_field_separator(interFace.field_suffix());
117-
dbi->set_lower_case_variable_names(false);
117+
dbi->set_lowercase_variable_names(false);
118118

119119
// NOTE: 'region' owns 'db' pointer at this time...
120120
Ioss::Region region(dbi, "region_1");

packages/seacas/applications/slice/Slice.C

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ int main(int argc, char *argv[])
397397
dbi->set_int_byte_size_api(Ioss::USE_INT64_API);
398398
}
399399

400-
dbi->set_lower_case_database_names(false);
400+
dbi->set_lowercase_database_names(false);
401401
dbi->set_surface_split_type(Ioss::SPLIT_BY_DONT_SPLIT);
402402
dbi->set_field_separator(0);
403403

packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.C

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@ namespace Ioss {
346346
}
347347
}
348348

349+
Utils::check_set_bool_property(properties, "LOWERCASE_VARIABLE_NAMES", lowerCaseVariableNames);
350+
Utils::check_set_bool_property(properties, "LOWERCASE_DATABASE_NAMES", lowerCaseDatabaseNames);
351+
352+
// Not sure why I spelled it this way...
349353
Utils::check_set_bool_property(properties, "LOWER_CASE_VARIABLE_NAMES", lowerCaseVariableNames);
350354
Utils::check_set_bool_property(properties, "LOWER_CASE_DATABASE_NAMES", lowerCaseDatabaseNames);
351355
Utils::check_set_bool_property(properties, "USE_GENERIC_CANONICAL_NAMES",

packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,11 +526,23 @@ namespace Ioss {
526526
return duplicateFieldBehavior;
527527
}
528528

529+
void set_lowercase_variable_names(bool true_false) const
530+
{
531+
lowerCaseVariableNames = true_false;
532+
}
533+
534+
void set_lowercase_database_names(bool true_false) const
535+
{
536+
lowerCaseDatabaseNames = true_false;
537+
}
538+
539+
// Retain for backward compatibility
529540
void set_lower_case_variable_names(bool true_false) const
530541
{
531542
lowerCaseVariableNames = true_false;
532543
}
533544

545+
// Retain for backward compatibility
534546
void set_lower_case_database_names(bool true_false) const
535547
{
536548
lowerCaseDatabaseNames = true_false;

packages/seacas/libraries/ioss/src/Ioss_Doxygen.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ par_cgns | Input/Output | alias for parallel CGNS
4646
Property | Value | Description
4747
----------|:--------:|------------
4848
LOGGING | on/[off] | enable/disable logging of field input/output
49-
LOWER_CASE_VARIABLE_NAMES | [on]/off | Convert all variable names read from input database to lowercase; replace ' ' with '_'
50-
LOWER_CASE_DATABASE_NAMES | on/[off] | Convert all block/set names read from input database to lowercase; replace ' ' with '_'
49+
LOWERCASE_VARIABLE_NAMES | [on]/off | Convert all variable names read from input database to lowercase; replace ' ' with '_'
50+
LOWERCASE_DATABASE_NAMES | on/[off] | Convert all block/set names read from input database to lowercase; replace ' ' with '_'
5151
USE_GENERIC_CANONICAL_NAMES | on/[off] | use `block_{id}` as canonical name of an element block instead of the name (if any) stored on the database. The database name will be an alias.
5252
IGNORE_DATABASE_NAMES | on/[off] | Do not read any element block, nodeset, ... names if they exist on the database. Use only the canonical generated names (entitytype + _ + id)
5353
IGNORE_ATTRIBUTE_NAMES | on/[off] | Do not read the attribute names that may exist on an input database. Instead for an element block with N attributes, the fields will be named `attribute_1` ... `attribute_N`
@@ -131,6 +131,11 @@ PARALLEL_IO_MODE | netcdf4, hdf5, pnetcdf, (mpiio and mpiposix are deprecated)
131131
CYCLE_COUNT | {cycle} | If using FILE_PER_STATE, then use {cycle} different files and then overwrite. Otherwise, there will be a maximum of {cycle} time steps in the file. See below.
132132
OVERLAY_COUNT | {overlay}| If using FILE_PER_STATE, then put {overlay} timesteps worth of data into each file before going to next file. Otherwise, each output step in the file will be overwritten {overlay} times. See below.
133133
ENABLE_DATAWARP | on/[off] | If the system supports Cray DataWarp (burst buffer), should it be used for buffering output files.
134+
## Deprecated Database-Related Properties
135+
Property | Value | Description
136+
-----------------|:------:|-----------------------------------------------------------
137+
LOWER_CASE_VARIABLE_NAMES | [on]/off | Use LOWERCASE_VARIABLE_NAMES
138+
LOWER_CASE_DATABASE_NAMES | on/[off] | Use LOWERCASE_DATABASE_NAMES
134139
135140
### Cycle and Overlay Behavior:
136141
(Properties `CYCLE_COUNT`, `OVERLAY_COUNT`, and `FILE_PER_STATE`)
@@ -225,7 +230,7 @@ throughout the file.
225230
ENABLE_TRACING | on/[off] | show memory and elapsed time during some IOSS calls (mainly decomp).
226231
DECOMP_SHOW_PROGRESS | on/[off] | use `ENABLE_TRACING`.
227232
DECOMP_SHOW_HWM | on/[off] | show high-water memory during autodecomp
228-
IOSS_TIME_FILE_OPEN_CLOSE | on/[off] | show elapsed time during parallel-io file open/close/create
233+
IOSS_TIME_FILE_OPEN_CLOSE | on/[off] | show elapsed time during parallel-io file open/close/create/flush
229234
CHECK_PARALLEL_CONSISTENCY | on/[off] | check Ioss::GroupingEntity parallel consistency
230235
TIME_STATE_INPUT_OUTPUT | on/[off] | show the elapsed time for reading/writing each timestep's data
231236

packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.C

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ namespace Ioex {
658658
}
659659

660660
std::string get_entity_name(int exoid, ex_entity_type type, int64_t id,
661-
const std::string &basename, int length, bool lower_case_names,
661+
const std::string &basename, int length, bool lowercase_names,
662662
bool &db_has_name)
663663
{
664664
std::vector<char> buffer(length + 1);
@@ -669,7 +669,7 @@ namespace Ioex {
669669
}
670670
if (buffer[0] != '\0') {
671671
std::string name{Data(buffer)};
672-
if (lower_case_names) {
672+
if (lowercase_names) {
673673
Ioss::Utils::fixup_name(name);
674674
}
675675
// Filter out names of the form "basename_id" if the name

packages/seacas/libraries/ioss/src/exodus/Ioex_Utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ namespace Ioex {
126126

127127
IOSS_NODISCARD IOEX_EXPORT std::string get_entity_name(int exoid, ex_entity_type type, int64_t id,
128128
const std::string &basename, int length,
129-
bool lower_case_names, bool &db_has_name);
129+
bool lowercase_names, bool &db_has_name);
130130

131131
IOEX_EXPORT bool filter_node_list(Ioss::Int64Vector &nodes,
132132
const std::vector<unsigned char> &node_connectivity_status);

0 commit comments

Comments
 (0)