Skip to content
Snippets Groups Projects
Commit 89156c72 authored by Spiros Tsalikis's avatar Spiros Tsalikis Committed by Kitware Robot
Browse files

Merge topic 'fix-another-c++17-ioss-issue'


d7f4fccb Merge branch 'upstream-ioss' into fix-another-c++17-ioss-issue
fc8eef3e ioss 2024-07-09 (2b512b98)
8581238e ioss: update.sh

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Tested-by: default avatarbuildbot <buildbot@kitware.com>
Reviewed-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !11307
parents 5ff8c5ac d7f4fccb
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,7 @@ vtk_module_third_party(
SPDX_COPYRIGHT_TEXT
"Copyright(C) 1999-2017 National Technology & Engineering Solutions of Sandia, LLC (NTESS)"
SPDX_DOWNLOAD_LOCATION
"git+https://gitlab.kitware.com/third-party/seacas.git@ioss/for/vtk-20240702-master-gaeee5aa1/seacas/libraries/ioss/"
"git+https://gitlab.kitware.com/third-party/seacas.git@ioss/for/vtk-20240709-master-gaeee5aa1/seacas/libraries/ioss/"
VERSION
"2024-04-03"
STANDARD_INCLUDE_DIRS
......
......@@ -8,7 +8,7 @@ readonly name="ioss"
readonly ownership="Seacas Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/seacas.git"
readonly tag="ioss/for/vtk-20240702-master-gaeee5aa1"
readonly tag="ioss/for/vtk-20240709-master-gaeee5aa1"
readonly paths="
packages/seacas/libraries/ioss/src/CMakeLists.vtk.txt
packages/seacas/libraries/ioss/cmake/SEACASIoss_config.h.in
......
......@@ -383,14 +383,18 @@ namespace Ioss {
auto chains = string_chains(element_chains);
if ((debug_level & 16) != 0) {
for (const auto &[chain_root, chain_elements] : chains) {
for (const auto &chain : chains) {
const auto &chain_root = chain.first;
const auto &chain_elements = chain.second;
fmt::print("Chain Root: {} contains: {}\n", chain_root, fmt::join(chain_elements, ", "));
}
}
std::vector<float> weights(element_count, 1);
// Now, for each chain...
for (const auto &[chain_root, chain_elements] : chains) {
for (const auto &chain : chains) {
const auto &chain_root = chain.first;
const auto &chain_elements = chain.second;
// * Set the weights of all elements in the chain...
// * non-root = 0, root = length of chain.
for (const auto &element : chain_elements) {
......@@ -418,7 +422,9 @@ namespace Ioss {
std::vector<int> delta(proc_count);
// Now, for each chain...
for (const auto &[chain_root, chain_elements] : chains) {
for (const auto &chain : chains) {
const auto &chain_root = chain.first;
const auto &chain_elements = chain.second;
if ((debug_level & 16) != 0) {
fmt::print("Chain Root: {} contains: {}\n", chain_root, fmt::join(chain_elements, ", "));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment