Vector exchange

include/Algorithm.h

@@ -9,6 +9,8 @@
 #ifndef Algorithm_h
 #define Algorithm_h
 
+#include<NaluParsing.h>
+
 #include <vector>
 
 namespace stk {
@@ -45,10 +47,12 @@ class Algorithm
 
   virtual void pre_work() {}
 
-  virtual void set_data(double theDouble) {}
+  virtual void set_data(double theDouble, double theSecondDouble = 0.0) {}
 
   virtual void set_data_alt(double theDouble) {}
 
+  virtual void set_data_vector(Velocity uVec) {}
+
   virtual void set_bool(bool theBool) {}
 
   Realm &realm_;

include/AssembleMomentumElemWallFunctionProjectedSolverAlgorithm.h

@@ -34,20 +34,23 @@ class AssembleMomentumElemWallFunctionProjectedSolverAlgorithm : public SolverAl
     stk::mesh::Part *part,
     EquationSystem *eqSystem,
     const bool &useShifted,
-    std::map<std::string, std::vector<std::vector<PointInfo *> > > &pointInfoMap,
+    std::map<std::string, std::vector<std::vector<std::pair<PointInfo *, PointInfo *> > > > &pointInfoMap,
     stk::mesh::Ghosting *wallFunctionGhosting);
   virtual ~AssembleMomentumElemWallFunctionProjectedSolverAlgorithm() {}
   virtual void initialize_connectivity();
   virtual void execute();
 
   const bool useShifted_;
-  std::map<std::string, std::vector<std::vector<PointInfo *> > > &pointInfoMap_;
+  std::map<std::string, std::vector<std::vector<std::pair<PointInfo *, PointInfo *> > > >&pointInfoMap_;
   stk::mesh::Ghosting *wallFunctionGhosting_;
 
   const double yplusCrit_;
   const double elog_;
   const double kappa_;
-
+  double exchangeAlphaTau_;
+  const double shiftedPiomelli_;
+  const double om_shiftedPiomelli_;
+
   VectorFieldType *velocity_;
   VectorFieldType *bcVelocity_;
   ScalarFieldType *density_;

include/ComputeWallFrictionVelocityProjectedAlgorithm.h

@@ -11,6 +11,7 @@
 
 #include<Algorithm.h>
 #include<PointInfo.h>
+#include<NaluParsing.h>
 #include<FieldTypeDef.h>
 
 // stk
@@ -41,19 +42,23 @@ class ComputeWallFrictionVelocityProjectedAlgorithm : public Algorithm
   ComputeWallFrictionVelocityProjectedAlgorithm(
     Realm &realm,
     stk::mesh::Part *part,
+    const double wallNormalProjectedDistance,
     const double projectedDistance,
+    const Velocity projectedDistanceUnitNormal,
     const double odeFac,
     const bool useShifted,
-    std::map<std::string, std::vector<std::vector<PointInfo *> > > &pointInfoMap,
+    std::map<std::string, std::vector<std::vector<std::pair<PointInfo *, PointInfo *> > > > &pointInfoMap,
     stk::mesh::Ghosting *wallFunctionGhosting);
   virtual ~ComputeWallFrictionVelocityProjectedAlgorithm();
 
   void execute();
 
   void set_data( 
-    double theDouble);
+    double theDouble, double theSecondDouble);
   void set_data_alt( 
     double theDouble);
+  void set_data_vector( 
+    Velocity theVec);
 
   void compute_utau(
       const double &up, const double &yp,
@@ -65,7 +70,7 @@ class ComputeWallFrictionVelocityProjectedAlgorithm : public Algorithm
       const double &muWall, PointInfo *pInfo, double &utau, bool &converged);
 
   // debug
-  void provide_output(const PointInfo *pInfo, const bool problemPoint);
+  void provide_output(const PointInfo *pInfo, const bool problemPoint, const int firstSecond);
 
   // ghosting and initialization set of calls
   void initialize();
@@ -77,9 +82,14 @@ class ComputeWallFrictionVelocityProjectedAlgorithm : public Algorithm
   void coarse_search();
   void manage_ghosting();
   void complete_search();
+  void complete_search_pinfo(
+    std::vector<double> &isoParCoords,
+    std::vector<double> &pointCoords,
+    PointInfo *pInfo,
+    std::vector<PointInfo *> &problemInfoVec);
 
   const bool useShifted_;
-  std::map<std::string, std::vector<std::vector<PointInfo *> > > &pointInfoMap_;  
+  std::map<std::string, std::vector<std::vector<std::pair<PointInfo *, PointInfo *> > > > &pointInfoMap_;
   stk::mesh::Ghosting *wallFunctionGhosting_;
 
   stk::mesh::BulkData *bulkData_;
@@ -89,6 +99,8 @@ class ComputeWallFrictionVelocityProjectedAlgorithm : public Algorithm
   const double yplusCrit_;
   const double elog_;
   const double kappa_;
+  const double exchangeAlphaTau_;
+
   const int maxIteration_;
   const double tolerance_;
 
