zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: Multiple changes - first clean build after latest merge - UNTESTED

Browse Source
This commit is contained in:
Andrew Heather
2016-09-23 15:36:53 +01:00
parent 9fbd612672
commit b9940cbbb1
311 changed files with 4119 additions and 6540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.C
View File

@ -199,7 +199,7 @@ bool Foam::functionObjects::fieldValues::volFieldValue::write()
{
WarningInFunction
<< "Requested field " << fieldName
<< " not found in database and not ok"
<< " not found in database and not processed"
<< endl;
}
}

2
src/functionObjects/field/fieldValues/volFieldValue/volFieldValue.H
View File

@ -173,7 +173,7 @@ protected:
//- Insert field values into values list
template<class Type>
tmp<Field<Type>> setFieldValues
tmp<Field<Type>> getFieldValues
(
const word& fieldName,
const bool mustGet = false

9
src/functionObjects/field/fieldValues/volFieldValue/volFieldValueTemplates.C
View File

@ -47,7 +47,7 @@ bool Foam::functionObjects::fieldValues::volFieldValue::validField
template<class Type>
Foam::tmp<Foam::Field<Type>>
Foam::functionObjects::fieldValues::volFieldValue::setFieldValues
Foam::functionObjects::fieldValues::volFieldValue::getFieldValues
(
const word& fieldName,
const bool mustGet
@ -171,7 +171,7 @@ Type Foam::functionObjects::fieldValues::volFieldValue::processValues
template<class Type>
bool Foam::functionObjects::fieldValues::volFieldValue::writeValues
(
const word& fieldName
const word& fieldName,
const scalarField& weightField
)
{
@ -179,7 +179,7 @@ bool Foam::functionObjects::fieldValues::volFieldValue::writeValues
if (ok)
{
Field<Type> values(setFieldValues<Type>(fieldName));
Field<Type> values(getFieldValues<Type>(fieldName));
scalarField V(filterField(fieldValue::mesh_.V()));
if (writeFields_)
@ -218,7 +218,8 @@ bool Foam::functionObjects::fieldValues::volFieldValue::writeValues
// Write state/results information
const word& opName = operationTypeNames_[operation_];
word resultName = opName + '(' + sourceName_ + ',' + fieldName + ')';
word resultName =
opName + '(' + volRegion::regionName_ + ',' + fieldName + ')';
this->setResult(resultName, result);
}