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

GIT: Resolved merge conflict

Browse Source
This commit is contained in:
Andrew Heather
2016-12-12 12:23:45 +00:00
parent e2cdac590f 1a9ee8f07b
commit 989883d62b
18 changed files with 253 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,7 @@ bool Foam::functionObjects::fieldValue::read(const dictionary& dict)
dict.lookup("fields") >> fields_;
dict.lookup("writeFields") >> writeFields_;
dict.readIfPresent("scaleFactor", scaleFactor_);
scaleFactor_ = dict.lookupOrDefault<scalar>("scaleFactor", 1.0);
return true;
}

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

@ -70,7 +70,7 @@ protected:
// Protected data
//- Optional scale value
//- Optional scaling factor
scalar scaleFactor_;
//- Construction dictionary