Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/buildtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
gcc13_assertions_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/main'
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
strategy:
fail-fast: false
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
clang18_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
needs: clang18_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand All @@ -184,7 +184,7 @@ jobs:
needs: clang18_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -243,7 +243,7 @@ jobs:
gcc13_no_optional_dependencies_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand All @@ -269,7 +269,7 @@ jobs:
needs: gcc13_no_optional_dependencies_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/checkcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: checkcode
on:
pull_request:
branches:
- 'main'
- "main"
schedule:
- cron: '0 22 * * *'
- cron: "0 22 * * *"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -29,7 +29,7 @@ jobs:
clang-tidy:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand All @@ -55,7 +55,7 @@ jobs:
verify-headers:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: coverage

on:
schedule:
- cron: '0 1 * * *'
- cron: "0 1 * * *"

jobs:
clang18_coverage_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
needs: clang18_coverage_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
strategy:
matrix:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
needs: [clang18_coverage_test, clang18_coverage_build]
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
steps:
- uses: actions/checkout@v6
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
doxygen:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand All @@ -44,7 +44,7 @@ jobs:
documentation:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/nightly_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: nightly_tests

on:
schedule:
- cron: '0 22 * * *'
- cron: "0 22 * * *"

jobs:
gcc13_assertions_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
needs: gcc13_assertions_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
strategy:
fail-fast: false
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
clang18_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
needs: clang18_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
strategy:
fail-fast: false
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
clang18_build_oldest_supported_dependencies:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -280,7 +280,7 @@ jobs:
needs: clang18_build_oldest_supported_dependencies
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04-oldest-supported:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
strategy:
fail-fast: false
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
gcc13_no_optional_dependencies_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -354,7 +354,7 @@ jobs:
needs: gcc13_no_optional_dependencies_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
strategy:
fail-fast: false
Expand Down Expand Up @@ -406,7 +406,7 @@ jobs:
gcc13_asan_build:
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
defaults:
run:
Expand Down Expand Up @@ -441,7 +441,7 @@ jobs:
needs: gcc13_asan_build
runs-on: ubuntu-latest
container:
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:4d0c2ab2
image: ghcr.io/4c-multiphysics/4c-dependencies-ubuntu24.04:7821acef
options: --user root --env OMPI_ALLOW_RUN_AS_ROOT=1 --env OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
strategy:
fail-fast: false
Expand Down
1 change: 1 addition & 0 deletions dependencies/current/trilinos/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ $CMAKE_COMMAND \
-D CMAKE_INSTALL_PREFIX:STRING=$INSTALL_DIR \
-D BUILD_SHARED_LIBS:BOOL=ON \
\
-D Trilinos_ENABLE_DEBUG:BOOL=ON \
-D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \
-D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \
-D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \
Expand Down
1 change: 1 addition & 0 deletions dependencies/oldest_supported/trilinos/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ $CMAKE_COMMAND \
-D CMAKE_INSTALL_PREFIX:STRING=$INSTALL_DIR \
-D BUILD_SHARED_LIBS:BOOL=ON \
\
-D Trilinos_ENABLE_DEBUG:BOOL=ON \
-D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \
-D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \
-D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \
Expand Down
1 change: 1 addition & 0 deletions dependencies/trilinos_develop/trilinos/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ $CMAKE_COMMAND \
-D CMAKE_INSTALL_PREFIX:STRING=$INSTALL_DIR \
-D BUILD_SHARED_LIBS:BOOL=ON \
\
-D Trilinos_ENABLE_DEBUG:BOOL=ON \
-D Trilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=OFF \
-D Trilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON \
-D Trilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ BeamInteraction::BeamLinkBeam3rLine2PinJointed::BeamLinkBeam3rLine2PinJointed()
: BeamLinkPinJointed(),
triad_(Core::LinAlg::Initialization::zero),
linkele_(nullptr),
bspotforces_(2, Core::LinAlg::SerialDenseVector(true))
bspotforces_(2, Core::LinAlg::SerialDenseVector(3, true))
{
}

