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

fix double free

Browse Source
This commit is contained in:
James E McClure 2018-09-05 12:53:06 -04:00
parent 8f486b5198
commit fd73654cd9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/ColorModel.cpp
View File

@ -303,15 +303,16 @@ void ScaLBL_ColorModel::Initialize(){
ifstream File(LocalRestartFile,ios::binary); ifstream File(LocalRestartFile,ios::binary);
int idx; int idx;
double value,va,vb; double value,va,vb;
ScaLBL_CopyToHost(TmpMap, dvcMap, Np*sizeof(int)); ScaLBL_CopyToHost(TmpMap, dvcMap, Np*sizeof(int));
ScaLBL_CopyToHost(cPhi, Phi, N*sizeof(double));
for (int n=0; n<Np; n++){ for (int n=0; n<Np; n++){
File.read((char*) &va, sizeof(va)); File.read((char*) &va, sizeof(va));
File.read((char*) &vb, sizeof(vb)); File.read((char*) &vb, sizeof(vb));
value = (va-vb)/(va+vb); value = (va-vb)/(va+vb);
idx = TmpMap[n]; idx = TmpMap[n];
if (idx > 0 && idx<N) if (!(idx < 0) && idx<N)
cPhi[idx] = value; cPhi[idx] = value;
} }
for (int n=0; n<Np; n++){ for (int n=0; n<Np; n++){
@ -326,9 +327,6 @@ void ScaLBL_ColorModel::Initialize(){
ScaLBL_CopyToDevice(fq,cDist,19*Np*sizeof(double)); ScaLBL_CopyToDevice(fq,cDist,19*Np*sizeof(double));
ScaLBL_CopyToDevice(Phi,cPhi,Np*sizeof(double)); ScaLBL_CopyToDevice(Phi,cPhi,Np*sizeof(double));
ScaLBL_DeviceBarrier(); ScaLBL_DeviceBarrier();
delete [] cPhi;
delete [] cDist;
delete [] TmpMap;
MPI_Barrier(comm); MPI_Barrier(comm);
} }