changed colormodel vars from private to public

This commit is contained in:
James E McClure 2018-05-17 11:01:21 -04:00
parent 232ca742ad
commit 84be31aeaf
2 changed files with 14 additions and 10 deletions

View File

@ -39,9 +39,7 @@ public:
int Nx,Ny,Nz,N,Np;
int nprocx,nprocy,nprocz;
double Lx,Ly,Lz;
private:
MPI_Comm comm;
std::shared_ptr<Domain> Dm; // this domain is for analysis
std::shared_ptr<Domain> Mask; // this domain is for lbm
std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm;
@ -52,14 +50,8 @@ private:
std::shared_ptr<Database> domain_db;
std::shared_ptr<Database> color_db;
std::shared_ptr<Database> analysis_db;
// filenames
char LocalRankString[8];
char LocalRankFilename[40];
char LocalRestartFile[40];
IntArray Map;
IntArray Map;
char *id;
int *NeighborList;
int *dvcMap;
@ -69,7 +61,15 @@ private:
double *Velocity;
double *Gradient;
double *Pressure;
private:
MPI_Comm comm;
// filenames
char LocalRankString[8];
char LocalRankFilename[40];
char LocalRestartFile[40];
//int rank,nprocs;
void LoadParams(std::shared_ptr<Database> db0);

View File

@ -111,6 +111,10 @@ int main(int argc, char **argv)
auto filename = argv[1];
ScaLBL_ColorModel ColorModel;
ColorModel.ReadParams(filename);
ColorModel.ReadInput();
ColorModel.Create();
ColorModel.Initialize();
ColorModel.Run();
}
// ****************************************************
MPI_Barrier(comm);