Skip to content

Commit

Permalink
all done?
Browse files Browse the repository at this point in the history
  • Loading branch information
henrij22 committed Nov 28, 2024
1 parent cf601ae commit 731b506
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions ikarus/python/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ dune_python_add_test(

dune_python_add_test(
NAME
dynamicstest
modalanalysistest
SCRIPT
dynamicstest.py
modalanalysistest.py
WORKING_DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}
LABELS
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion ikarus/python/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2021-2024 The Ikarus Developers [email protected]
# SPDX-License-Identifier: LGPL-3.0-or-later

set(HEADERS boundarypatch.hh)
set(HEADERS boundarypatch.hh registermodalanalysis.hh)

install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ikarus/python/utils)
2 changes: 1 addition & 1 deletion ikarus/solver/eigenvaluesolver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# SPDX-License-Identifier: LGPL-3.0-or-later

# install headers
install(FILES generaleigensolver.hh
install(FILES generalizedeigensolver.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ikarus/solver/generalizedeigensolver.hh
)
11 changes: 6 additions & 5 deletions ikarus/solver/eigenvaluesolver/generalizedeigensolver.hh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ struct GeneralizedSymEigenSolver<EigenValueSolverType::Spectra, MT>
* \param assemblerB assembler for matrix B.
*/
template <Concepts::FlatAssembler AssemblerA, Concepts::FlatAssembler AssemblerB>
GeneralizedSymEigenSolver(const std::shared_ptr<AssemblerA>& assemblerA, const std::shared_ptr<AssemblerB>& assemblerB)
GeneralizedSymEigenSolver(const std::shared_ptr<AssemblerA>& assemblerA,
const std::shared_ptr<AssemblerB>& assemblerB)
: GeneralizedSymEigenSolver(assemblerA->matrix(), assemblerB->matrix()) {}

/**
Expand Down Expand Up @@ -246,8 +247,8 @@ requires(std::same_as<typename AS1::MatrixType, typename AS2::MatrixType> &&
auto makeGeneralizedSymEigenSolver(const std::shared_ptr<AS1>& as1, const std::shared_ptr<AS2> as2) {
using MatrixType = typename AS1::MatrixType;
constexpr auto isSparse = Concepts::SparseEigenMatrix<MatrixType>;
using SolverType =
std::conditional_t<isSparse, GeneralizedSymEigenSolver<tag, MatrixType>, GeneralizedSymEigenSolver<tag, MatrixType>>;
using SolverType = std::conditional_t<isSparse, GeneralizedSymEigenSolver<tag, MatrixType>,
GeneralizedSymEigenSolver<tag, MatrixType>>;

return SolverType{as1, as2};
}
Expand Down Expand Up @@ -287,7 +288,7 @@ struct PartialGeneralizedSymEigenSolver

template <Concepts::FlatAssembler AssemblerA, Concepts::FlatAssembler AssemblerB>
PartialGeneralizedSymEigenSolver(const std::shared_ptr<AssemblerA>& assemblerA,
const std::shared_ptr<AssemblerB>& assemblerB, Eigen::Index nev)
const std::shared_ptr<AssemblerB>& assemblerB, Eigen::Index nev)
: PartialGeneralizedSymEigenSolver(assemblerA->matrix(), assemblerB->matrix(), nev) {}

/**
Expand Down Expand Up @@ -359,6 +360,6 @@ auto makePartialGeneralizedSymEigenSolver(const std::shared_ptr<AS1>& as1, const
#ifndef DOXYGEN
template <Concepts::FlatAssembler AS1, Concepts::FlatAssembler AS2>
PartialGeneralizedSymEigenSolver(std::shared_ptr<AS1> as1, std::shared_ptr<AS2> as2,
int nev) -> PartialGeneralizedSymEigenSolver<typename AS1::MatrixType>;
int nev) -> PartialGeneralizedSymEigenSolver<typename AS1::MatrixType>;
#endif
} // namespace Ikarus

0 comments on commit 731b506

Please sign in to comment.