@@ -99,7 +111,11 @@ class ComputeWallFrictionVelocityProjectedAlgorithm : public Algorithm
   const stk::search::SearchMethod searchMethod_;
   const double expandBoxPercentage_;
   size_t needToGhostCount_;
-
+
+  /* min/max domain bounding box */
+  std::vector<double> minDomainBoundingBox_;
+  std::vector<double> maxDomainBoundingBox_;
+
   VectorFieldType *velocity_;
   VectorFieldType *bcVelocity_;
   VectorFieldType *coordinates_;
@@ -111,8 +127,10 @@ class ComputeWallFrictionVelocityProjectedAlgorithm : public Algorithm
   ScalarFieldType *assembledWallNormalDistance_;
   ScalarFieldType *assembledWallArea_;
 
-  // per part value for projected distance and ODE 
+  // per part value for projected distance (and unit vec) and ODE option
   std::vector<double> projectedDistanceVec_;
+  std::vector<double> wallNormalProjectedDistanceVec_;
+  std::vector<Velocity > projectedDistanceUnitNormalVec_;
   std::vector<double> projectedDistanceOdeVec_;
 
   /* data types for stk_search */

include/LowMachEquationSystem.h

@@ -201,7 +201,7 @@ class MomentumEquationSystem : public EquationSystem {
   std::vector<stk::mesh::Part *> notProjectedPart_;
 
   // projected in space points
-  std::map<std::string, std::vector<std::vector<PointInfo *> > > pointInfoMap_;
+  std::map<std::string, std::vector<std::vector<std::pair<PointInfo *, PointInfo *> > > > pointInfoMap_;
 };
 
 class ContinuityEquationSystem : public EquationSystem {

include/NaluParsing.h

@@ -214,6 +214,9 @@ struct WallUserData : public UserData {
   bool wallFunctionProjectedApproach_;
   bool neumann_;
   double projectedDistance_;
+  double wallNormalProjectedDistance_;
+  Velocity projectedDistanceUnitNormal_;
+
   bool projectedDistanceOde_;
 
   bool isFsiInterface_;
@@ -231,9 +234,11 @@ struct WallUserData : public UserData {
       wallFunctionApproach_(false),
       wallFunctionProjectedApproach_(false),
       neumann_(false),
-      projectedDistance_(1.0),
+      projectedDistance_(-1.0e16),
+      wallNormalProjectedDistance_(-1.0e16),
       projectedDistanceOde_(false),
-      isFsiInterface_(false) {}    
+      isFsiInterface_(false)
+  {}
 };
 
 struct InflowUserData : public UserData {

include/SolutionOptions.h

@@ -229,6 +229,10 @@ class SolutionOptions
   // wetted wall init
   bool wettedWallInit_;
   double wettedWallDistance_;
+
+  // exchange model constant
+  double exchangeAlphaTau_;
+  double shiftedPiomelli_;
 };
 
 } // namespace nalu

include/SurfaceForceAndMomentWallFunctionProjectedAlgorithm.h

@@ -39,7 +39,7 @@ class SurfaceForceAndMomentWallFunctionProjectedAlgorithm : public Algorithm
     const std::vector<double > &parameters,
     const bool &useShifted,
     ScalarFieldType *assembledArea,
-    std::map<std::string, std::vector<std::vector<PointInfo *> > > &pointInfoMap,
+    std::map<std::string, std::vector<std::vector<std::pair<PointInfo *, PointInfo *> > > > &pointInfoMap,
     stk::mesh::Ghosting *wallFunctionGhosting);
   ~SurfaceForceAndMomentWallFunctionProjectedAlgorithm();
 
@@ -55,11 +55,14 @@ class SurfaceForceAndMomentWallFunctionProjectedAlgorithm : public Algorithm
   const std::string &outputFileName_;
   const std::vector<double > &parameters_;
   const bool useShifted_;
-  std::map<std::string, std::vector<std::vector<PointInfo *> > > &pointInfoMap_;  
+  std::map<std::string, std::vector<std::vector<std::pair<PointInfo *, PointInfo *> > > >&pointInfoMap_;
   stk::mesh::Ghosting *wallFunctionGhosting_;
   const double yplusCrit_;
   const double elog_;
   const double kappa_;
+  double exchangeAlphaTau_;
+  const double shiftedPiomelli_;
+  const double om_shiftedPiomelli_;
 
   ScalarFieldType *assembledArea_;
   VectorFieldType *coordinates_;

reg_tests/test_files/laboratory/3d_hex8_turb_channel/3d_hex8_turb_channel.i

@@ -94,7 +94,7 @@ realms:
       wall_user_data:
         velocity: [0.0,0.0,0.0]
         use_wall_function_projected: yes
-        projected_distance: 0.0625
+        wall_normal_projected_distance: 0.0625
         projected_distance_ode: yes
         use_neumann_condition: yes
 
@@ -103,7 +103,7 @@ realms:
       wall_user_data:
         velocity: [0.0,0.0,0.0]
         use_wall_function_projected: yes
-        projected_distance: 0.0625
+        wall_normal_projected_distance: 0.0625
         projected_distance_ode: no
         use_neumann_condition: yes