fixing compile bugs

This commit is contained in:
James McClure 2020-09-29 13:40:41 -04:00
parent 917be9f6c4
commit 5c72374278
2 changed files with 3 additions and 6 deletions

View File

@ -181,8 +181,7 @@ void ScaLBL_FreeLeeModel::ReadInput(){
CalcDist(SignDist,id_solid,*Mask);
if (rank == 0) cout << "Domain set." << endl;
Averages->SetParams(rhoA,rhoB,tauA,tauB,Fx,Fy,Fz,alpha,beta);
}
void ScaLBL_FreeLeeModel::AssignComponentLabels(double *phase)

View File

@ -40,7 +40,7 @@ public:
double din,dout,inletA,inletB,outletA,outletB;
int Nx,Ny,Nz,N,Np;
int Nxh,Nyh,Nzh,Nh; // extra halo width
int Nxh,Nyh,Nzh,Nh; // extra halo width
int rank,nprocx,nprocy,nprocz,nprocs;
double Lx,Ly,Lz;
@ -48,8 +48,6 @@ public:
std::shared_ptr<Domain> Mask; // this domain is for lbm
std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm;
std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm_Regular;
//std::shared_ptr<TwoPhase> Averages;
std::shared_ptr<SubPhase> Averages;
// input database
std::shared_ptr<Database> db;
@ -68,7 +66,7 @@ public:
double *Velocity;
double *Pressure;
DoubleArray SignDistance;
DoubleArray SignDist;
private:
MPI_Comm comm;