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

debugging color

Browse Source
This commit is contained in:
James E McClure
2018-01-26 15:02:08 -05:00
parent b64ceccc6b
commit 7df39a39af
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/ScaLBL.h
View File

@@ -256,7 +256,7 @@ public:
void BiRecvD3Q7AA(double *Aq, double *Bq);
void SendHalo(double *data);
void RecvHalo(double *data);
void RegularLayout(const IntArray map, double *data, double *regdata);
void RegularLayout(IntArray map, double *data, double *regdata);
// Routines to set boundary conditions
void Color_BC_z(int *Map, double *Phi, double *Den, double vA, double vB);
@@ -4267,7 +4267,7 @@ void ScaLBL_Communicator::RecvHalo(double *data){
//...................................................................................
}
void ScaLBL_Communicator::RegularLayout(const IntArray map, double *data, double *regdata){
void ScaLBL_Communicator::RegularLayout(IntArray map, double *data, double *regdata){
// Gets data from the device and stores in regular layout
int i,j,k,n,idx;
int Nx = map.size(0);

6
tests/lbpm_color_macro_simulator.cpp
View File

@@ -189,7 +189,7 @@ int main(int argc, char **argv)
//.................................................
flux = 0.f;
if (BoundaryCondition==4) flux = din*rho1; // mass flux must adjust for density (see formulation for details)
if (BoundaryCondition==4) flux = din*rhoA; // mass flux must adjust for density (see formulation for details
// Get the rank info
const RankInfoStruct rank_info(rank,nprocx,nprocy,nprocz);
@@ -389,7 +389,7 @@ int main(int argc, char **argv)
double *fq, *Aq, *Bq;
double *Den, *Phi;
double *ColorGrad;
double *Vel;
double *Velocity;
double *Pressure;
//...........................................................................
@@ -481,7 +481,7 @@ int main(int argc, char **argv)
Averages->UpdateSolid();
//.......................................................................
ScaLBL_D3Q19_Pressure(fq,Pressure,Np);
ScaLBL_D3Q19_Momentum(fq,Vel,Np);
ScaLBL_D3Q19_Momentum(fq,Velocity,Np);
//...........................................................................
// Copy the phase indicator field for the earlier timestep
ScaLBL_DeviceBarrier();

10
tests/lbpm_color_simulator.h
View File

@@ -229,7 +229,7 @@ void run_analysis( int timestep, int restart_interval,
BlobIDstruct& last_ids, BlobIDstruct& last_index, BlobIDList& last_id_map,
int Np, int Nx, int Ny, int Nz, bool pBC, double beta, double err,
const double *Phi, double *Pressure, double *Velocity,
const IntArray *Map, double *fq, double *Den,
IntArray Map, double *fq, double *Den,
const char *LocalRestartFile, std::vector<IO::MeshDataStruct>& visData, fillHalo<double>& fillData,
ThreadPool& tpool, AnalysisWaitIdStruct& wait )
{
@@ -312,10 +312,10 @@ void run_analysis( int timestep, int restart_interval,
PROFILE_STOP("Copy-Wait",1);
PROFILE_START("Copy-State",1);
memcpy(Averages.Phase.data(),phase->data(),N*sizeof(double));
ScaLBL_Comm.RegularLayout(Map,Pressure,Averages.Press.data());
ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages.Vel_x.data());
ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages.Vel_y.data());
ScaLBL_Comm.RegularLayout(Map,&Velocity[2*Np],Averages.Vel_z.data());
ScaLBL_Comm.RegularLayout(Map,Pressure,Averages.Press->data());
ScaLBL_Comm.RegularLayout(Map,&Velocity[0],Averages.Vel_x->data());
ScaLBL_Comm.RegularLayout(Map,&Velocity[Np],Averages.Vel_y->data());
ScaLBL_Comm.RegularLayout(Map,&Velocity[2*Np],Averages.Vel_z->data());
PROFILE_STOP("Copy-State",1);
}
std::shared_ptr<double> cDen, cfq;