Expand All @@ -53,7 +53,7 @@ BeamInteraction::BeamLinkBeam3rLine2PinJointed::BeamLinkBeam3rLine2PinJointed(
const BeamInteraction::BeamLinkBeam3rLine2PinJointed& old)
: BeamInteraction::BeamLinkPinJointed(old),
triad_(old.triad_),
bspotforces_(2, Core::LinAlg::SerialDenseVector(true))
bspotforces_(2, Core::LinAlg::SerialDenseVector(3, true))
{
if (linkele_ != nullptr)
linkele_ = std::dynamic_pointer_cast<Discret::Elements::Beam3r>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Core::Communication::ParObject* BeamInteraction::BeamLinkBeam3rLine2RigidJointed
BeamInteraction::BeamLinkBeam3rLine2RigidJointed::BeamLinkBeam3rLine2RigidJointed()
: BeamLinkRigidJointed(),
linkele_(nullptr),
bspotforces_(2, Core::LinAlg::SerialDenseVector(true))
bspotforces_(2, Core::LinAlg::SerialDenseVector(3, true))
{
}

Expand All @@ -52,7 +52,7 @@ BeamInteraction::BeamLinkBeam3rLine2RigidJointed::BeamLinkBeam3rLine2RigidJointe
BeamInteraction::BeamLinkBeam3rLine2RigidJointed::BeamLinkBeam3rLine2RigidJointed(
const BeamInteraction::BeamLinkBeam3rLine2RigidJointed& old)
: BeamInteraction::BeamLinkRigidJointed(old),
bspotforces_(2, Core::LinAlg::SerialDenseVector(true))
bspotforces_(2, Core::LinAlg::SerialDenseVector(3, true))
{
if (linkele_ != nullptr)
linkele_ = std::dynamic_pointer_cast<Discret::Elements::Beam3r>(
Expand Down
4 changes: 2 additions & 2 deletions src/beaminteraction/src/4C_beaminteraction_link_truss.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ Core::Communication::ParObject* BeamInteraction::BeamLinkTrussType::create(
BeamInteraction::BeamLinkTruss::BeamLinkTruss()
: BeamLinkPinJointed(),
linkele_(nullptr),
bspotforces_(2, Core::LinAlg::SerialDenseVector(true))
bspotforces_(2, Core::LinAlg::SerialDenseVector(3, true))
{
}

/*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
BeamInteraction::BeamLinkTruss::BeamLinkTruss(const BeamInteraction::BeamLinkTruss& old)
: BeamInteraction::BeamLinkPinJointed(old),
bspotforces_(2, Core::LinAlg::SerialDenseVector(true))
bspotforces_(2, Core::LinAlg::SerialDenseVector(3, true))
{
if (linkele_ != nullptr)
linkele_ = std::dynamic_pointer_cast<Discret::Elements::Truss3>(
Expand Down
9 changes: 5 additions & 4 deletions src/core/fem/src/discretization/4C_fem_discretization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -563,12 +563,13 @@ void Core::FE::Discretization::replace_dof_set(

/*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
std::map<int, std::vector<int>>* Core::FE::Discretization::get_all_pbc_coupled_col_nodes()
const std::map<int, std::vector<int>>* Core::FE::Discretization::get_all_pbc_coupled_col_nodes()
const
{
// check for pbcs
for (int nds = 0; nds < num_dof_sets(); nds++)
{
std::shared_ptr<Core::DOFSets::PBCDofSet> pbcdofset =
std::shared_ptr<const Core::DOFSets::PBCDofSet> pbcdofset =
std::dynamic_pointer_cast<Core::DOFSets::PBCDofSet>(dofsets_[nds]);

if (pbcdofset != nullptr)
Expand All @@ -584,8 +585,8 @@ std::map<int, std::vector<int>>* Core::FE::Discretization::get_all_pbc_coupled_c

/*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
std::shared_ptr<std::map<int, int>>
Core::FE::Discretization::get_pbc_slave_to_master_node_connectivity()
std::shared_ptr<const std::map<int, int>>
Core::FE::Discretization::get_pbc_slave_to_master_node_connectivity() const
{
// check for pbcs
for (int nds = 0; nds < num_dof_sets(); nds++)
Expand Down
4 changes: 2 additions & 2 deletions src/core/fem/src/discretization/4C_fem_discretization.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -622,12 +622,12 @@ namespace Core::FE
/*!
\brief Get master to slave coupling in case of periodic boundary conditions
*/
std::map<int, std::vector<int>>* get_all_pbc_coupled_col_nodes();
const std::map<int, std::vector<int>>* get_all_pbc_coupled_col_nodes() const;

/*!
\brief Get slave to master connectivity in case of periodic boundary conditions
*/
std::shared_ptr<std::map<int, int>> get_pbc_slave_to_master_node_connectivity();
std::shared_ptr<const std::map<int, int>> get_pbc_slave_to_master_node_connectivity() const;

//@}

Expand Down
Loading
Loading