Commit cd1c566d authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'ioss-use-vtkfmt' into release

fe23ef73 Merge branch 'upstream-ioss' into HEAD
3a1306d4 ioss 2022-02-11 (3ddeaef1)
e911beeb

 ioss: update to use vtkfmt instead of the embedded copy
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !8900
parents dd8cf65c fe23ef73
......@@ -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-20220106-master-gfc9b3e22e7"
readonly tag="ioss/for/vtk-20220211-master-g0c69704b29"
readonly paths="
packages/seacas/libraries/ioss/src/CMakeLists.vtk.txt
packages/seacas/libraries/ioss/cmake/SEACASIoss_config.h.in
......@@ -27,8 +27,6 @@ packages/seacas/libraries/ioss/src/catalyst/*.C
packages/seacas/libraries/ioss/src/cgns/*.h
packages/seacas/libraries/ioss/src/cgns/*.C
packages/seacas/libraries/ioss/src/private_copy_fmt/fmt/*.h
packages/seacas/libraries/ioss/src/gen_struc/*.h
packages/seacas/libraries/ioss/src/gen_struc/*.C
......
......@@ -6,6 +6,7 @@ DEPENDS
VTK::cgns
PRIVATE_DEPENDS
VTK::exodusII
VTK::fmt
VTK::zlib
OPTIONAL_DEPENDS
VTK::mpi
......
......@@ -344,20 +344,6 @@ list(APPEND headers
robin_set.h
tokenize.h
private_copy_fmt/fmt/args.h
private_copy_fmt/fmt/chrono.h
private_copy_fmt/fmt/color.h
private_copy_fmt/fmt/compile.h
private_copy_fmt/fmt/core.h
private_copy_fmt/fmt/format-inl.h
private_copy_fmt/fmt/format.h
private_copy_fmt/fmt/locale.h
private_copy_fmt/fmt/os.h
private_copy_fmt/fmt/ostream.h
private_copy_fmt/fmt/printf.h
private_copy_fmt/fmt/ranges.h
private_copy_fmt/fmt/xchar.h
text_mesh/Iotm_TextMeshUtils.h
vtk_ioss_mangle.h)
......@@ -382,9 +368,6 @@ vtk_module_definitions(VTK::ioss
vtk_module_link(VTK::ioss
PRIVATE
Threads::Threads)
vtk_module_include(VTK::ioss
PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/private_copy_fmt")
# for GetProcessMemoryInfo
if (MINGW)
......
......@@ -12,7 +12,8 @@
#include <Ioss_Region.h>
#include <algorithm>
#include <cstddef>
#include <fmt/ostream.h>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
#include <string>
#include <vector>
......
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_Assembly_h
#define IOSS_Ioss_Assembly_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -69,4 +68,3 @@ namespace Ioss {
EntityType m_type{INVALID_TYPE};
};
} // namespace Ioss
#endif
// Copyright(C) 1999-2021 National Technology & Engineering Solutions
// Copyright(C) 1999-2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_Beam2_h
#define IOSS_Ioss_Beam2_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -54,5 +53,3 @@ namespace Ioss {
static Beam2 instance_;
};
} // namespace Ioss
#endif // IOSS_Ioss_Beam2_h
// Copyright(C) 1999-2021 National Technology & Engineering Solutions
// Copyright(C) 1999-2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_Beam3_h
#define IOSS_Ioss_Beam3_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -54,5 +53,3 @@ namespace Ioss {
static Beam3 instance_;
};
} // namespace Ioss
#endif // IOSS_Ioss_Beam3_h
// Copyright(C) 1999-2021 National Technology & Engineering Solutions
// Copyright(C) 1999-2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_Beam4_h
#define IOSS_Ioss_Beam4_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -54,5 +53,3 @@ namespace Ioss {
static Beam4 instance_;
};
} // namespace Ioss
#endif // IOSS_Ioss_Beam4_h
......@@ -12,7 +12,8 @@
#include <Ioss_Region.h>
#include <algorithm>
#include <cstddef>
#include <fmt/ostream.h>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
#include <string>
#include <vector>
......
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_Blob_h
#define IOSS_Ioss_Blob_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -53,4 +52,3 @@ namespace Ioss {
size_t data_size) const override;
};
} // namespace Ioss
#endif
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_BoundingBox_h
#define IOSS_Ioss_BoundingBox_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -28,5 +27,3 @@ namespace Ioss {
double zmax{};
};
} // namespace Ioss
#endif
......@@ -4,8 +4,7 @@
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_code_types_h
#define IOSS_code_types_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -86,7 +85,6 @@ using Complex = std::complex<double>;
using Kokkos_Complex = Kokkos::complex<double>;
#endif
#endif
#endif
#if defined(IOSS_THREADSAFE)
#define IOSS_FUNC_ENTER(m) std::lock_guard<std::mutex> guard(m)
......
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_CommSet_h
#define IOSS_Ioss_CommSet_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -49,4 +48,3 @@ namespace Ioss {
size_t data_size) const override;
};
} // namespace Ioss
#endif
......@@ -8,9 +8,10 @@
#include <Ioss_MeshCopyOptions.h>
#include <Ioss_SubSystem.h>
#include <fmt/chrono.h>
#include <fmt/format.h>
#include <fmt/ostream.h>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/chrono.h)
#include VTK_FMT(fmt/format.h)
#include VTK_FMT(fmt/ostream.h)
/* These messages indicate a structural difference between the files
* being compared. Use Ioss::WARNING().
......
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_Compare_h
#define IOSS_Ioss_Compare_h
#pragma once
namespace Ioss {
class Region;
......@@ -27,4 +26,3 @@ namespace Ioss {
const Ioss::MeshCopyOptions &options);
};
} // namespace Ioss
#endif
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_CompositeVariableType_h
#define IOSS_Ioss_CompositeVariableType_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -32,4 +31,3 @@ namespace Ioss {
int copies_;
};
} // namespace Ioss
#endif
......@@ -4,8 +4,7 @@
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_ConcreteVariableType_h
#define IOSS_Ioss_ConcreteVariableType_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -84,4 +83,3 @@ namespace Ioss {
MAKE_CLASS(Matrix_22);
MAKE_CLASS(Matrix_33);
} // namespace Ioss
#endif
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_ConstructedVariableType_h
#define IOSS_Ioss_ConstructedVariableType_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -22,4 +21,3 @@ namespace Ioss {
ConstructedVariableType(const ConstructedVariableType &) = delete;
};
} // namespace Ioss
#endif
......@@ -6,7 +6,8 @@
#include <Ioss_CoordinateFrame.h>
#include <Ioss_Utils.h>
#include <fmt/ostream.h>
#include "vtk_fmt.h"
#include VTK_FMT(fmt/ostream.h)
namespace Ioss {
CoordinateFrame::CoordinateFrame(int64_t my_id, char my_tag, const double *point_list)
......
// Copyright(C) 1999-2020 National Technology & Engineering Solutions
// Copyright(C) 1999-2020, 2022 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.
//
// See packages/seacas/LICENSE for details
#ifndef IOSS_Ioss_CoordinateFrame_h
#define IOSS_Ioss_CoordinateFrame_h
#pragma once
#include "vtk_ioss_mangle.h"
......@@ -38,4 +37,3 @@ namespace Ioss {
char tag_;
};
} // namespace Ioss
#endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment