single operations only

src/postProcessing/foamCalcFunctions/field/components/components.C

@@ -57,8 +57,8 @@ Foam::calcTypes::components::~components()
 
 void Foam::calcTypes::components::init()
 {
-    Foam::argList::validArgs.append("components");
+    argList::validArgs.append("components");
-    argList::validArgs.append("fieldName1 .. fieldNameN");
+    argList::validArgs.append("fieldName");
 }
 
 
@@ -68,14 +68,7 @@ void Foam::calcTypes::components::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
+{}
-    if (args.additionalArgs().size() < 2)
-    {
-        Info<< nl << "must specify one or more fields" << nl;
-        args.printUsage();
-        FatalError.exit();
-    }
-}
 
 
 void Foam::calcTypes::components::calc
@@ -85,11 +78,7 @@ void Foam::calcTypes::components::calc
     const fvMesh& mesh
 )
 {
-    const stringList& params = args.additionalArgs();
+    const word& fieldName = args.additionalArgs()[1];
-
-    for (label fieldi=1; fieldi<params.size(); fieldi++)
-    {
-        const word fieldName(params[fieldi]);
 
     IOobject fieldHeader
     (
@@ -105,12 +94,7 @@ void Foam::calcTypes::components::calc
         bool processed = false;
 
         writeComponentFields<vector>(fieldHeader, mesh, processed);
-            writeComponentFields<sphericalTensor>
+        writeComponentFields<sphericalTensor>(fieldHeader, mesh, processed);
-            (
-                fieldHeader,
-                mesh,
-                processed
-            );
         writeComponentFields<symmTensor>(fieldHeader, mesh, processed);
         writeComponentFields<tensor>(fieldHeader, mesh, processed);
 
@@ -127,7 +111,6 @@ void Foam::calcTypes::components::calc
     {
         Info<< "    No " << fieldName << endl;
     }
-    }
 }
 
 

src/postProcessing/foamCalcFunctions/field/div/div.C

@@ -57,8 +57,8 @@ Foam::calcTypes::div::~div()
 
 void Foam::calcTypes::div::init()
 {
-    Foam::argList::validArgs.append("div");
+    argList::validArgs.append("div");
-    argList::validArgs.append("fieldName1 .. fieldNameN");
+    argList::validArgs.append("fieldName");
 }
 
 
@@ -68,14 +68,7 @@ void Foam::calcTypes::div::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
+{}
-    if (args.additionalArgs().size() < 2)
-    {
-        Info<< nl << "must specify one or more fields" << nl;
-        args.printUsage();
-        FatalError.exit();
-    }
-}
 
 
 void Foam::calcTypes::div::calc
@@ -85,11 +78,7 @@ void Foam::calcTypes::div::calc
     const fvMesh& mesh
 )
 {
-    const stringList& params = args.additionalArgs();
+    const word& fieldName = args.additionalArgs()[1];
-
-    for (label fieldi=1; fieldi<params.size(); fieldi++)
-    {
-        const word fieldName(params[fieldi]);
 
     IOobject fieldHeader
     (
@@ -120,7 +109,6 @@ void Foam::calcTypes::div::calc
     {
         Info<< "    No " << fieldName << endl;
     }
-    }
 }
 
 

src/postProcessing/foamCalcFunctions/field/interpolate/interpolate.C

@@ -58,7 +58,7 @@ Foam::calcTypes::interpolate::~interpolate()
 void Foam::calcTypes::interpolate::init()
 {
     Foam::argList::validArgs.append("interpolate");
-    argList::validArgs.append("fieldName1 .. fieldNameN");
+    argList::validArgs.append("fieldName");
 }
 
 
@@ -68,14 +68,7 @@ void Foam::calcTypes::interpolate::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
+{}
-    if (args.additionalArgs().size() < 2)
-    {
-        Info<< nl << "must specify one or more fields" << nl;
-        args.printUsage();
-        FatalError.exit();
-    }
-}
 
 
 void Foam::calcTypes::interpolate::calc
@@ -85,11 +78,7 @@ void Foam::calcTypes::interpolate::calc
     const fvMesh& mesh
 )
 {
-    const stringList& params = args.additionalArgs();
+    const word& fieldName = args.additionalArgs()[1];
-
-    for (label fieldi=1; fieldi<params.size(); fieldi++)
-    {
-        const word fieldName(params[fieldi]);
 
     IOobject fieldHeader
     (
@@ -106,12 +95,7 @@ void Foam::calcTypes::interpolate::calc
 
         writeInterpolateField<scalar>(fieldHeader, mesh, processed);
         writeInterpolateField<vector>(fieldHeader, mesh, processed);
-            writeInterpolateField<sphericalTensor>
+        writeInterpolateField<sphericalTensor>(fieldHeader, mesh, processed);
-            (
-                fieldHeader,
-                mesh,
-                processed
-            );
         writeInterpolateField<symmTensor>(fieldHeader, mesh, processed);
         writeInterpolateField<tensor>(fieldHeader, mesh, processed);
 
@@ -128,7 +112,6 @@ void Foam::calcTypes::interpolate::calc
     {
         Info<< "    No " << fieldName << endl;
     }
-    }
 }
 
 

src/postProcessing/foamCalcFunctions/field/mag/mag.C

@@ -57,8 +57,8 @@ Foam::calcTypes::mag::~mag()
 
 void Foam::calcTypes::mag::init()
 {
-    Foam::argList::validArgs.append("mag");
+    argList::validArgs.append("mag");
-    argList::validArgs.append("fieldName1 .. fieldNameN");
+    argList::validArgs.append("fieldName");
 }
 
 
@@ -68,14 +68,7 @@ void Foam::calcTypes::mag::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
+{}
-    if (args.additionalArgs().size() < 2)
-    {
-        Info<< nl << "must specify one or more fields" << nl;
-        args.printUsage();
-        FatalError.exit();
-    }
-}
 
 
 void Foam::calcTypes::mag::calc
