Skip to content

Commit aee73d3

Browse files
author
AlexanderMueller
committed
indent
1 parent 5d4c043 commit aee73d3

21 files changed

+364
-360
lines changed

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ project(
1616
)
1717

1818
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
19-
#add_definitions(-DDUNE_LOCALFEFUNCTIONS_USE_EIGEN=1)
19+
# add_definitions(-DDUNE_LOCALFEFUNCTIONS_USE_EIGEN=1)
2020
add_definitions(-DDUNE_DISABLE_PYTHON_DEPRECATION_WARNINGS=1)
2121
add_definitions(-DCMAKE_DISABLE_FIND_PACKAGE_Vc=1)
2222
add_definitions(-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=1)

‎cmake/modules/AddDuneLocalFeFlags.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,20 @@ set(HAVE_DUNE_LOCALFEFUNCTIONS ${dune-localfefunctions_FOUND})
66

77
# register all dune-localfefunctions related flags
88
if(dune-localfefunctions_FOUND)
9-
dune_register_package_flags(COMPILE_DEFINITIONS "ENABLE_DUNE_LOCALFEFUNCTIONS=1;DUNE_LOCALFEFUNCTIONS_USE_EIGEN=1")
9+
dune_register_package_flags(
10+
COMPILE_DEFINITIONS "ENABLE_DUNE_LOCALFEFUNCTIONS=1;DUNE_LOCALFEFUNCTIONS_USE_EIGEN=1"
11+
)
1012
endif()
1113

1214
# add function to link against the dune-localfefunctions library
1315
function(add_dune_dune-localfefunctions_flags _targets)
1416
if(dune-localfefunctions_FOUND)
1517
foreach(_target ${_targets})
16-
target_compile_definitions(${_target} PUBLIC ENABLE_DUNE_LOCALFEFUNCTIONS=1 PUBLIC DUNE_LOCALFEFUNCTIONS_USE_EIGEN=1)
18+
target_compile_definitions(
19+
${_target}
20+
PUBLIC ENABLE_DUNE_LOCALFEFUNCTIONS=1
21+
PUBLIC DUNE_LOCALFEFUNCTIONS_USE_EIGEN=1
22+
)
1723
endforeach(_target)
1824
endif()
1925
endfunction(add_dune_dune-localfefunctions_flags)

‎cmake/modules/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
# SPDX-FileCopyrightText: 2021-2024 The Ikarus Developers [email protected]
22
# SPDX-License-Identifier: LGPL-3.0-or-later
33

