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

refactor MRT model for Minkowski object

Browse Source
This commit is contained in:
James E McClure
2018-09-15 13:43:46 -04:00
parent 1619e82db9
commit b297a647d8
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
models/MRTModel.cpp
View File

@@ -146,7 +146,6 @@ void ScaLBL_MRTModel::Run(){
Minkowski Morphology(Mask);
int SIZE=Np*sizeof(double);
memcpy(Morphology.SDn.data(), Distance.data(), Nx*Ny*Nz*sizeof(double));
if (rank==0) printf("time Fx Fy Fz mu Vs As Js Xs vx vy vz\n");
//.......create and start timer............
@@ -178,11 +177,6 @@ void ScaLBL_MRTModel::Run(){
ScaLBL_Comm->RegularLayout(Map,&Velocity[0],Velocity_x);
ScaLBL_Comm->RegularLayout(Map,&Velocity[Np],Velocity_y);
ScaLBL_Comm->RegularLayout(Map,&Velocity[2*Np],Velocity_z);
Morphology.Initialize();
Morphology.UpdateMeshValues();
Morphology.ComputeLocal();
Morphology.Reduce();
double count_loc=0;
double count;
@@ -210,6 +204,10 @@ void ScaLBL_MRTModel::Run(){
vay /= count;
vaz /= count;
if (rank==0) printf("Computing Minkowski functionals \n");
Morphology.ComputeScalar(Distance,0.f);
Morphology.PrintAll();
double mu = (tau-0.5)/3.f;
if (rank==0) printf("%i %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g %.8g\n",timestep, Fx, Fy, Fz, mu,
Morphology.V(),Morphology.A(),Morphology.J(),Morphology.X(),vax,vay,vaz);