Merge branch 'olesenm'

This commit is contained in:
andy
2010-07-27 16:44:02 +01:00
11 changed files with 168 additions and 81 deletions

View File

@ -206,8 +206,8 @@ int main(int argc, char *argv[])
{
const word csName = args["from"];
label csId = csLst.find(csName);
if (csId < 0)
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
<< "Cannot find -from " << csName << nl
@ -215,15 +215,15 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
fromCsys.reset(new coordinateSystem(csLst[csId]));
fromCsys.reset(new coordinateSystem(csLst[csIndex]));
}
if (args.optionFound("to"))
{
const word csName = args["to"];
label csId = csLst.find(csName);
if (csId < 0)
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
<< "Cannot find -to " << csName << nl
@ -231,7 +231,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
toCsys.reset(new coordinateSystem(csLst[csId]));
toCsys.reset(new coordinateSystem(csLst[csIndex]));
}

View File

@ -195,8 +195,8 @@ int main(int argc, char *argv[])
{
const word csName = args["from"];
label csId = csLst.find(csName);
if (csId < 0)
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
<< "Cannot find -from " << csName << nl
@ -204,15 +204,15 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
fromCsys.reset(new coordinateSystem(csLst[csId]));
fromCsys.reset(new coordinateSystem(csLst[csIndex]));
}
if (args.optionFound("to"))
{
const word csName = args["to"];
label csId = csLst.find(csName);
if (csId < 0)
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
<< "Cannot find -to " << csName << nl
@ -220,7 +220,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
toCsys.reset(new coordinateSystem(csLst[csId]));
toCsys.reset(new coordinateSystem(csLst[csIndex]));
}

View File

@ -208,8 +208,8 @@ int main(int argc, char *argv[])
{
const word csName = args["from"];
label csId = csLst.find(csName);
if (csId < 0)
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
<< "Cannot find -from " << csName << nl
@ -217,15 +217,15 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
fromCsys.reset(new coordinateSystem(csLst[csId]));
fromCsys.reset(new coordinateSystem(csLst[csIndex]));
}
if (args.optionFound("to"))
{
const word csName = args["to"];
label csId = csLst.find(csName);
if (csId < 0)
const label csIndex = csLst.findIndex(csName);
if (csIndex < 0)
{
FatalErrorIn(args.executable())
<< "Cannot find -to " << csName << nl
@ -233,7 +233,7 @@ int main(int argc, char *argv[])
<< exit(FatalError);
}
toCsys.reset(new coordinateSystem(csLst[csId]));
toCsys.reset(new coordinateSystem(csLst[csIndex]));
}