exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit 'bd4013d9a98576aaf323b16b3311a5db3c0efeb9' into nextRelease

Browse source
This commit is contained in:
Henrik Rusche 2014-06-01 10:44:03 +02:00
commit dcba0cf955
5 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/VectorN/finiteVolume/blockMatrixTools/blockMatrixTools.C
View file

@ -1262,7 +1262,7 @@ void insertEquationCoupling
} }
// Get references to fvScalarMatrix fields, updating boundary contributions // Get references to fvScalarMatrix fields, updating boundary contributions
scalarField& diag = matrix.D(); scalarField& diag = matrix.D()();
scalarField& source = matrix.source(); scalarField& source = matrix.source();
matrix.addBoundarySource(source, false); matrix.addBoundarySource(source, false);

2
src/finiteVolume/fields/fvPatchFields/derived/waveTransmissiveInlet/waveTransmissiveInletFvPatchField.C
View file

@ -123,7 +123,7 @@ tmp<scalarField>
); );
const surfaceScalarField& phi = const surfaceScalarField& phi =
this->db().objectRegistry::lookupObject<surfaceScalarField> this->db().objectRegistry::template lookupObject<surfaceScalarField>
(this->phiName_); (this->phiName_);
fvsPatchField<scalar> phip = this->patch().lookupPatchField fvsPatchField<scalar> phip = this->patch().lookupPatchField

36
src/foam/fields/CoeffField/CoeffFieldFunctions.C
View file

