diff --git a/models/ColorModel.h b/models/ColorModel.h index dd37d7cd..f99b683e 100644 --- a/models/ColorModel.h +++ b/models/ColorModel.h @@ -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 Dm; // this domain is for analysis std::shared_ptr Mask; // this domain is for lbm std::shared_ptr ScaLBL_Comm; @@ -52,14 +50,8 @@ private: std::shared_ptr domain_db; std::shared_ptr color_db; std::shared_ptr 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 db0); diff --git a/tests/TestColorBubble.cpp b/tests/TestColorBubble.cpp index fd0d21bd..6f6b211f 100644 --- a/tests/TestColorBubble.cpp +++ b/tests/TestColorBubble.cpp @@ -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);