diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd50 b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd50 index d81c720e4b0e44d8cbcb72a9c19d02371c0b5f88..493bc1e3414ba85c11c3e64d0d79d9ab3f48168c 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd50 +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd50 @@ -4,7 +4,7 @@ stdmd50 { ${stdmd01} - field UMean_movingAverageWindow; + field fieldAverage2:UMean_movingAverageWindow; } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd51 b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd51 index e1a1ede7dc92182d0066d4c86243faac78033a2d..910c9e6c6c7711e37fc8aeee3018c2cfa1ab1289 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd51 +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd51 @@ -4,7 +4,7 @@ stdmd51 { ${stdmd01} - field UMean_movingAverageWindow; + field fieldAverage2:UMean_movingAverageWindow; region coarseMesh; } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd52 b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd52 index d973a0a7726ce2a4509246ccbbf429a85af75761..097becb17ef49ce4304a71644b8a6d93da4f210d 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd52 +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd52 @@ -4,7 +4,7 @@ stdmd52 { ${stdmd01} - field UMean_movingAverageWindow; + field fieldAverage2:UMean_movingAverageWindow; patch cylinder; } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd53 b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd53 index fe0b17be5d8df59d53474b142d69df755e6437b9..f8cf46f996779e9709948004c1dff6f060b4f035 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd53 +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd53 @@ -4,7 +4,7 @@ stdmd53 { ${stdmd01} - field UMean_movingAverageWindow; + field fieldAverage2:UMean_movingAverageWindow; patch outlet; } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd54 b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd54 index 82cdec2866de394de7c7ec334f3179aeec55171e..9e7a57a1ffb90201b07748754676dc4b9719356a 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd54 +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd54 @@ -4,7 +4,7 @@ stdmd54 { ${stdmd01} - field UMean_movingAverageWindow; + field fieldAverage2:UMean_movingAverageWindow; maxRank 10; } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd55 b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd55 index 314d5af9c11195ec90d71a814b8d593cba94dfd5..133e1ddf325e5b5a7d5bc505a2f93aad22ece518 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd55 +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd55 @@ -4,7 +4,7 @@ stdmd55 { ${stdmd01} - field UMean_movingAverageWindow; + field fieldAverage2:UMean_movingAverageWindow; maxRank 5; region coarseMesh; } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd56 b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd56 index b91b8eb106613f925d1036aad094053e3a0027f1..c419f49f3975c94bc5fd8b910d56dff47fd4fee8 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd56 +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/DMDs/stdmd56 @@ -4,7 +4,7 @@ stdmd56 { ${stdmd01} - field UMean_movingAverageWindow; + field fieldAverage2:UMean_movingAverageWindow; patch outlet; maxRank 2; } diff --git a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict index aacc1f829d3867c9d8256ba85ba238a844bfc13d..03880051da7589e2784041c311e3d998519423a8 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/laminar/cylinder2D/system/controlDict @@ -52,17 +52,6 @@ functions fields ( - U - { - mean on; - prime2Mean off; - base time; - windowType exact; - window 0.25; - windowName movingAverageWindow; - allowRestart no; - } - U { mean on; @@ -84,6 +73,32 @@ functions writeControl onEnd; } + fieldAverage2 + { + type fieldAverage; + libs (fieldFunctionObjects); + + fields + ( + U + { + mean on; + prime2Mean off; + base time; + windowType exact; + window 0.25; + windowName movingAverageWindow; + allowRestart no; + } + ); + + useNamePrefix true; + timeStart 10; + executeControl timeStep; + executeInterval 1; + writeControl onEnd; + } + mapFields1 { type mapFields; @@ -118,7 +133,7 @@ functions pMean UPrime2Mean pPrime2Mean - UMean_movingAverageWindow + fieldAverage2:UMean_movingAverageWindow ); } @@ -189,13 +204,13 @@ functions // #include "DMDs/stdmd48" // field=UPrime2Mean, region=coarseMesh, maxRank=5 #include "DMDs/stdmd49" // field=UPrime2Mean, patch=outlet, maxRank=2 - #include "DMDs/stdmd50" // field=UMean_movingAverageWindow - // #include "DMDs/stdmd51" // field=UMean_movingAverageWindow, region=coarseMesh - #include "DMDs/stdmd52" // field=UMean_movingAverageWindow, patch=cylinder - #include "DMDs/stdmd53" // field=UMean_movingAverageWindow, patch=outlet - #include "DMDs/stdmd54" // field=UMean_movingAverageWindow, maxRank=10 - // #include "DMDs/stdmd55" // field=UMean_movingAverageWindow, region=coarseMesh, maxRank=5 - #include "DMDs/stdmd56" // field=UMean_movingAverageWindow, patch=outlet, maxRank=2 + #include "DMDs/stdmd50" // field=fieldAverage2:UMean_movingAverageWindow + // #include "DMDs/stdmd51" // field=fieldAverage2:UMean_movingAverageWindow, region=coarseMesh + #include "DMDs/stdmd52" // field=fieldAverage2:UMean_movingAverageWindow, patch=cylinder + #include "DMDs/stdmd53" // field=fieldAverage2:UMean_movingAverageWindow, patch=outlet + #include "DMDs/stdmd54" // field=fieldAverage2:UMean_movingAverageWindow, maxRank=10 + // #include "DMDs/stdmd55" // field=fieldAverage2:UMean_movingAverageWindow, region=coarseMesh, maxRank=5 + #include "DMDs/stdmd56" // field=fieldAverage2:UMean_movingAverageWindow, patch=outlet, maxRank=2 #include "DMDs/stdmd57" // field=yPlus #include "DMDs/stdmd58" // field=yPlus, patch=cylinder