4-
set(modules IkarusMacros.cmake AddAutoDiffFlags.cmake AddEigenFlags.cmake AddMatplotppFlags.cmake
5-
AddSpdlogFlags.cmake AddSpectraFlags.cmake AddDuneLocalFeFlags.cmake
4+
set(modules
5+
IkarusMacros.cmake
6+
AddAutoDiffFlags.cmake
7+
AddEigenFlags.cmake
8+
AddMatplotppFlags.cmake
9+
AddSpdlogFlags.cmake
10+
AddSpectraFlags.cmake
11+
AddDuneLocalFeFlags.cmake
612
)
713
install(FILES ${modules} DESTINATION ${DUNE_INSTALL_MODULEDIR})

‎ikarus/finiteelements/ferequirements.hh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,20 @@ struct AffordanceCollection : public std::tuple<Affordances...>
173173
*
174174
* @tparam T Type to check.
175175
*/
176-
template<typename T>
177-
struct IsAffordanceCollection : std::false_type {};
176+
template <typename T>
177+
struct IsAffordanceCollection : std::false_type
178+
{
179+
};
178180

179181
#ifndef DOXYGEN
180182

181-
template<typename... Ts>
182-
struct IsAffordanceCollection<AffordanceCollection<Ts...>> : std::true_type {};
183+
template <typename... Ts>
184+
struct IsAffordanceCollection<AffordanceCollection<Ts...>> : std::true_type
185+
{
186+
};
183187
#endif
184188

185-
template<typename T>
189+
template <typename T>
186190
constexpr bool IsAffordanceCollection_v = IsAffordanceCollection<T>::value;
187191

188192
inline constexpr VectorAffordance forces = VectorAffordance::forces;

‎ikarus/finiteelements/mechanics/enhancedassumedstrains.hh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ protected:
161161
using namespace Dune::DerivativeDirections;
162162
using namespace Dune;
163163
easApplicabilityCheck();
164-
std::cout<<"calculateMatrixImpl of EAS called with " +std::to_string(numberOfEASParameters())+" Parameters."<<std::endl;
164+
std::cout << "calculateMatrixImpl of EAS called with " + std::to_string(numberOfEASParameters()) + " Parameters."
165+
<< std::endl;
165166
if (isDisplacementBased())
166167
return;
167168

‎ikarus/finiteelements/mechanics/kirchhoffloveshell.hh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88

99
#pragma once
1010

11-
#include <Eigen/Core>
1211
#include <dune/geometry/quadraturerules.hh>
1312
#include <dune/localfefunctions/cachedlocalBasis/cachedlocalBasis.hh>
1413
#include <dune/localfefunctions/impl/standardLocalFunction.hh>
1514

15+
#include <Eigen/Core>
16+
1617
#include <ikarus/finiteelements/fehelper.hh>
1718
#include <ikarus/finiteelements/ferequirements.hh>
1819
#include <ikarus/finiteelements/feresulttypes.hh>

‎ikarus/finiteelements/mechanics/linearelastic.hh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
#pragma once
1111

1212
#if HAVE_DUNE_LOCALFEFUNCTIONS
13-
#include <Eigen/Dense>
1413
#include <optional>
1514
#include <type_traits>
1615

1716
#include <dune/geometry/quadraturerules.hh>
1817
#include <dune/localfefunctions/expressions/linearStrainsExpr.hh>
1918
#include <dune/localfefunctions/impl/standardLocalFunction.hh>
2019

20+
#include <Eigen/Dense>
21+
2122
#include <ikarus/finiteelements/fehelper.hh>
2223
#include <ikarus/finiteelements/ferequirements.hh>
2324
#include <ikarus/finiteelements/feresulttypes.hh>
@@ -199,7 +200,7 @@ protected:
199200
const auto eps = strainFunction(par, dx);
200201
using namespace Dune::DerivativeDirections;
201202
using namespace Dune;
202-
std::cout<<"calculateMatrixImpl of LinearElastic called"<<std::endl;
203+
std::cout << "calculateMatrixImpl of LinearElastic called" << std::endl;
203204

204205
const auto C = materialTangent();
205206
for (const auto& [gpIndex, gp] : eps.viewOverIntegrationPoints()) {

‎ikarus/finiteelements/mechanics/loads/traction.hh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33

44
#pragma once
55

6-
#include <Eigen/Dense>
76
#include <dune/fufem/boundarypatch.hh>
87
#include <dune/localfefunctions/derivativetransformators.hh>
98
#include <dune/localfefunctions/meta.hh>
109

10+
#include <Eigen/Dense>
11+
1112
#include <ikarus/finiteelements/ferequirements.hh>
1213

1314
namespace Ikarus {

‎ikarus/finiteelements/mechanics/loads/volume.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#pragma once
55

6-
#include <Eigen/Core>
7-
86
#include <dune/localfefunctions/derivativetransformators.hh>
97
#include <dune/localfefunctions/meta.hh>
108

9+
#include <Eigen/Core>
10+
1111
#include <ikarus/finiteelements/ferequirements.hh>
1212
#include <ikarus/utils/concepts.hh>
1313
#include <ikarus/utils/traits.hh>

‎ikarus/finiteelements/mechanics/nonlinearelastic.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#pragma once
1111

1212
#if HAVE_DUNE_LOCALFEFUNCTIONS
13-
#include <Eigen/Core>
14-
1513
#include <dune/fufem/boundarypatch.hh>
1614
#include <dune/geometry/quadraturerules.hh>
1715
#include <dune/geometry/type.hh>
@@ -20,6 +18,8 @@
2018
#include <dune/localfefunctions/impl/standardLocalFunction.hh>
2119
#include <dune/localfefunctions/manifolds/realTuple.hh>
2220

21+
#include <Eigen/Core>
22+
2323
#include <ikarus/finiteelements/febase.hh>
2424
#include <ikarus/finiteelements/fehelper.hh>
2525
#include <ikarus/finiteelements/ferequirements.hh>

‎ikarus/python/assembler/flatassembler.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void registerFlatAssembler(pybind11::handle scope, pybind11::class_<Assembler, o
5252
* the user can pass native python lists here, see
5353
* https://pybind11.readthedocs.io/en/stable/advanced/cast/stl.html */
5454
FEContainer fesV = fes.template cast<FEContainer>();
55-
return std::make_shared< Assembler>(std::move(fesV), dirichletValues);
55+
return std::make_shared<Assembler>(std::move(fesV), dirichletValues);
5656
}),
5757
pybind11::keep_alive<1, 3>());
5858

‎ikarus/python/assembler/flatassemblermanipulator.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void registerAssemblerManipulator(pybind11::handle scope, pybind11::class_<Assem
7575

7676
using UnderlyingAssembler = typename AssemblerManipulator::WrappedAssembler;
7777

78-
cls.def(pybind11::init([](const UnderlyingAssembler& as) { return std::make_shared< AssemblerManipulator>(as); }));
78+
cls.def(pybind11::init([](const UnderlyingAssembler& as) { return std::make_shared<AssemblerManipulator>(as); }));
7979

8080
using NewArgs = std::tuple<
8181
ScalarWrapper<std::reference_wrapper<typename AssemblerManipulator::ScalarType>>,

0 commit comments

Comments
 (0)