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

refactor single phase simulator

Browse Source
This commit is contained in:
James E McClure 2018-08-27 11:40:29 -04:00
parent c5c35ff6d9
commit 1803cfbbe9
4 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
models/MRTModel.cpp
View File

@ -53,6 +53,10 @@ void ScaLBL_MRTModel::SetDomain(){
Nx+=2; Ny+=2; Nz += 2; Nx+=2; Ny+=2; Nz += 2;
N = Nx*Ny*Nz; N = Nx*Ny*Nz;
Distance.resize(Nx,Ny,Nz); Distance.resize(Nx,Ny,Nz);
Velocity_x.resize(Nx,Ny,Nz);
Velocity_y.resize(Nx,Ny,Nz);
Velocity_z.resize(Nx,Ny,Nz);
for (int i=0; i<Nx*Ny*Nz; i++) Dm->id[i] = 1; // initialize this way for (int i=0; i<Nx*Ny*Nz; i++) Dm->id[i] = 1; // initialize this way
//Averages = std::shared_ptr<TwoPhase> ( new TwoPhase(Dm) ); // TwoPhase analysis object //Averages = std::shared_ptr<TwoPhase> ( new TwoPhase(Dm) ); // TwoPhase analysis object
MPI_Barrier(comm); MPI_Barrier(comm);
@ -141,8 +145,6 @@ void ScaLBL_MRTModel::Run(){
Minkowski Morphology(Mask); Minkowski Morphology(Mask);
int SIZE=Np*sizeof(double); int SIZE=Np*sizeof(double);
double *VELOCITY;
VELOCITY = new double [3*Np];
memcpy(Morphology.SDn.data(), Distance.data(), Nx*Ny*Nz*sizeof(double)); memcpy(Morphology.SDn.data(), Distance.data(), Nx*Ny*Nz*sizeof(double));
if (rank==0) printf("time Fx Fy Fz mu Vs As Js Xs vx vy vz\n"); if (rank==0) printf("time Fx Fy Fz mu Vs As Js Xs vx vy vz\n");
@ -173,8 +175,10 @@ void ScaLBL_MRTModel::Run(){
if (timestep%1000==0){ if (timestep%1000==0){
ScaLBL_D3Q19_Momentum(fq,Velocity, Np); ScaLBL_D3Q19_Momentum(fq,Velocity, Np);
ScaLBL_DeviceBarrier(); MPI_Barrier(comm); ScaLBL_DeviceBarrier(); MPI_Barrier(comm);
ScaLBL_CopyToHost(&VELOCITY[0],&Velocity[0],3*SIZE); ScaLBL_Comm->RegularLayout(Map,&Velocity[0],Velocity_x);
ScaLBL_Comm->RegularLayout(Map,&Velocity[Np],Velocity_y);
ScaLBL_Comm->RegularLayout(Map,&Velocity[2*Np],Velocity_z);
Morphology.Initialize(); Morphology.Initialize();
Morphology.UpdateMeshValues(); Morphology.UpdateMeshValues();
Morphology.ComputeLocal(); Morphology.ComputeLocal();
@ -185,18 +189,17 @@ void ScaLBL_MRTModel::Run(){
double vax,vay,vaz; double vax,vay,vaz;
double vax_loc,vay_loc,vaz_loc; double vax_loc,vay_loc,vaz_loc;
vax_loc = vay_loc = vaz_loc = 0.f; vax_loc = vay_loc = vaz_loc = 0.f;
for (int n=0; n<ScaLBL_Comm->LastExterior(); n++){ for (int k=1; k<Nz-1; k++){
vax_loc += VELOCITY[n]; for (int j=1; j<Ny-1; j++){
vay_loc += VELOCITY[Np+n]; for (int i=1; i<Nx-1; i++){
vaz_loc += VELOCITY[2*Np+n]; if (Distance(i,j,k) > 0){
count_loc+=1.0; vax_loc += Velocity_x(i,j,k);
} vay_loc += Velocity_y(i,j,k);
vaz_loc += Velocity_z(i,j,k);
for (int n=ScaLBL_Comm->FirstInterior(); n<ScaLBL_Comm->LastInterior(); n++){ count_loc+=1.0;
vax_loc += VELOCITY[n]; }
vay_loc += VELOCITY[Np+n]; }
vaz_loc += VELOCITY[2*Np+n]; }
count_loc+=1.0;
} }
MPI_Allreduce(&vax_loc,&vax,1,MPI_DOUBLE,MPI_SUM,Mask->Comm); MPI_Allreduce(&vax_loc,&vax,1,MPI_DOUBLE,MPI_SUM,Mask->Comm);
MPI_Allreduce(&vay_loc,&vay,1,MPI_DOUBLE,MPI_SUM,Mask->Comm); MPI_Allreduce(&vay_loc,&vay,1,MPI_DOUBLE,MPI_SUM,Mask->Comm);
@ -229,7 +232,7 @@ void ScaLBL_MRTModel::Run(){
} }
void ScaLBL_MRTModel::VelocityField(double *VELOCITY){ void ScaLBL_MRTModel::VelocityField(){
/* Minkowski Morphology(Mask); /* Minkowski Morphology(Mask);
int SIZE=Np*sizeof(double); int SIZE=Np*sizeof(double);
@ -275,9 +278,14 @@ void ScaLBL_MRTModel::VelocityField(double *VELOCITY){
if (rank==0) printf("%.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g\n",Fx, Fy, Fz, mu, if (rank==0) printf("%.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g\n",Fx, Fy, Fz, mu,
Morphology.V(),Morphology.A(),Morphology.J(),Morphology.X(),vax,vay,vaz); Morphology.V(),Morphology.A(),Morphology.J(),Morphology.X(),vax,vay,vaz);
*/ */
std::vector<IO::MeshDataStruct> visData; std::vector<IO::MeshDataStruct> visData;
fillHalo<double> d_fillData; fillHalo<double> fillData(Dm->Comm,Dm->rank_info,{Dm->Nx-2,Dm->Ny-2,Dm->Nz-2},{1,1,1},0,1);
fillData(Dm->Comm,Dm->rank_info,{Dm->Nx-2,Dm->Ny-2,Dm->Nz-2},{1,1,1},0,1);
auto VxVar = std::make_shared<IO::Variable>();
auto VyVar = std::make_shared<IO::Variable>();
auto VzVar = std::make_shared<IO::Variable>();
auto SignDistVar = std::make_shared<IO::Variable>();
IO::initialize("","silo","false"); IO::initialize("","silo","false");
// Create the MeshDataStruct // Create the MeshDataStruct
@ -306,16 +314,21 @@ void ScaLBL_MRTModel::VelocityField(double *VELOCITY){
VzVar->data.resize(Dm->Nx-2,Dm->Ny-2,Dm->Nz-2); VzVar->data.resize(Dm->Nx-2,Dm->Ny-2,Dm->Nz-2);
visData[0].vars.push_back(VzVar); visData[0].vars.push_back(VzVar);
Array<double>& SignData = visData[0].vars[0]->data;
Array<double>& VelxData = visData[0].vars[1]->data;
Array<double>& VelyData = visData[0].vars[2]->data;
Array<double>& VelzData = visData[0].vars[3]->data;
ASSERT(visData[0].vars[0]->name=="SignDist"); ASSERT(visData[0].vars[0]->name=="SignDist");
ASSERT(visData[0].vars[1]->name=="Velocity_x"); ASSERT(visData[0].vars[1]->name=="Velocity_x");
ASSERT(visData[0].vars[2]->name=="Velocity_y"); ASSERT(visData[0].vars[2]->name=="Velocity_y");
ASSERT(visData[0].vars[3]->name=="Velocity_z"); ASSERT(visData[0].vars[3]->name=="Velocity_z");
fillData.copy(SignDist,SignData); fillData.copy(Distance,SignData);
fillData.copy(Averages.Vel_x,VelxData); fillData.copy(Velocity_x,VelxData);
fillData.copy(Averages.Vel_y,VelyData); fillData.copy(Velocity_y,VelyData);
fillData.copy(Averages.Vel_z,VelzData); fillData.copy(Velocity_z,VelzData);
IO::writeData( timestep, visData, comm.comm ); IO::writeData( timestep, visData, Dm->Comm );
} }

7
models/MRTModel.h
View File

@ -28,7 +28,7 @@ public:
void Create(); void Create();
void Initialize(); void Initialize();
void Run(); void Run();
void VelocityField(double *Vz); void VelocityField();
bool Restart,pBC; bool Restart,pBC;
int timestep,timestepMax; int timestep,timestepMax;
@ -58,9 +58,12 @@ public:
//Minkowski Morphology; //Minkowski Morphology;
DoubleArray Velocity_x;
DoubleArray Velocity_y;
DoubleArray Velocity_z;
private: private:
MPI_Comm comm; MPI_Comm comm;
// filenames // filenames
char LocalRankString[8]; char LocalRankString[8];
char LocalRankFilename[40]; char LocalRankFilename[40];

6
tests/TestPoiseuille.cpp
View File

@ -58,8 +58,12 @@ int main(int argc, char **argv)
MRT.Initialize(); // initializing the model will set initial conditions for variables MRT.Initialize(); // initializing the model will set initial conditions for variables
MRT.Run(); MRT.Run();
double *Vz; Vz= new double [3*MRT.Np]; double *Vz; Vz= new double [3*MRT.Np];
MRT.VelocityField(Vz);
int SIZE=MRT.Np*sizeof(double);
ScaLBL_D3Q19_Momentum(MRT.fq,MRT.Velocity, MRT.Np);
ScaLBL_DeviceBarrier(); MPI_Barrier(comm);
ScaLBL_CopyToHost(&Vz[0],&MRT.Velocity[0],3*SIZE);
if (rank == 0) printf("Force: %f,%f,%f \n",MRT.Fx,MRT.Fy,MRT.Fz); if (rank == 0) printf("Force: %f,%f,%f \n",MRT.Fx,MRT.Fy,MRT.Fz);
double mu = MRT.mu; double mu = MRT.mu;
int Nx = MRT.Nx; int Nx = MRT.Nx;

3
tests/lbpm_permeability_simulator.cpp
View File

@ -51,8 +51,7 @@ int main(int argc, char **argv)
MRT.Create(); // creating the model will create data structure to match the pore structure and allocate variables MRT.Create(); // creating the model will create data structure to match the pore structure and allocate variables
MRT.Initialize(); // initializing the model will set initial conditions for variables MRT.Initialize(); // initializing the model will set initial conditions for variables
MRT.Run(); MRT.Run();
double *Velocity; Velocity= new double [3*MRT.Np]; MRT.VelocityField();
MRT.VelocityField(Velocity);
} }
// **************************************************** // ****************************************************
MPI_Barrier(comm); MPI_Barrier(comm);