zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2023-04-12 15:36:55 +01:00
parent fff11f7b95 33fc67203a
commit ea1e078463
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenFOAM/db/typeInfo/typeInfo.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -55,6 +55,7 @@ Description
#include "error.H"
#include "className.H"
#include <type_traits>
#include <typeinfo>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -151,6 +152,11 @@ inline word typedName(Name name)
}
//- Determine whether a type is a reference
template<class Type>
constexpr bool isRef = std::is_reference<Type>::value;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam

4
src/fvMeshMovers/interpolator/fvMeshMoversInterpolator.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -95,7 +95,7 @@ void Foam::fvMeshMovers::interpolator::mapMesh(const polyMeshMap& map)
{
if (displacement_)
{
points0_() == mesh().points();
points0_().primitiveFieldRef() = mesh().points();
}
}

6
src/meshTools/PrimitiveOldTimePatch/PrimitiveOldTimePatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,7 +36,8 @@ Foam::PrimitiveOldTimePatch<FaceList, PointField>::PrimitiveOldTimePatch
)
:
PrimitivePatch<FaceList, PointField>(faces, points),
points0_(points0),
points0Ptr_(isRef<PointField> ? nullptr : new Field<PointType>(points0)),
points0_(isRef<PointField> ? points0 : points0Ptr_()),
patch0Ptr_(new patch0Type(faces, points0_)),
localPoints0Ptr_(nullptr)
{}
@ -64,6 +65,7 @@ Foam::PrimitiveOldTimePatch<FaceList, PointField>::PrimitiveOldTimePatch
)
:
PrimitivePatch<FaceList, PointField>(faces, points),
points0Ptr_(nullptr),
points0_(NullObjectRef<Field<PointType>>()),
patch0Ptr_(nullptr),
localPoints0Ptr_(nullptr)

9
src/meshTools/PrimitiveOldTimePatch/PrimitiveOldTimePatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2022-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,15 +85,18 @@ private:
PrimitivePatch
<
typename UFaceList<FaceListType>::type,
const PointFieldType&
const Field<PointType>&
>
patch0Type;
// Private Data
//- Stored old-time points
autoPtr<Field<PointType>> points0Ptr_;
//- Reference to global list of old-time points
PointField points0_;
const Field<PointType>& points0_;
//- Engine for calculating old-time geometry. Note: Methods that
// generate topology should not be called here. The base patch should

2
wmake/rules/linux64Clang/c++
View File

@ -2,7 +2,7 @@ SUFFIXES += .C
c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \
-Wno-unused-parameter -Wno-invalid-offsetof \
-Wno-undefined-var-template
-Wno-undefined-var-template -Wno-unqualified-std-cast-call
# Suppress some warnings for flex++
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \

2
wmake/rules/linuxClang/c++
View File

@ -2,7 +2,7 @@ SUFFIXES += .C
c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor \
-Wno-unused-parameter -Wno-invalid-offsetof \
-Wno-undefined-var-template
-Wno-undefined-var-template -Wno-unqualified-std-cast-call
# Suppress some warnings for flex++
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs \