diff --git a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFZones b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFProperties
similarity index 95%
rename from tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFZones
rename to tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFProperties
index de81c73439850dabae0c51d6f0b899921f752af6..fd749d03963870c76ab4a9d85ad86bd95c33a71f 100644
--- a/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFZones
+++ b/tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/MRFProperties
@@ -11,11 +11,10 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-0
-()
+// none
// ************************************************************************* //
diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties
similarity index 78%
rename from tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
rename to tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties
index 87c1c43c6e53899dface499629ccdabbb6fe4638..3782a377cd79bf07dfc62e29c4078b5dfaa935b9 100644
--- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties
@@ -11,21 +11,20 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
+zone1
+{
+ cellZone rotor;
+
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
- origin (0 0 0);
- axis (0 0 1);
- omega 104.72;
- }
-)
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 1047.2;
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/MRFProperties
similarity index 95%
rename from tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones
rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/MRFProperties
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..fd749d03963870c76ab4a9d85ad86bd95c33a71f 100644
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/MRFProperties
@@ -11,10 +11,10 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-0()
+// none
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/MRFZones b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/MRFProperties
similarity index 95%
rename from tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/MRFZones
rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/MRFProperties
index de81c73439850dabae0c51d6f0b899921f752af6..fd749d03963870c76ab4a9d85ad86bd95c33a71f 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/MRFZones
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/MRFProperties
@@ -11,11 +11,10 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-0
-()
+// none
// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFProperties
similarity index 76%
rename from tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
rename to tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFProperties
index 7c255d51dbd08c0f3030bc8a50faa4c1a4f6a28a..623823d3ab9ee5cc818a1b745aa3cc9cceefd2a9 100644
--- a/tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFProperties
@@ -11,21 +11,21 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
+zone1
+{
+ cellZone rotor;
+ active yes;
+
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
- origin (0 0 0);
- axis (0 0 1);
- omega constant 1047.2;
- }
-)
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 104.72;
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..956389e755fcd819f23b29ba167b214fdcb8309e
--- /dev/null
+++ b/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+zone1
+{
+ cellZone rotor;
+ active yes;
+
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
+
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 6.2831853;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..956389e755fcd819f23b29ba167b214fdcb8309e
--- /dev/null
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+zone1
+{
+ cellZone rotor;
+ active yes;
+
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
+
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 6.2831853;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones
deleted file mode 100644
index ec52208dc086647fac0e39ddc1c8c7f582f549e7..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
-
- origin (0 0 0);
- axis (0 0 1);
- omega constant 6.2831853;
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFProperties
similarity index 95%
rename from tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/MRFZones
rename to tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFProperties
index de81c73439850dabae0c51d6f0b899921f752af6..fd749d03963870c76ab4a9d85ad86bd95c33a71f 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/MRFZones
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFProperties
@@ -11,11 +11,10 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-0
-()
+// none
// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFProperties b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd749d03963870c76ab4a9d85ad86bd95c33a71f
--- /dev/null
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// none
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones
deleted file mode 100644
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones
+++ /dev/null
@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-0()
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties
similarity index 76%
rename from tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones
rename to tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties
index d1c9dd95d9f98bd6f5052a6c28b7fff8d3edaba0..8712458a97f59faf84c16b1cfe8d6da06bd442b7 100644
--- a/tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones
+++ b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties
@@ -11,21 +11,21 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
+zone1
+{
+ cellZone rotor;
+ active yes;
+
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
- origin (0 0 0);
- axis (0 0 1);
- omega constant 104.72;
- }
-)
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 10.472;
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
deleted file mode 100644
index 7dd518ca65d8ab7e3c12ffd41ff52ad35244c701..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
-
- origin (0 0 0);
- axis (0 0 1);
- omega constant 10.472;
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd749d03963870c76ab4a9d85ad86bd95c33a71f
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// none
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFZones b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFZones
deleted file mode 100644
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFZones
+++ /dev/null
@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-0()
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd749d03963870c76ab4a9d85ad86bd95c33a71f
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// none
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFZones b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFZones
deleted file mode 100644
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFZones
+++ /dev/null
@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-0()
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd749d03963870c76ab4a9d85ad86bd95c33a71f
--- /dev/null
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// none
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFZones b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFZones
deleted file mode 100644
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFZones
+++ /dev/null
@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-0()
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
similarity index 76%
rename from tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFZones
rename to tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
index ec52208dc086647fac0e39ddc1c8c7f582f549e7..8712458a97f59faf84c16b1cfe8d6da06bd442b7 100644
--- a/tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFZones
+++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties
@@ -11,21 +11,21 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object MRFZones;
+ object MRFProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
+zone1
+{
+ cellZone rotor;
+ active yes;
+
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
- origin (0 0 0);
- axis (0 0 1);
- omega constant 6.2831853;
- }
-)
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 10.472;
+}
// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
deleted file mode 100644
index 7dd518ca65d8ab7e3c12ffd41ff52ad35244c701..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
-
- origin (0 0 0);
- axis (0 0 1);
- omega constant 10.472;
- }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd749d03963870c76ab4a9d85ad86bd95c33a71f
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// none
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones
deleted file mode 100644
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones
+++ /dev/null
@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-0()
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd749d03963870c76ab4a9d85ad86bd95c33a71f
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// none
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones
deleted file mode 100644
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones
+++ /dev/null
@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-0()
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..fd749d03963870c76ab4a9d85ad86bd95c33a71f
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// none
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones
deleted file mode 100644
index 0034a58c2293992131cec848f2dcb0f8ad50a0d4..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones
+++ /dev/null
@@ -1,20 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-0()
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties
new file mode 100644
index 0000000000000000000000000000000000000000..8712458a97f59faf84c16b1cfe8d6da06bd442b7
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object MRFProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+zone1
+{
+ cellZone rotor;
+ active yes;
+
+ // Fixed patches (by default they 'move' with the MRF zone)
+ nonRotatingPatches ();
+
+ origin (0 0 0);
+ axis (0 0 1);
+ omega constant 10.472;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones b/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
deleted file mode 100644
index 7dd518ca65d8ab7e3c12ffd41ff52ad35244c701..0000000000000000000000000000000000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object MRFZones;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
- rotor
- {
- // Fixed patches (by default they 'move' with the MRF zone)
- nonRotatingPatches ();
-
- origin (0 0 0);
- axis (0 0 1);
- omega constant 10.472;
- }
-)
-
-// ************************************************************************* //