Improved field inversion codes. (#345)

* Added DAkOmegaSSTfieldInversion model

* Added kOmegaSSTfieldInversion files in src/adjoint/model and added related code in make files

* Added new model kOmegaSSTfieldInversion

In the modified model a beta field (called betaFieldInversion) is multiplied to the production term of the omega transport equation.

* Renamed kOmegaSSTfieldInversion model to match OF convention

* Update DAkOmegaSSTFieldInversion.C

* fixed DAkOmegaSSTFieldInversion make error

* Revert "Update DAkOmegaSSTFieldInversion.C"

This reverts commit 314959f.

* betaFieldInversion modifies both k and omega equations

* Renamed SAFv3Beta model and fields for field inversion

* Unfinished codes for improving kOmegaSSTFieldInversion

* Update kOmegaSSTFieldInversion

* Replaced the name betaPrior with betaRefFieldInversion

* Fixed field naming issue in kOmegSSTFieldInversion

* Initial codes for surfaceFriction-based objective function

* Resolved some of the compilation errors from previous commit

* fixed typo in devReff

* Fixed some errors

* Fixed final compilation error.

* Fixed objective function based on surfaceFriction

* New formulation for surface friction calculation

* Preliminary codes for aeroCoeff type objFuncs

* Improvements to aeroCoeff loop

* Fixed aeroCoeff-based objective function, but debug still required!

* Fixed bugs in field inversion objective functions

* New FI objFunc  based on velocity profile data

* Preliminary codes for pressure-based data; buggy when running in parallel

* fixed bugs in SAFv3FI model

* latest from debug_solver

* Replaced everything with most recent updates from debug_solver

* Removed all old files.

* All the latest files.

* Latest

* Tests for FI turbulence models

* Update Allrun

* Scale CFD field before L2 norm

* Added shifted Cp objective function for PH case

* Added Allmake8 to compile with 8 processors

* Update Allmake8

* Added custom surface friction loop

* fixed surfaceFrictionCustom loop

* Added profileRefFieldInversion for kOmegaFI models

* Added profileRefFieldInversion for kOmegaFI models

* Fixed errors

* Fixed more errors

* Added all the FI fields for the kOmegaFI models

* Added codes to use wallShearStress data for field inversion

* initial scripts to test field inversion based on weighted objective function data term

* fixed Make files

* fixed compressible Make file

* more fixes to Make files

* Preliminary codes to use weights for surface data when calculating objective functions.

* fixed issues in last commit

* Change initial weightsObjFunc files

* Update DAObjFuncFieldInversion.C

* fixed weighted Cf/WSS/Cp loop

* more fixes

* Added adaptive weight computation for Cp-based objective function

* Fixed errors in last commit

* More fixes

* More fixes

* Adaptive weights for velocity profiles (preliminary)

* Fixed error

* Fixed error

* fixed error

* Adaptive weighted surface friction

* fixes

* Update DAObjFuncFieldInversion.C

* fixed errors from previous commit; added adaptiveWeightsSurfaceFriction

* -

* Fixed custom Cp loop to read pRef

* Added standard Spalart-Allmaras filed inversion

* Update DAkOmegaSSTFieldInversion.C

Removed perturbation of the omega transport equation.

* Update DASpalartAllmarasFieldInversion.C

* Update DAkOmegaSSTFieldInversion.C

* added k-epsilon field inversion with modification to the epsilon equation

* fixes

* fixed typo

* fixed error

* Added field inversion variables for the kOmegaSSTFieldInversion model.

* Added codes to use Reynolds stress components for kOmegaFieldInversionOmega model.

* fixed errors.

* fixed errors.

* Update DAkOmegaFieldInversionOmega.H

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Update DAObjFuncFieldInversion.C

* Fixed a problem in the test.

* Cleaned up features in development.

* Fixed error.

* Removed .vscode

* Added regression test for kOmegaSSTFieldInversion

* Added Allmake8

* Added regression tests for field inversion objective functions.

* Added regression tests for field inversion objective functions.

* Update Allmake8

* FI objective function with pressure profiles

* Fixed error

* Update DAObjFuncFieldInversion.C

* Improved codes for field inversion with Cp data

* fixed bracket error

* fixed bracket error

* Update DAObjFuncFieldInversion.C

* fixed FI Cp loop for parallel runs

* fixed FI Cp loop for parallel runs

* Added capability to use discrete velocity data for field inversion where any component can be used

* Added capability to use discrete velocity data for field inversion where any component can be used

* Update DAObjFuncFieldInversion.C

* Improved field inversion codes. Still need to fix test scripts.

* Update DAObjFuncFieldInversion.C

* Fixed test scripts.

* Update DAFoam_Test_DASimpleFoamFieldRef.txt

* Update DAObjFuncFieldInversion.C

* Brought back betaFieldInversion requirement initially

* Update SpalartAllmarasFv3FieldInversion.H

* Updates kOmegaFieldInversionOmega and kOmegaSSTFieldInversion models, and fixed DASimpleFoamField test ref.

* Added tests, and renamed field inversion objective function for skin friction in periodic hill flow

* Removed Allmake8

* Added comments in DAObjFuncFieldInversion.C

* Updated DASimpleFoamFieldInversionObjectiveFunctionRef.txt

Co-authored-by: Ping He <[email protected]>

Author: omid-bidar

src/adjoint/DAModel/DATurbulenceModel/DASpalartAllmarasFv3FieldInversion.C

@@ -106,20 +106,16 @@ DASpalartAllmarasFv3FieldInversion::DASpalartAllmarasFv3FieldInversion(
           nuTildaRes_),
       betaFieldInversion_(const_cast<volScalarField&>(
           mesh.thisDb().lookupObject<volScalarField>("betaFieldInversion"))),
-      betaRefFieldInversion_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("betaRefFieldInversion"))),
-      varRefFieldInversion_(const_cast<volVectorField&>(
-          mesh.thisDb().lookupObject<volVectorField>("varRefFieldInversion"))),
+      UData_(const_cast<volVectorField&>(
+          mesh.thisDb().lookupObject<volVectorField>("UData"))),
       surfaceFriction_(const_cast<volScalarField&>(
           mesh.thisDb().lookupObject<volScalarField>("surfaceFriction"))),
