GIT: Merge/resolve conflict

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties

@@ -36,6 +36,7 @@ solution
             U               semiImplicit 1;
             Yi              semiImplicit 1;
             h               semiImplicit 1;
+            radiation       semiImplicit 1;
         }
     }
 

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               semiImplicit 1;
             Yi              semiImplicit 1;
             h               semiImplicit 1;
+            radiation       semiImplicit 1;
         }
     }
 

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties

@@ -28,6 +28,7 @@ solution
         {
             U               explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution

@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                 |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/patchifyObstacles

@@ -1,11 +1,11 @@
 #!/bin/bash
-#--------------------------------*- C++ -*----------------------------------#
-# =========                 |                                               #
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox         #
-#  \\    /   O peration     | Version:  dev                                 #
-#   \\  /    A nd           | Web:      www.OpenFOAM.org                    #
-#    \\/     M anipulation  |                                               #
-#---------------------------------------------------------------------------#
+#--------------------------------*- C++ -*------------------------------------#
+# =========                 |                                                 #
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           #
+#  \\    /   O peration     | Version:  dev                                   #
+#   \\  /    A nd           | Web:      www.OpenFOAM.org                      #
+#    \\/     M anipulation  |                                                 #
+#-----------------------------------------------------------------------------#
 cd ${0%/*} || exit 1    # run from this directory
 
 x0=0.4

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }
 

tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties

@@ -30,6 +30,7 @@ solution
             U               explicit 1;
             Yi              explicit 1;
             h               explicit 1;
+            radiation       explicit 1;
         }
     }