From dec670d2f36727f1e84e4e176af75bb0e83b5c52 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 30 Oct 2012 08:22:11 +0000
Subject: [PATCH] ENH: Updated MRF tutorials
---
.../constant/{MRFZones => MRFProperties} | 5 ++-
.../mixerVessel2D/constant/MRFProperties} | 23 +++++++-------
.../constant/MRFProperties} | 4 +--
.../constant/MRFProperties} | 5 ++-
.../mixerVesselAMI2D/constant/MRFProperties} | 24 +++++++-------
.../mixerVessel2D/constant/MRFProperties | 31 +++++++++++++++++++
.../mixerVessel2D/constant/MRFProperties | 31 +++++++++++++++++++
.../mixerVessel2D/constant/MRFZones | 31 -------------------
.../bubbleColumn/constant/MRFProperties} | 5 ++-
.../fluidisedBed/constant/MRFProperties | 20 ++++++++++++
.../fluidisedBed/constant/MRFZones | 20 ------------
.../mixerVessel2D/constant/MRFProperties} | 24 +++++++-------
.../mixerVessel2D/constant/MRFZones | 31 -------------------
.../bubbleColumn/constant/MRFProperties | 20 ++++++++++++
.../bubbleColumn/constant/MRFZones | 20 ------------
.../damBreak4phase/constant/MRFProperties | 20 ++++++++++++
.../damBreak4phase/constant/MRFZones | 20 ------------
.../damBreak4phaseFine/constant/MRFProperties | 20 ++++++++++++
.../damBreak4phaseFine/constant/MRFZones | 20 ------------
.../mixerVessel2D/constant/MRFProperties} | 24 +++++++-------
.../mixerVessel2D/constant/MRFZones | 31 -------------------
.../bed/constant/MRFProperties | 20 ++++++++++++
.../twoPhaseEulerFoam/bed/constant/MRFZones | 20 ------------
.../bed2/constant/MRFProperties | 20 ++++++++++++
.../twoPhaseEulerFoam/bed2/constant/MRFZones | 20 ------------
.../bubbleColumn/constant/MRFProperties | 20 ++++++++++++
.../bubbleColumn/constant/MRFZones | 20 ------------
.../mixerVessel2D/constant/MRFProperties | 31 +++++++++++++++++++
.../mixerVessel2D/constant/MRFZones | 31 -------------------
29 files changed, 288 insertions(+), 323 deletions(-)
rename tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/constant/{MRFZones => MRFProperties} (95%)
rename tutorials/{incompressible/MRFSimpleFoam/mixerVessel2D/constant/MRFZones => compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFProperties} (78%)
rename tutorials/{multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFZones => compressible/rhoPorousMRFSimpleFoam/angledDuctExplicitFixedCoeff/constant/MRFProperties} (95%)
rename tutorials/compressible/rhoPorousMRFSimpleFoam/{angledDuctExplicitFixedCoeff/constant/MRFZones => angledDuctImplicit/constant/MRFProperties} (95%)
rename tutorials/{compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/constant/MRFZones => incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFProperties} (76%)
create mode 100644 tutorials/multiphase/MRFInterFoam/mixerVessel2D/constant/MRFProperties
create mode 100644 tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFProperties
delete mode 100644 tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/MRFZones
rename tutorials/{compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/MRFZones => multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/constant/MRFProperties} (95%)
create mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFProperties
delete mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/constant/MRFZones
rename tutorials/{incompressible/pimpleDyMFoam/mixerVesselAMI2D/constant/MRFZones => multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties} (76%)
delete mode 100644 tutorials/multiphase/compressibleTwoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
create mode 100644 tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFProperties
delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/MRFZones
create mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFProperties
delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/MRFZones
create mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFProperties
delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/MRFZones
rename tutorials/multiphase/{MRFInterFoam/mixerVessel2D/constant/MRFZones => multiphaseEulerFoam/mixerVessel2D/constant/MRFProperties} (76%)
delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/MRFZones
create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFProperties
delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed/constant/MRFZones
create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFProperties
delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/MRFZones
create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFProperties
delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/MRFZones
create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFProperties
delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/mixerVessel2D/constant/MRFZones
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 de81c734398..fd749d03963 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 87c1c43c6e5..3782a377cd7 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 0034a58c229..fd749d03963 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 de81c734398..fd749d03963 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 7c255d51dbd..623823d3ab9 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 00000000000..956389e755f
--- /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 00000000000..956389e755f
--- /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 ec52208dc08..00000000000
--- 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 de81c734398..fd749d03963 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 00000000000..fd749d03963
--- /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 0034a58c229..00000000000
--- 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 d1c9dd95d9f..8712458a97f 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 7dd518ca65d..00000000000
--- 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 00000000000..fd749d03963
--- /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 0034a58c229..00000000000
--- 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 00000000000..fd749d03963
--- /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 0034a58c229..00000000000
--- 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 00000000000..fd749d03963
--- /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 0034a58c229..00000000000
--- 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 ec52208dc08..8712458a97f 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 7dd518ca65d..00000000000
--- 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 00000000000..fd749d03963
--- /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 0034a58c229..00000000000
--- 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 00000000000..fd749d03963
--- /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 0034a58c229..00000000000
--- 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 00000000000..fd749d03963
--- /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 0034a58c229..00000000000
--- 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 00000000000..8712458a97f
--- /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 7dd518ca65d..00000000000
--- 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;
- }
-)
-
-// ************************************************************************* //
--
GitLab