coneInjection: Combined cone and coneNozzle injections

coneInjection has been extended to include the functionality of
coneNozzleInjection, and the latter has been removed.

Some parameters have changed names. The "positionAxis" entry from
coneInjection has been removed in preferance of coneNozzleInjection's
single "position" and "direction" entries. This means that only one
injection site is possible per model (dictionary substitutions mean that
only minimal additions are required to add further injection sites with
the same parameters). The name of the velocity magnitude has been
standardised as "Umag" and "innerDiameter" and "outerDiamater" have been
renamed "dInner" and "dOuter" for consistency with the inner and outer
spray angles.

Velocity magnitude and diameters are no longer read when they are not
required.

The randomisation has been altered so that the injections generate a
uniform distribution on an cross section normal to the direction of
injection. Previously there was an unexplained bias towards the
centreline.

An example specification with a full list of parameters is shown below.

    injectionModels
    {
        model1
        {
            type            coneInjection;

            // Times
            SOI             0;
            duration        1;

            // Quantities
            massTotal       0; // <-- not used with these settings
            parcelBasisType fixed;
            parcelsPerSecond 1000000;
            flowRateProfile constant 1;
            nParticle       1;

            // Sizes
            sizeDistribution
            {
                type        fixedValue;
                fixedValueDistribution
                {
                    value   0.0025;
                }
            }

            // Geometry
            positions       (-0.15 -0.1 0);
            directions      (1 0 0);
            thetaInner      0;
            thetaOuter      45;
            // - Inject at a point
            injectionMethod point;
            // - Or, inject over a disc:
            /*
            injectionMethod disc;
            dInner          0;
            dOuter          0.05;
            */

            // Velocity
            // - Inject with constant velocity
            flowType        constantVelocity;
            Umag            1;
            // - Or, inject with flow rate and discharge coefficient
            //   This also requires massTotal, dInner and dOuter
            /*
            flowType        flowRateAndDischarge;
            Cd              0.9;
            */
            // - Or, inject at a pressure
            /*
            flowType        pressureDrivenVelocity;
            Pinj            10e5;
            */
        }

        model2
        {
            // The same as model1, but at a different position
            $model1;
            position        (-0.15 0.1 0);
        }
    }

tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties

@@ -77,15 +77,11 @@ subModels
             type            coneInjection;
             SOI             0.000;
             duration        20.000;
-            positionAxis
-            (
-                ((0.3 0.35 1.45) (0 0 -1))
-                ((0.6 0.35 1.45) (0 0 -1))
-            );
+            position        (0.3 0.35 1.45);
+            direction       (0 0 -1);
 
             massTotal       10;
-            parcelsPerInjector 20000;
-            parcelsPerSecond 500;
+            parcelsPerSecond 1000;
             parcelBasisType mass;
             flowRateProfile constant 0.1;
             Umag            constant 3.0;
@@ -104,6 +100,12 @@ subModels
                 }
             }
         }
+
+        model2
+        {
+            $model1;
+            position        (0.6 0.35 1.45);
+        }
     }
 
     dispersionModel none;

tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties

@@ -78,14 +78,14 @@ subModels
     {
         model1
         {
-            type            coneNozzleInjection;
+            type            coneInjection;
             SOI             0;
             massTotal       6.0e-6;
             parcelBasisType mass;
             injectionMethod disc;
             flowType        flowRateAndDischarge;
-            outerDiameter   1.9e-4;
-            innerDiameter   0;
+            dInner          0;
+            dOuter          1.9e-4;
             duration        1.25e-3;
             position        (0 0.0995 0);
             direction       (0 -1 0);