zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues 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
2018-02-06 11:49:36 +00:00
parent e0cd2062ad 2feb5a12a3
commit 15a6365a2a
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenFOAM/primitives/VectorSpace/VectorSpaceOps.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,27 +44,25 @@ class VectorSpaceOps
{ {
public: public:
static const int endLoop = (I < N-1) ? 1 : 0;
template<class V, class S, class EqOp> template<class V, class S, class EqOp>
static inline void eqOpS(V& vs, const S& s, EqOp eo) static inline void eqOpS(V& vs, const S& s, EqOp eo)
{ {
eo(vs.v_[I], s); eo(vs.v_[I], s);
VectorSpaceOps<endLoop*N, endLoop*(I+1)>::eqOpS(vs, s, eo); VectorSpaceOps<N, I + 1>::eqOpS(vs, s, eo);
} }
template<class S, class V, class EqOp> template<class S, class V, class EqOp>
static inline void SeqOp(S& s, const V& vs, EqOp eo) static inline void SeqOp(S& s, const V& vs, EqOp eo)
{ {
eo(s, vs.v_[I]); eo(s, vs.v_[I]);
VectorSpaceOps<endLoop*N, endLoop*(I+1)>::SeqOp(s, vs, eo); VectorSpaceOps<N, I + 1>::SeqOp(s, vs, eo);
} }
template<class V1, class V2, class EqOp> template<class V1, class V2, class EqOp>
static inline void eqOp(V1& vs1, const V2& vs2, EqOp eo) static inline void eqOp(V1& vs1, const V2& vs2, EqOp eo)
{ {
eo(vs1.v_[I], vs2.v_[I]); eo(vs1.v_[I], vs2.v_[I]);
VectorSpaceOps<endLoop*N, endLoop*(I+1)>::eqOp(vs1, vs2, eo); VectorSpaceOps<N, I + 1>::eqOp(vs1, vs2, eo);
} }
@ -72,27 +70,27 @@ public:
static inline void opVS(V& vs, const V1& vs1, const S& s, Op o) static inline void opVS(V& vs, const V1& vs1, const S& s, Op o)
{ {
vs.v_[I] = o(vs1.v_[I], s); vs.v_[I] = o(vs1.v_[I], s);
VectorSpaceOps<endLoop*N, endLoop*(I+1)>::opVS(vs, vs1, s, o); VectorSpaceOps<N, I + 1>::opVS(vs, vs1, s, o);
} }
template<class V, class S, class V1, class Op> template<class V, class S, class V1, class Op>
static inline void opSV(V& vs, const S& s, const V1& vs1, Op o) static inline void opSV(V& vs, const S& s, const V1& vs1, Op o)
{ {
vs.v_[I] = o(s, vs1.v_[I]); vs.v_[I] = o(s, vs1.v_[I]);
VectorSpaceOps<endLoop*N, endLoop*(I+1)>::opSV(vs, s, vs1, o); VectorSpaceOps<N, I + 1>::opSV(vs, s, vs1, o);
} }
template<class V, class V1, class Op> template<class V, class V1, class Op>
static inline void op(V& vs, const V1& vs1, const V1& vs2, Op o) static inline void op(V& vs, const V1& vs1, const V1& vs2, Op o)
{ {
vs.v_[I] = o(vs1.v_[I], vs2.v_[I]); vs.v_[I] = o(vs1.v_[I], vs2.v_[I]);
VectorSpaceOps<endLoop*N, endLoop*(I+1)>::op(vs, vs1, vs2, o); VectorSpaceOps<N, I + 1>::op(vs, vs1, vs2, o);
} }
}; };
template<> template<direction N>
class VectorSpaceOps<0, 0> class VectorSpaceOps<N, N>
{ {
public: public: