Improve greyscale simulator physics, reliability, and output support

common/ScaLBL.h

@@ -188,7 +188,9 @@ extern "C" void ScaLBL_D3Q19_Init(double *Dist, int Np);
 */
 extern "C" void ScaLBL_D3Q19_Momentum(double *dist, double *vel, int Np);
 
-extern "C" void ScaLBL_D3Q19_Momentum_2nd_order(double *dist, double *vel, int Np, double Fx, double Fy, double Fz);
+extern "C" void ScaLBL_D3Q19_Momentum_2nd_order(double *dist, double *vel,
+                                                int Np, double Fx, double Fy,
+                                                double Fz);
 
 /**
 * \brief compute pressure from D3Q19 distribution
@@ -295,37 +297,38 @@ extern "C" void ScaLBL_D3Q7_Membrane_Unpack(int q, int *d3q7_recvlist,
 
 extern "C" void ScaLBL_D3Q19_GreyIMRT_Init(double *Dist, int Np, double Den);
 
-extern "C" void
-ScaLBL_D3Q19_AAeven_Greyscale(double *dist, int start, int finish, int Np,
-                              double rlx, double rlx_eff, double Fx, double Fy,
-                              double Fz, double *Poros, double *Perm,
-                              double *Velocity, double *Pressure);
+extern "C" void ScaLBL_D3Q19_AAeven_Greyscale(
+    double *dist, int start, int finish, int Np, double rlx, double rlx_eff,
+    double Fx, double Fy, double Fz, double *Poros, double *Perm,
+    double *Velocity, double *Pressure, bool Forchheimer);
 
-extern "C" void
-ScaLBL_D3Q19_AAodd_Greyscale(int *neighborList, double *dist, int start,
-                             int finish, int Np, double rlx, double rlx_eff,
-                             double Fx, double Fy, double Fz, double *Poros,
-                             double *Perm, double *Velocity, double *Pressure);
+extern "C" void ScaLBL_D3Q19_AAodd_Greyscale(
+    int *neighborList, double *dist, int start, int finish, int Np, double rlx,
+    double rlx_eff, double Fx, double Fy, double Fz, double *Poros,
+    double *Perm, double *Velocity, double *Pressure, bool Forchheimer);
 
 extern "C" void ScaLBL_D3Q19_AAeven_Greyscale_IMRT(
     double *dist, int start, int finish, int Np, double rlx, double rlx_eff,
     double Fx, double Fy, double Fz, double *Poros, double *Perm,
-    double *Velocity, double Den, double *Pressure);
+    double *Velocity, double Den, double *Pressure, bool Forchheimer);
 
 extern "C" void ScaLBL_D3Q19_AAodd_Greyscale_IMRT(
     int *neighborList, double *dist, int start, int finish, int Np, double rlx,
     double rlx_eff, double Fx, double Fy, double Fz, double *Poros,
-    double *Perm, double *Velocity, double Den, double *Pressure);
+    double *Perm, double *Velocity, double Den, double *Pressure,
+    bool Forchheimer);
 
 extern "C" void ScaLBL_D3Q19_AAeven_Greyscale_MRT(
     double *dist, int start, int finish, int Np, double rlx, double rlx_eff,
     double Fx, double Fy, double Fz, double *Poros, double *Perm,
-    double *Velocity, double Den, double *Pressure);
+    double *Velocity, double Den, double *Pressure, bool Forchheimer);
 
-extern "C" void ScaLBL_D3Q19_AAodd_Greyscale_MRT(
-    int *neighborList, double *dist, int start, int finish, int Np, double rlx,
-    double rlx_eff, double Fx, double Fy, double Fz, double *Poros,
-    double *Perm, double *Velocity, double Den, double *Pressure);
+extern "C" void
+ScaLBL_D3Q19_AAodd_Greyscale_MRT(int *neighborList, double *dist, int start,
+                                 int finish, int Np, double rlx, double rlx_eff,
+                                 double Fx, double Fy, double Fz, double *Poros,
+                                 double *Perm, double *Velocity, double Den,
+                                 double *Pressure, bool Forchheimer);
 
 extern "C" void ScaLBL_D3Q19_AAeven_GreyscaleColor(
     int *Map, double *dist, double *Aq, double *Bq, double *Den, double *Phi,
@@ -628,10 +631,10 @@ extern "C" void ScaLBL_D3Q19_AAodd_MRT(int *neighborList, double *dist,
 * @param Np - size of local sub-domain (derived from Domain structure)
 */
 extern "C" void ScaLBL_D3Q19_AAeven_Color(
-    int *Map, double *dist, double *Aq, double *Bq, double *Den, double *Phi, unsigned int *NeighborSolid,
-    double *Vel, double rhoA, double rhoB, double tauA, double tauB,
-    double alpha, double beta, double Fx, double Fy, double Fz, int strideY,
-    int strideZ, int start, int finish, int Np);
+    int *Map, double *dist, double *Aq, double *Bq, double *Den, double *Phi,
+    unsigned int *NeighborSolid, double *Vel, double rhoA, double rhoB,
+    double tauA, double tauB, double alpha, double beta, double Fx, double Fy,
+    double Fz, int strideY, int strideZ, int start, int finish, int Np);
 
 /**
 * \brief Color model collision based on AA even access pattern for D3Q19 
@@ -660,9 +663,10 @@ extern "C" void ScaLBL_D3Q19_AAeven_Color(
 */
 extern "C" void ScaLBL_D3Q19_AAodd_Color(
     int *NeighborList, int *Map, double *dist, double *Aq, double *Bq,
-    double *Den, double *Phi, unsigned int *NeighborSolid, double *Vel, double rhoA, double rhoB,
-    double tauA, double tauB, double alpha, double beta, double Fx, double Fy,
-    double Fz, int strideY, int strideZ, int start, int finish, int Np);
+    double *Den, double *Phi, unsigned int *NeighborSolid, double *Vel,
+    double rhoA, double rhoB, double tauA, double tauB, double alpha,
+    double beta, double Fx, double Fy, double Fz, int strideY, int strideZ,
+    int start, int finish, int Np);
 
 /**
 * \brief Compute phase field based on AA odd access pattern for D3Q19 
@@ -1251,4 +1255,4 @@ class ScaLBL_Communicator {
     float *lattice_cx, *lattice_cy, *lattice_cz;
     //......................................................................................
 };
-#endif
+#endif