@@ -85,11 +78,7 @@ void Foam::calcTypes::mag::calc
     const fvMesh& mesh
 )
 {
-    const stringList& params = args.additionalArgs();
+    const word& fieldName = args.additionalArgs()[1];
-
-    for (label fieldi=1; fieldi<params.size(); fieldi++)
-    {
-        const word fieldName(params[fieldi]);
 
     IOobject fieldHeader
     (
@@ -123,7 +112,6 @@ void Foam::calcTypes::mag::calc
     {
         Info<< "    No " << fieldName << endl;
     }
-    }
 }
 
 

src/postProcessing/foamCalcFunctions/field/magGrad/magGrad.C

@@ -57,8 +57,8 @@ Foam::calcTypes::magGrad::~magGrad()
 
 void Foam::calcTypes::magGrad::init()
 {
-    Foam::argList::validArgs.append("magGrad");
+    argList::validArgs.append("magGrad");
-    argList::validArgs.append("fieldName1 .. fieldNameN");
+    argList::validArgs.append("fieldName");
 }
 
 
@@ -68,14 +68,7 @@ void Foam::calcTypes::magGrad::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
+{}
-    if (args.additionalArgs().size() < 2)
-    {
-        Info<< nl << "must specify one or more fields" << nl;
-        args.printUsage();
-        FatalError.exit();
-    }
-}
 
 
 void Foam::calcTypes::magGrad::calc
@@ -85,11 +78,7 @@ void Foam::calcTypes::magGrad::calc
     const fvMesh& mesh
 )
 {
-    const stringList& params = args.additionalArgs();
+    const word& fieldName = args.additionalArgs()[1];
-
-    for (label fieldi=1; fieldi<params.size(); fieldi++)
-    {
-        const word fieldName(params[fieldi]);
 
     IOobject fieldHeader
     (
@@ -120,7 +109,6 @@ void Foam::calcTypes::magGrad::calc
     {
         Info<< "    No " << fieldName << endl;
     }
-    }
 }
 
 

src/postProcessing/foamCalcFunctions/field/magSqr/magSqr.C

@@ -58,7 +58,7 @@ Foam::calcTypes::magSqr::~magSqr()
 void Foam::calcTypes::magSqr::init()
 {
     Foam::argList::validArgs.append("magSqr");
-    argList::validArgs.append("fieldName1 .. fieldNameN");
+    argList::validArgs.append("fieldName");
 }
 
 
@@ -68,14 +68,7 @@ void Foam::calcTypes::magSqr::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
+{}
-    if (args.additionalArgs().size() < 2)
-    {
-        Info<< nl << "must specify one or more fields" << nl;
-        args.printUsage();
-        FatalError.exit();
-    }
-}
 
 
 void Foam::calcTypes::magSqr::calc
@@ -85,11 +78,7 @@ void Foam::calcTypes::magSqr::calc
     const fvMesh& mesh
 )
 {
-    const stringList& params = args.additionalArgs();
+    const word& fieldName = args.additionalArgs()[1];
-
-    for (label fieldi=1; fieldi<params.size(); fieldi++)
-    {
-        const word fieldName(params[fieldi]);
 
     IOobject fieldHeader
     (
@@ -123,9 +112,9 @@ void Foam::calcTypes::magSqr::calc
     {
         Info<< "    No " << fieldName << endl;
     }
-    }
 }
 
 
+
 // ************************************************************************* //
 

src/postProcessing/foamCalcFunctions/field/randomise/randomise.C

@@ -59,7 +59,7 @@ void Foam::calcTypes::randomise::init()
 {
     argList::validArgs.append("randomise");
     argList::validArgs.append("perturbation");
-    argList::validArgs.append("fieldName1 .. fieldNameN");
+    argList::validArgs.append("fieldName");
 }
 
 
@@ -69,17 +69,7 @@ void Foam::calcTypes::randomise::preCalc
     const Time& runTime,
     const fvMesh& mesh
 )
-{
+{}
-    if (args.additionalArgs().size() < 3)
-    {
-        Info<< nl
-            << "must specify perturbation magnitude and one"
-            << "or more fields"
-            << nl;
-        args.printUsage();
-        FatalError.exit();
-    }
-}
 
 
 void Foam::calcTypes::randomise::calc
@@ -91,13 +81,10 @@ void Foam::calcTypes::randomise::calc
 {
     const stringList& params = args.additionalArgs();
     const scalar pertMag = readScalar(IStringStream(params[1])());
+    const word& fieldName = params[2];
 
     Random rand(1234567);
 
-    for (label fieldi=2; fieldi<params.size(); fieldi++)
-    {
-        const word fieldName(params[fieldi]);
-
     IOobject fieldHeader
     (
         fieldName,
@@ -157,7 +144,6 @@ void Foam::calcTypes::randomise::calc
     {
         Info<< "    No " << fieldName << endl;
     }
-    }
 }