-      surfaceFrictionRef_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("surfaceFrictionRef"))),
-      surfacePressureRef_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("surfacePressureRef"))),
-      profileRefFieldInversion_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("profileRefFieldInversion"))),
-      //TauDNS_(const_cast<volSymmTensorField&>(
-      //   mesh.thisDb().lookupObject<volSymmTensorField>("TauDNS"))),
+      surfaceFrictionData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("surfaceFrictionData"))),
+      pData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("pData"))),
+      USingleComponentData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("USingleComponentData"))),
       y_(mesh.thisDb().lookupObject<volScalarField>("yWall"))
 {
 

src/adjoint/DAModel/DATurbulenceModel/DASpalartAllmarasFv3FieldInversion.H

@@ -93,26 +93,20 @@ protected:
     /// A beta field multiplying to the production term
     volScalarField& betaFieldInversion_; 
 
-    /// a reference beta field
-    volScalarField betaRefFieldInversion_; 
-
-    /// reference field (e.g. velocity for DNS)
-    volVectorField& varRefFieldInversion_; 
-
-    /// reference Reynolds stress field
-    //volSymmTensorField TauDNS_;
+    /// reference velocity field
+    volVectorField UData_; 
 
     /// a surface friction 'field' when using skin friction data for field inversion
     volScalarField surfaceFriction_;
 
     /// the reference field for surfaceFriction
-    volScalarField surfaceFrictionRef_; 
+    volScalarField surfaceFrictionData_; 
 
-    /// the reference field for surfacePressure
-    volScalarField surfacePressureRef_; 
+    /// the reference field for pressure
+    volScalarField pData_; 
 
     /// reference field for profile data
-    volScalarField profileRefFieldInversion_; 
+    volScalarField USingleComponentData_; 
 
     /// 3D wall distance
     const volScalarField& y_;

src/adjoint/DAModel/DATurbulenceModel/DAkOmegaFieldInversionOmega.C

@@ -101,24 +101,19 @@ DAkOmegaFieldInversionOmega::DAkOmegaFieldInversionOmega(
 #endif
           zeroGradientFvPatchField<scalar>::typeName),
       /// field inversion parameters
+       /// field inversion parameters
       betaFieldInversion_(const_cast<volScalarField&>(
           mesh.thisDb().lookupObject<volScalarField>("betaFieldInversion"))),
-      betaRefFieldInversion_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("betaRefFieldInversion"))),
-      profileRefFieldInversion_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("profileRefFieldInversion"))),
       surfaceFriction_(const_cast<volScalarField&>(
           mesh.thisDb().lookupObject<volScalarField>("surfaceFriction"))),
