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 conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 0e01c44129
2311 changed files with 44974 additions and 26547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -124,7 +124,7 @@ int main(int argc, char *argv[])
// disable inplace editing
if (importName == exportName)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Output file " << exportName << " would overwrite input file."
<< exit(FatalError);
}
@ -196,8 +196,7 @@ int main(int argc, char *argv[])
if (!csDictIoPtr->headerOk())
{
FatalErrorIn(args.executable())
<< "Cannot open coordinateSystems file\n "
FatalErrorInFunction
<< csDictIoPtr->objectPath() << nl
<< exit(FatalError);
}
@ -211,7 +210,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -from " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -227,7 +226,7 @@ int main(int argc, char *argv[])
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot find -to " << csName << nl
<< "available coordinateSystems: " << csLst.toc() << nl
<< exit(FatalError);
@ -240,8 +239,7 @@ int main(int argc, char *argv[])
// maybe fix this later
if (fromCsys.valid() && toCsys.valid())
{
FatalErrorIn(args.executable())
<< "Only allowed '-from' or '-to' option at the moment."
FatalErrorInFunction
<< exit(FatalError);
}
}