From e27c691fd295f994b6bfb5adbd790db3519ae09d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Jasi=C5=84ski?= <daniel.jasinski@gmail.com>
Date: Fri, 26 Jun 2015 16:52:13 +0200
Subject: [PATCH] dynamicRefineFvMesh: normalisation and gradient

---
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.C      | 63 ++++++++++++++++++++--
 .../dynamicRefineFvMesh/dynamicRefineFvMesh.H      |  4 ++
 2 files changed, 64 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
 mode change 100644 => 100755 src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H

diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
old mode 100644
new mode 100755
index fc8fcce..20130fe
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -33,6 +33,7 @@ License
 #include "pointFields.H"
 #include "sigFpe.H"
 #include "cellSet.H"
+#include "fvcGrad.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -1265,8 +1266,64 @@ bool Foam::dynamicRefineFvMesh::update()
         }
 
         const word fieldName(refineDict.lookup("field"));
+        const word base
+        (
+            refineDict.lookupOrDefault<word>("refinementBase","value")
+        );
+        const bool normalised(refineDict.lookupOrDefault("normalised",false));
+
+        tmp<volScalarField> tFld;
+
+        if(foundObject<volScalarField>(fieldName))
+        {
+            tFld = tmp<volScalarField>
+                   (
+                       new volScalarField
+                       (
+                           lookupObject<volScalarField>(fieldName)
+                       )
+                   );
+        }
+        else if(foundObject<volVectorField>(fieldName))
+        {
+            tFld = mag(lookupObject<volVectorField>(fieldName));
+        }
+        else
+        {
+            FatalErrorIn("dynamicRefineFvMesh::update()")
+                << "Field " << fieldName <<" does not exist."<< nl
+                << exit(FatalError);
+        }
+
+        if(base == "gradient")
+        {
+            tFld = mag(fvc::grad(tFld()));
+        }
+        else if(base != "value")
+        {
+            FatalErrorIn("dynamicRefineFvMesh::update()")
+                << "Illegal refinement base: " << base << nl
+                << "Valid options are: value, gradient." << nl
+                << exit(FatalError);
+        }
+
+        if(normalised)
+        {
+            dimensionedScalar fieldMin(min(tFld()));
+            dimensionedScalar fieldMax(max(tFld()));
 
-        const volScalarField& vFld = lookupObject<volScalarField>(fieldName);
+            scalar scale = fieldMax.value() - fieldMin.value();
+
+            // Normalise to near zero on constant fields
+            if(scale < VSMALL)
+            {
+                tFld().internalField() = 0.0;
+            }
+            else
+            {
+                tFld = (tFld() - fieldMin)/scale;
+            }
+        }
 
         const scalar lowerRefineLevel =
             readScalar(refineDict.lookup("lowerRefineLevel"));
@@ -1288,7 +1345,7 @@ bool Foam::dynamicRefineFvMesh::update()
         (
             lowerRefineLevel,
             upperRefineLevel,
-            vFld,
+            tFld(),
             refineCell
         );
 
@@ -1364,7 +1421,7 @@ bool Foam::dynamicRefineFvMesh::update()
                 (
                     unrefineLevel,
                     refineCell,
-                    maxCellField(vFld)
+                    maxCellField(tFld())
                 )
             );
 
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
old mode 100644
new mode 100755
index fc4db3b..7bee598
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.H
@@ -34,6 +34,10 @@ Description
         refineInterval  1;
         // Field to be refinement on
         field           alpha.water;
+        // Use value or gradient of the field (default=value)
+        refinementBase gradient;
+        // Normalise by extreme velues in the domain (default=false)
+        normalised true;
         // Refine field inbetween lower..upper
         lowerRefineLevel 0.001;
         upperRefineLevel 0.999;
-- 
1.9.1

/*--------------------------------*- 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    "system";
    object      controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

indicator
{
    // Load the library containing the 'coded' functionObject
    functionObjectLibs ("libutilityFunctionObjects.so");
    type coded;
    // Name of on-the-fly generated functionObject
    redirectType indicatorField;
    code
    #{
        if (!mesh().foundObject<volScalarField>("magGradMach"))
        {
            // Lookup alpha
            Info<< "Looking up field Mach\n" << endl;
            const volScalarField& Mach =
                mesh().lookupObject<volScalarField>("Mach");

            Info<< "Creating and storing field magGradMach\n" << endl;
            tmp<volScalarField> tmagGradMach(mag(fvc::grad(Mach)));
            volScalarField& magGradMach = tmagGradMach();

            magGradMach.rename("magGradMach");
            magGradMach.writeOpt() = IOobject::AUTO_WRITE;
            magGradMach.writeMinMax(Info);

            tmagGradMach.ptr()->store();

        }

        Info<< "Looking up field magGradMach\n" << endl;
        volScalarField& magGradMach = const_cast<volScalarField&>
        (
            mesh().lookupObject<volScalarField>("magGradMach")
        );

        Info<< "Looking up field Mach\n" << endl;
        const volScalarField& Mach =
            mesh().lookupObject<volScalarField>("Mach");

        magGradMach = mag(fvc::grad(Mach));
    #};
}

// ************************************************************************* //