-      surfaceFrictionRef_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("surfaceFrictionRef"))),
-      surfacePressureRef_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("surfacePressureRef"))),
-      varRefFieldInversion_(const_cast<volVectorField&>(
-          mesh.thisDb().lookupObject<volVectorField>("varRefFieldInversion"))),
-      tauDNS_(const_cast<volSymmTensorField&>(
-          mesh.thisDb().lookupObject<volSymmTensorField>("tauDNS"))),
-      tauRANS_(const_cast<volSymmTensorField&>(
-          mesh.thisDb().lookupObject<volSymmTensorField>("tauRANS"))) 
+      surfaceFrictionData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("surfaceFrictionData"))),
+      pData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("pData"))),
+      UData_(const_cast<volVectorField&>(
+          mesh.thisDb().lookupObject<volVectorField>("UData"))),
+      USingleComponentData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("USingleComponentData")))
 {
 
     // initialize printInterval_ we need to check whether it is a steady state

src/adjoint/DAModel/DATurbulenceModel/DAkOmegaFieldInversionOmega.H

@@ -111,29 +111,20 @@ protected:
     /// A beta field multiplying to the production term
     volScalarField& betaFieldInversion_; 
 
-    /// a reference beta field
-    volScalarField betaRefFieldInversion_; 
-
-    /// reference field for profile data
-    volScalarField profileRefFieldInversion_; 
-
     /// a surface friction 'field' when using skin friction data for field inversion
     volScalarField surfaceFriction_;
 
     /// the reference field for surfaceFriction
-    volScalarField surfaceFrictionRef_; 
+    volScalarField surfaceFrictionData_; 
 
     /// the reference field for surfacePressure
-    volScalarField surfacePressureRef_; 
+    volScalarField pData_; 
 
     /// reference field (e.g. velocity for DNS)
-    volVectorField& varRefFieldInversion_; 
-
-    /// reference Reynolds stress field
-    volSymmTensorField tauDNS_;
+    volVectorField UData_; 
 
-    /// RANS Reynolds stress field
-    volSymmTensorField tauRANS_;
+    /// the reference pressure field data
+    volScalarField USingleComponentData_;
 
 public:
     TypeName("kOmegaFieldInversionOmega");

src/adjoint/DAModel/DATurbulenceModel/DAkOmegaSSTFieldInversion.C

@@ -183,18 +183,16 @@ DAkOmegaSSTFieldInversion::DAkOmegaSSTFieldInversion(
    /// field inversion parameters
       betaFieldInversion_(const_cast<volScalarField&>(
           mesh.thisDb().lookupObject<volScalarField>("betaFieldInversion"))),
-      betaRefFieldInversion_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("betaRefFieldInversion"))),
-      profileRefFieldInversion_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("profileRefFieldInversion"))),
       surfaceFriction_(const_cast<volScalarField&>(
           mesh.thisDb().lookupObject<volScalarField>("surfaceFriction"))),
-      surfaceFrictionRef_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("surfaceFrictionRef"))),
-      surfacePressureRef_(const_cast<volScalarField&>(
-          mesh.thisDb().lookupObject<volScalarField>("surfacePressureRef"))),
-      varRefFieldInversion_(const_cast<volVectorField&>(
-          mesh.thisDb().lookupObject<volVectorField>("varRefFieldInversion"))),
+      surfaceFrictionData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("surfaceFrictionData"))),
+      pData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("pData"))),
+      UData_(const_cast<volVectorField&>(
+          mesh.thisDb().lookupObject<volVectorField>("UData"))),
+      USingleComponentData_(const_cast<volScalarField&>(
+          mesh.thisDb().lookupObject<volScalarField>("USingleComponentData"))),
       y_(mesh_.thisDb().lookupObject<volScalarField>("yWall")) 
 {
 

src/adjoint/DAModel/DATurbulenceModel/DAkOmegaSSTFieldInversion.H

@@ -178,23 +178,20 @@ protected:
     /// A beta field multiplying to the production term
     volScalarField& betaFieldInversion_; 
 
-    /// a reference beta field
-    volScalarField betaRefFieldInversion_; 
-
-    /// reference field for profile data
-    volScalarField profileRefFieldInversion_; 
-
     /// a surface friction 'field' when using skin friction data for field inversion
     volScalarField surfaceFriction_;
 
     /// the reference field for surfaceFriction
-    volScalarField surfaceFrictionRef_; 
+    volScalarField surfaceFrictionData_; 
 
     /// the reference field for surfacePressure
-    volScalarField surfacePressureRef_; 
+    volScalarField pData_; 
 
     /// reference field (e.g. velocity for DNS)
-    volVectorField& varRefFieldInversion_; 
+    volVectorField UData_; 
+
+    /// the reference pressure field data
+    volScalarField USingleComponentData_;
 
     /// Name of turbulent transport equation to modify: can be k, omega, or all
     /// if k OR omega is selected the field inversion modification is: ProdTerm(k or omega)*betaFieldInversion