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

on every golden scale

Browse Source
This commit is contained in:
James E McClure
2018-05-19 19:54:46 -04:00
parent baf501a14a
commit dff7889131
4 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
models/MRTModel.cpp
View File

@@ -22,7 +22,7 @@ void ScaLBL_MRTModel::ReadParams(string filename){
// Color Model parameters
timestepMax = mrt_db->getScalar<int>( "timestepMax" );
tauA = mrt_db->getScalar<double>( "tau" );
tau = mrt_db->getScalar<double>( "tau" );
Fx = mrt_db->getVector<double>( "F" )[0];
Fy = mrt_db->getVector<double>( "F" )[1];
Fz = mrt_db->getVector<double>( "F" )[2];
@@ -52,6 +52,7 @@ void ScaLBL_MRTModel::SetDomain(){
Mask = std::shared_ptr<Domain>(new Domain(domain_db,comm)); // mask domain removes immobile phases
Nx+=2; Ny+=2; Nz += 2;
N = Nx*Ny*Nz;
Distance.resize(Nx,Ny,Nz);
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
MPI_Barrier(comm);
@@ -77,7 +78,7 @@ void ScaLBL_MRTModel::ReadInput(){
//.......................................................................
sprintf(LocalRankString,"%05d",rank);
sprintf(LocalRankFilename,"%s%s","SignDist.",LocalRankString);
ReadBinaryFile(LocalRankFilename, Averages->SDs.data(), N);
ReadBinaryFile(LocalRankFilename, Distance.data(), N);
MPI_Barrier(comm);
if (rank == 0) cout << "Domain set." << endl;
}

9
models/MRTModel.h
View File

@@ -9,6 +9,7 @@
#include <stdexcept>
#include <fstream>
#include "common/ScaLBL.h"
#include "common/Communication.h"
#include "common/MPI_Helpers.h"
#include "ProfilerApp.h"
@@ -42,15 +43,13 @@ public:
std::shared_ptr<Domain> Dm; // this domain is for analysis
std::shared_ptr<Domain> Mask; // this domain is for lbm
std::shared_ptr<ScaLBL_Communicator> ScaLBL_Comm;
std::shared_ptr<TwoPhase> Averages;
// input database
std::shared_ptr<Database> db;
std::shared_ptr<Database> domain_db;
std::shared_ptr<Database> color_db;
std::shared_ptr<Database> analysis_db;
std::shared_ptr<Database> mrt_db;
IntArray Map;
DoubleArray Distance;
int *NeighborList;
double *fq;
double *Velocity;
@@ -66,4 +65,4 @@ private:
//int rank,nprocs;
void LoadParams(std::shared_ptr<Database> db0);
};
};