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: git merge with master conflict resolution

Browse Source
This commit is contained in:
andy
2010-10-27 14:47:24 +01:00
parent 0f2a8150da 2a44f763cd
commit 3e5a47dbb5
28 changed files with 1020 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
applications/utilities/mesh/manipulation/setSet/setSet.C
View File

@ -934,18 +934,31 @@ int main(int argc, char *argv[])
{
char* linePtr = readline("readline>");
rawLine = string(linePtr);
if (*linePtr)
if (linePtr)
{
add_history(linePtr);
write_history(historyFile);
}
rawLine = string(linePtr);
free(linePtr); // readline uses malloc, not new.
if (*linePtr)
{
add_history(linePtr);
write_history(historyFile);
}
free(linePtr); // readline uses malloc, not new.
}
else
{
break;
}
}
# else
{
if (!std::cin.good())
{
Info<< "End of cin" << endl;
// No error.
break;
}
Info<< "Command>" << flush;
std::getline(std::cin, rawLine);
}

4
applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
View File

@ -68,13 +68,13 @@ namespace Foam
functionObjectList fol(runTime, dict);
fol.start();
fol.execute();
fol.execute(true); // override outputControl - force writing
}
else
{
functionObjectList fol(runTime);
fol.start();
fol.execute();
fol.execute(true); // override outputControl - force writing
}
}
}