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

fixed color model restart bug

Browse Source
This commit is contained in:
James E McClure
2018-09-04 22:10:29 -04:00
parent b4936bfa28
commit e2ca178e3d
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
analysis/runAnalysis.cpp
View File

@@ -39,25 +39,27 @@ void DeleteArray( const TYPE *p )
class WriteRestartWorkItem: public ThreadPool::WorkItemRet<void>
{
public:
WriteRestartWorkItem( const char* filename_, std::shared_ptr<double> cphi_, std::shared_ptr<double> cfq_, int N_ ):
filename(filename_), cphi(cphi_), cfq(cfq_), N(N_) {}
virtual void run() {
PROFILE_START("Save Checkpoint",1);
double value;
ofstream File(filename,ios::binary);
for (int n=0; n<N; n++){
// Write the two density values
value = cphi.get()[n];
File.write((char*) &value, sizeof(value));
// Write the distributions
for (int q=0; q<19; q++){
value = cfq.get()[q*N+n];
File.write((char*) &value, sizeof(value));
}
}
File.close();
WriteRestartWorkItem( const char* filename_, std::shared_ptr<double> cphi_, std::shared_ptr<double> cfq_, int N_ ):
filename(filename_), cphi(cphi_), cfq(cfq_), N(N_) {}
virtual void run() {
PROFILE_START("Save Checkpoint",1);
double value;
ofstream File(filename,ios::binary);
for (int n=0; n<N; n++){
// Write the two density values
value = cphi.get()[n];
File.write((char*) &value, sizeof(value));
}
for (int n=0; n<d_Np; n++){
// Write the distributions
for (int q=0; q<19; q++){
value = cfq.get()[q*d_Np+n];
File.write((char*) &value, sizeof(value));
}
}
File.close();
PROFILE_STOP("Save Checkpoint",1);
};
};
private:
WriteRestartWorkItem();
const char* filename;
@@ -323,13 +325,12 @@ runAnalysis::runAnalysis( std::shared_ptr<Database> db,
d_meshData[0].mesh = std::make_shared<IO::DomainMesh>( Dm->rank_info,Dm->Nx-2,Dm->Ny-2,Dm->Nz-2,Dm->Lx,Dm->Ly,Dm->Lz );
auto PhaseVar = std::make_shared<IO::Variable>();
auto PressVar = std::make_shared<IO::Variable>();
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>();
auto BlobIDVar = std::make_shared<IO::Variable>();
PhaseVar->name = "phase";
PhaseVar->type = IO::VariableType::VolumeVariable;
PhaseVar->dim = 1;

4
models/ColorModel.cpp
View File

@@ -297,9 +297,11 @@ void ScaLBL_ColorModel::Initialize(){
double *cDist = new double[19*Np];
ifstream File(LocalRestartFile,ios::binary);
double value;
for (int n=0; n<Np; n++){
for (int n=0; n<Nx*Ny*Nz; n++){
File.read((char*) &value, sizeof(value));
cPhi[n] = value;
}
for (int n=0; n<Np; n++){
// Read the distributions
for (int q=0; q<19; q++){
File.read((char*) &value, sizeof(value));