@ -27,8 +27,10 @@ License
/* * * * * * * * * * * * * * * * Global functions * * * * * * * * * * * * * */ /* * * * * * * * * * * * * * * * Global functions * * * * * * * * * * * * * */
namespace Foam { // namespace added to make CLang happy
template<class Type> template<class Type>
Foam::tmp<Foam::CoeffField<Type> > Foam::inv(const CoeffField<Type>& f) tmp<CoeffField<Type> > inv(const CoeffField<Type>& f)
{ {
// The inverse of a linear coefficient type is currently done "by // The inverse of a linear coefficient type is currently done "by
// hand". The need for this will disappear once the diagonal tensor // hand". The need for this will disappear once the diagonal tensor
@ -68,7 +70,7 @@ Foam::tmp<Foam::CoeffField<Type> > Foam::inv(const CoeffField<Type>& f)
template<class Type> template<class Type>
void Foam::multiply void multiply
( (
Field<Type>& f, Field<Type>& f,
const CoeffField<Type>& f1, const CoeffField<Type>& f1,
@ -91,7 +93,7 @@ void Foam::multiply
template<class Type> template<class Type>
void Foam::multiply void multiply
( (
Field<Type>& f, Field<Type>& f,
const CoeffField<Type>& f1, const CoeffField<Type>& f1,
@ -114,7 +116,7 @@ void Foam::multiply
template<class Type> template<class Type>
void Foam::multiply void multiply
( (
Field<Type>& f, Field<Type>& f,
const Field<Type>& f1, const Field<Type>& f1,
@ -141,7 +143,7 @@ void Foam::multiply
#define UNARY_OPERATOR(op, opFunc) \ #define UNARY_OPERATOR(op, opFunc) \
\ \
template<class Type> \ template<class Type> \
void Foam::opFunc \ void opFunc \
( \ ( \
CoeffField<Type>& f, \ CoeffField<Type>& f, \
const CoeffField<Type>& f1 \ const CoeffField<Type>& f1 \
@ -174,7 +176,7 @@ void Foam::opFunc \
} \ } \
\ \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::CoeffField<Type> > Foam::operator op \ tmp<CoeffField<Type> > operator op \
( \ ( \
const CoeffField<Type>& f1 \ const CoeffField<Type>& f1 \
) \ ) \
@ -185,7 +187,7 @@ Foam::tmp<Foam::CoeffField<Type> > Foam::operator op \
} \ } \
\ \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::CoeffField<Type> > Foam::operator op \ tmp<CoeffField<Type> > operator op \
( \ ( \
const tmp<CoeffField<Type> >& tf1 \ const tmp<CoeffField<Type> >& tf1 \
) \ ) \
@ -203,7 +205,7 @@ UNARY_OPERATOR(-, negate)
#define BINARY_OPERATOR_FF(Type1, Type2, op, opFunc) \ #define BINARY_OPERATOR_FF(Type1, Type2, op, opFunc) \
\ \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const CoeffField<Type1>& f1, \ const CoeffField<Type1>& f1, \
const Type2& f2 \ const Type2& f2 \
@ -216,7 +218,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
\ \
\ \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const CoeffField<Type1>& f1, \ const CoeffField<Type1>& f1, \
const Field<Type2>& f2 \ const Field<Type2>& f2 \
@ -229,7 +231,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
\ \
\ \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const Field<Type2>& f1, \ const Field<Type2>& f1, \
const CoeffField<Type1>& f2 \ const CoeffField<Type1>& f2 \
@ -242,7 +244,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
#define BINARY_OPERATOR_FTR(Type1, Type2, op, opFunc) \ #define BINARY_OPERATOR_FTR(Type1, Type2, op, opFunc) \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const CoeffField<Type1>& f1, \ const CoeffField<Type1>& f1, \
const tmp<Field<Type2> >& tf2 \ const tmp<Field<Type2> >& tf2 \
@ -255,7 +257,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
#define BINARY_OPERATOR_FT(Type1, Type2, op, opFunc) \ #define BINARY_OPERATOR_FT(Type1, Type2, op, opFunc) \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const Field<Type1>& f1, \ const Field<Type1>& f1, \
const tmp<CoeffField<Type2> >& tf2 \ const tmp<CoeffField<Type2> >& tf2 \
@ -268,7 +270,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
#define BINARY_OPERATOR_TRF(Type1, Type2, op, opFunc) \ #define BINARY_OPERATOR_TRF(Type1, Type2, op, opFunc) \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const tmp<CoeffField<Type1> >& tf1, \ const tmp<CoeffField<Type1> >& tf1, \
const Field<Type2>& f2 \ const Field<Type2>& f2 \
@ -281,7 +283,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
#define BINARY_OPERATOR_TF(Type1, Type2, op, opFunc) \ #define BINARY_OPERATOR_TF(Type1, Type2, op, opFunc) \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const tmp<CoeffField<Type1> >& tf1, \ const tmp<CoeffField<Type1> >& tf1, \
const Field<Type2>& f2 \ const Field<Type2>& f2 \
@ -294,7 +296,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
#define BINARY_OPERATOR_TRT(Type1, Type2, op, opFunc) \ #define BINARY_OPERATOR_TRT(Type1, Type2, op, opFunc) \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const tmp<CoeffField<Type1> >& tf1, \ const tmp<CoeffField<Type1> >& tf1, \
const tmp<Field<Type2> >& tf2 \ const tmp<Field<Type2> >& tf2 \
@ -308,7 +310,7 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
#define BINARY_OPERATOR_TTR(Type1, Type2, op, opFunc) \ #define BINARY_OPERATOR_TTR(Type1, Type2, op, opFunc) \
template<class Type> \ template<class Type> \
Foam::tmp<Foam::Field<Type> > Foam::operator op \ tmp<Field<Type> > operator op \
( \ ( \
const tmp<Field<Type1> >& tf1, \ const tmp<Field<Type1> >& tf1, \
const tmp<CoeffField<Type2> >& tf2 \ const tmp<CoeffField<Type2> >& tf2 \
@ -330,6 +332,8 @@ Foam::tmp<Foam::Field<Type> > Foam::operator op \
// HJ, 17/Jun/2010 // HJ, 17/Jun/2010
BINARY_OPERATOR_R(Type, Type, *, multiply) BINARY_OPERATOR_R(Type, Type, *, multiply)
} // namespace Foam
#undef BINARY_OPERATOR_R #undef BINARY_OPERATOR_R
#undef BINARY_OPERATOR_FF #undef BINARY_OPERATOR_FF
#undef BINARY_OPERATOR_FTR #undef BINARY_OPERATOR_FTR

2
wmake/rules/darwinIntel64Clang/ARCHITECTURE_TESTED
View file

@ -1 +1 @@
by bgschaid. 2010-10-05 by bgschaid. 2014-05-30

2
wmake/rules/darwinIntel64Clang/c++
View file

@ -9,7 +9,7 @@ include $(RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-200 ptFLAGS = -DNoRepository -ftemplate-depth-200
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -Ddarwin c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -Ddarwin -I/opt/local/include
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@ Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
cxxtoo = $(Ctoo) cxxtoo = $(Ctoo)