Merge pull request #613 from sandialabs/zoltan-update-with-trilinos-try2

Zoltan update with trilinos try2

Snapshot latest zoltan version in Trilinos into seacas.

Clean up some compiler warnings in zoltan.
Clean up doxygen warnings in ioss.

Author: gsjaardema

packages/seacas/libraries/aprepro_lib/strings.cc

@@ -62,8 +62,10 @@ std::vector<std::string> build_strings()
   strings.emplace_back(R"({cd = tand(180/4)}	{180-4*atand(cd)}	$ tan(180/4))");
   strings.emplace_back(R"()");
   strings.emplace_back(R"(Test max, min, sign, dim, abs)");
-  strings.emplace_back(R"({pmin = min(0.5, 1.0)}	{nmin = min(-0.5, -1.0)} $ Should be 0.5, -1)");
-  strings.emplace_back(R"({pmax = max(0.5, 1.0)}	{nmax = max(-0.5, -1.0)} $ Should be 1.0, -0.5)");
+  strings.emplace_back(
+      R"({pmin = min(0.5, 1.0)}	{nmin = min(-0.5, -1.0)} $ Should be 0.5, -1)");
+  strings.emplace_back(
+      R"({pmax = max(0.5, 1.0)}	{nmax = max(-0.5, -1.0)} $ Should be 1.0, -0.5)");
   strings.emplace_back(R"({zero = 0} {sign(0.5, zero) + sign(0.5, -zero)}	$ Should be 0 1)");
   strings.emplace_back(
       R"({nonzero = 1} {sign(0.5, nonzero) + sign(0.5, -nonzero)} $ Should be 1 0)");

packages/seacas/libraries/exodus/CMakeLists.txt

@@ -7,8 +7,6 @@ endif()
 TRIBITS_INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
-message("installing shared exodus to: ${CMAKE_INSTALL_LIBDIR}")
-
 FILE(GLOB SOURCES src/ex_*.c)
 
 if (NOT ${PACKAGE_NAME}_HIDE_DEPRECATED_CODE)
@@ -51,7 +49,6 @@ if (SEACASExodus_ENABLE_SHARED)
       # This keeps the library out of the `all_libs` targets...
       set_target_properties(exodus_shared PROPERTIES TRIBITS_TESTONLY_LIB TRUE)
       set_target_properties(exodus_shared PROPERTIES OUTPUT_NAME exodus)
-      message("installing shared exodus to: ${CMAKE_INSTALL_LIBDIR}")
       INSTALL(TARGETS exodus_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
    endif()
 endif()
@@ -76,7 +73,6 @@ if (SEACASExodus_ENABLE_STATIC)
    # Create a symbolic link from libexodus.a to libexoIIv2c.a -- do only for static lib
    InstallSymLink(libexodus.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2c.a)
 endif()
-message("installing shared exodus to: ${CMAKE_INSTALL_LIBDIR}")
 
 if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas")
    # add a target to generate API documentation with Doxygen
@@ -91,7 +87,6 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas")
      endif(DOXYGEN_FOUND)
    endif()
 endif()
-message("installing shared exodus to: ${CMAKE_INSTALL_LIBDIR}")
 
 TRIBITS_ADD_TEST_DIRECTORIES(test)
 

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

@@ -289,7 +289,7 @@ namespace Ioss {
     /** \brief If a database type supports internal change sets, open the change set
      *         specified [zero-based] index
      *
-     *  \param[in] child_index The [zero-based] index of the internal change set to open.
+     *  \param[in] set_index The [zero-based] index of the internal change set to open.
      *  \returns True if successful.
      */
     bool open_internal_change_set(int set_index)

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

@@ -506,11 +506,11 @@ namespace Ioss {
      *  \param[in] sb Compute the offset for element sides in this SideBlock
      *  \returns The offset.
      */
+    IOSS_NODISCARD static int64_t get_side_offset(const Ioss::SideBlock *sb);
+
     IOSS_NODISCARD static int64_t get_side_offset(const Ioss::ElementTopology *parent_topo,
                                                   const Ioss::ElementTopology *side_topo);
 
-    IOSS_NODISCARD static int64_t get_side_offset(const Ioss::SideBlock *sb);
-
     IOSS_NODISCARD static unsigned int hash(const std::string &name);
 
     IOSS_NODISCARD static double timer();

packages/seacas/libraries/ioss/src/heartbeat/Iohb_Layout.C

@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2022, 2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-2022, 2024, 2025 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -36,10 +36,12 @@ namespace Iohb {
     }
   }
 
+#ifndef DOXYGEN_SKIP_THIS
   template void Layout::add(const std::string &name, const std::string &value);
   template void Layout::add(const std::string &name, const int &value);
   template void Layout::add(const std::string &name, const int64_t &value);
   template void Layout::add(const std::string &name, const size_t &value);
+#endif
 
   // Ideally, this would be in the include file, but when building in Sierra, we
   // need to keep all `fmt` includes out of the include file due to some TPLs
@@ -71,9 +73,11 @@ namespace Iohb {
     }
   }
 
+#ifndef DOXYGEN_SKIP_THIS
   template void Layout::add(const std::string &name, const std::vector<int> &value);
   template void Layout::add(const std::string &name, const std::vector<int64_t> &value);
   template void Layout::add(const std::string &name, const std::vector<size_t> &value);
+#endif
 
   template <typename T> void Layout::add(const std::string &name, const std::vector<T> &value)
   {

packages/zoltan/CMakeLists.txt

@@ -49,7 +49,7 @@ OPTION(${PACKAGE_NAME}_ENABLE_CPPDRIVER
   "Enable C++ driver for ${PACKAGE_NAME}."
   ${${PROJECT_NAME}_ENABLE_CXX} )
 
-IF (${PROJECT_NAME}_ENABLE_CXX)
+IF (${PROJECT_NAME}_ENABLE_CXX) 
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMPICH_IGNORE_CXX_SEEK")
 ENDIF()
 

packages/zoltan/COPYRIGHT

@@ -0,0 +1,9 @@
+
+Zoltan Toolkit for Load-balancing, Partitioning, Ordering and Coloring
+                    Copyright (c) 2012 NTESS
+
+Copyright 2012 National Technology & Engineering Solutions of Sandia,
+LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the
+U.S. Government retains certain rights in this software.
+
+Copyright the Zoltan contributors.

packages/zoltan/COPYRIGHT_AND_LICENSE

@@ -0,0 +1,31 @@
+SPDX-License-Identifier: BSD-3-Clause
+
+Copyright (c) 2012 NTESS and the Zoltan contributors.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+ 3. Neither the name of the copyright holder nor the names of
+    its contributors may be used to endorse or promote products
+    derived from this software without specific prior written
+    permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

packages/zoltan/LICENSE

@@ -1,47 +1,3 @@
-# @HEADER
-#
-########################################################################
-#
-#  Zoltan Toolkit for Load-balancing, Partitioning, Ordering and Coloring
-#                  Copyright 2012 Sandia Corporation
-#
-# Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
-# the U.S. Government retains certain rights in this software.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the Corporation nor the names of the
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Questions? Contact Karen Devine	kddevin@sandia.gov
-#                    Erik Boman	        egboman@sandia.gov
-#
-########################################################################
-#
-# @HEADER
-
 
 ## #######################################################################
 ## Options to automake (rarely used - don't worry about it)