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

bugfix

Browse Source
This commit is contained in:
James E McClure
2018-07-06 12:38:49 -04:00
parent df89d4c8a3
commit ddbd1a0859
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
analysis/runAnalysis.cpp
View File

@@ -537,14 +537,14 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi,
if (d_regular)
d_ScaLBL_Comm->RegularLayout(d_Map,Phi,Averages.Phase_tplus);
else
ScaLBL_CopyToHost(Averages->Phase_tplus.data(),Phi,N*sizeof(double));
ScaLBL_CopyToHost(Averages.Phase_tplus.data(),Phi,N*sizeof(double));
//memcpy(Averages.Phase_tplus.data(),phase->data(),N*sizeof(double));
}
if ( timestep%d_analysis_interval == 0 ) {
if (d_regular)
d_ScaLBL_Comm->RegularLayout(d_Map,Phi,Averages.Phase_tminus);
else
ScaLBL_CopyToHost(Averages->Phase_minus.data(),Phi,N*sizeof(double));
ScaLBL_CopyToHost(Averages.Phase_tminus.data(),Phi,N*sizeof(double));
//memcpy(Averages.Phase_tminus.data(),phase->data(),N*sizeof(double));
}
//if ( matches(type,AnalysisType::CopySimState) ) {
@@ -562,7 +562,7 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi,
if (d_regular)
d_ScaLBL_Comm->RegularLayout(d_Map,Phi,Averages.Phase);
else
ScaLBL_CopyToHost(Averages->Phase.data(),Phi,N*sizeof(double));
ScaLBL_CopyToHost(Averages.Phase.data(),Phi,N*sizeof(double));
// copy other variables
d_ScaLBL_Comm->RegularLayout(d_Map,Pressure,Averages.Press);
d_ScaLBL_Comm->RegularLayout(d_Map,&Velocity[0],Averages.Vel_x);

2
common/ScaLBL.cpp
View File

@@ -447,7 +447,7 @@ int ScaLBL_Communicator::MemoryOptimizedLayoutAA(IntArray &Map, int *neighborLis
// {0,1,1},{0,-1,-1},
// {0,1,-1},{0,-1,1}};
int neighbor; // cycle through the neighbors of lattice site idx
otoneighbor=Map(i-1,j,k);
neighbor=Map(i-1,j,k);
if (neighbor<0) neighborList[idx]=idx + 2*Np;
else neighborList[idx]=neighbor + 1*Np;

2
models/ColorModel.cpp
View File

@@ -356,7 +356,7 @@ void ScaLBL_ColorModel::Run(){
//std::shared_ptr<Database> analysis_db;
bool Regular = false;
runAnalysis analysis( analysis_db, rank_info, ScaLBL_Comm, Dm, Np, Regular, beta, Map );
analysis.createThreads( analysis_method, 4 );
//analysis.createThreads( analysis_method, 4 );
while (timestep < timestepMax ) {
//if ( rank==0 ) { printf("Running timestep %i (%i MB)\n",timestep+1,(int)(Utilities::getMemoryUsage()/1048576)); }
PROFILE_START("Update");