OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge

Browse Source
This commit is contained in:
JamesEMcclure 2020-10-12 05:22:53 -04:00
parent cafbc22e42
commit a4c117c5f5
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/ScaLBL.h
View File

@ -381,10 +381,6 @@ public:
void RecvD3Q19AA(double *dist);
void SendD3Q7AA(double *fq, int Component);
void RecvD3Q7AA(double *fq, int Component);
=======
// void BiSendD3Q7(double *A_even, double *A_odd, double *B_even, double *B_odd);
// void BiRecvD3Q7(double *A_even, double *A_odd, double *B_even, double *B_odd);
>>>>>>> master
void BiSendD3Q7AA(double *Aq, double *Bq);
void BiRecvD3Q7AA(double *Aq, double *Bq);
void TriSendD3Q7AA(double *Aq, double *Bq, double *Cq);
@ -405,22 +401,16 @@ public:
void D3Q19_Reflection_BC_z(double *fq);
void D3Q19_Reflection_BC_Z(double *fq);
double D3Q19_Flux_BC_z(int *neighborList, double *fq, double flux, int time);
<<<<<<< HEAD
void D3Q7_Poisson_Potential_BC_z(int *neighborList, double *fq, double Vin, int time);
void D3Q7_Poisson_Potential_BC_Z(int *neighborList, double *fq, double Vout, int time);
void Poisson_D3Q7_BC_z(int *Map, double *Psi, double Vin);
void Poisson_D3Q7_BC_Z(int *Map, double *Psi, double Vout);
void D3Q7_Ion_Concentration_BC_z(int *neighborList, double *fq, double Cin, int time);
void D3Q7_Ion_Concentration_BC_Z(int *neighborList, double *fq, double Cout, int time);
=======
void GreyscaleSC_BC_z(int *Map, double *DenA, double *DenB, double vA, double vB);
void GreyscaleSC_BC_Z(int *Map, double *DenA, double *DenB, double vA, double vB);
void GreyscaleSC_Pressure_BC_z(int *neighborList, double *fqA, double *fqB, double dinA, double dinB, int time);
void GreyscaleSC_Pressure_BC_Z(int *neighborList, double *fqA, double *fqB, double doutA, double doutB, int time);
// void TestSendD3Q19(double *f_even, double *f_odd);
// void TestRecvD3Q19(double *f_even, double *f_odd);
>>>>>>> master
// Debugging and unit testing functions
void PrintD3Q19();

4
models/ColorModel.cpp
View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
/*
=======
/*
Copyright 2013--2018 James E. McClure, Virginia Polytechnic & State University
@ -17,7 +14,6 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
/*
>>>>>>> master
color lattice boltzmann model
*/
#include "models/ColorModel.h"

3
tests/CMakeLists.txt
View File

@ -4,11 +4,8 @@
ADD_LBPM_EXECUTABLE( lbpm_color_simulator )
ADD_LBPM_EXECUTABLE( lbpm_permeability_simulator )
ADD_LBPM_EXECUTABLE( lbpm_greyscale_simulator )
<<<<<<< HEAD
ADD_LBPM_EXECUTABLE( lbpm_electrokinetic_SingleFluid_simulator )
=======
ADD_LBPM_EXECUTABLE( lbpm_greyscaleColor_simulator )
>>>>>>> master
#ADD_LBPM_EXECUTABLE( lbpm_BGK_simulator )
#ADD_LBPM_EXECUTABLE( lbpm_color_macro_simulator )
ADD_LBPM_EXECUTABLE( lbpm_dfh_simulator )