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

working on subphase analysis

Browse Source
This commit is contained in:
James E McClure 2019-03-19 08:36:08 -04:00
parent 8fc8bb4e48
commit 05035eeacd
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
analysis/Minkowski.cpp
View File

@ -24,6 +24,9 @@ Minkowski::Minkowski(std::shared_ptr <Domain> dm):
Nx=dm->Nx; Ny=dm->Ny; Nz=dm->Nz; Nx=dm->Nx; Ny=dm->Ny; Nz=dm->Nz;
Volume=double((Nx-2)*(Ny-2)*(Nz-2))*double(Dm->nprocx()*Dm->nprocy()*Dm->nprocz()); Volume=double((Nx-2)*(Ny-2)*(Nz-2))*double(Dm->nprocx()*Dm->nprocy()*Dm->nprocz());
label.resize(Nx,Ny,Nz); label.fill(0);
distance.resize(Nx,Ny,Nz); distance.fill(0);
if (Dm->rank()==0){ if (Dm->rank()==0){
LOGFILE = fopen("minkowski.csv","a+"); LOGFILE = fopen("minkowski.csv","a+");
if (fseek(LOGFILE,0,SEEK_SET) == fseek(LOGFILE,0,SEEK_CUR)) if (fseek(LOGFILE,0,SEEK_SET) == fseek(LOGFILE,0,SEEK_CUR))
@ -128,6 +131,7 @@ void Minkowski::ComputeScalar(const DoubleArray& Field, const double isovalue)
PROFILE_STOP("ComputeScalar"); PROFILE_STOP("ComputeScalar");
} }
void Minkowski::PrintAll() void Minkowski::PrintAll()
{ {
if (Dm->rank()==0){ if (Dm->rank()==0){

5
analysis/Minkowski.h
View File

@ -30,6 +30,8 @@ class Minkowski{
public: public:
//........................................................................... //...........................................................................
std::shared_ptr <Domain> Dm; std::shared_ptr <Domain> Dm;
Array <char> label;
Array <double> distance;
//........................................................................... //...........................................................................
// Averaging variables // Averaging variables
//........................................................................... //...........................................................................
@ -44,12 +46,13 @@ public:
double A(); double A();
double J(); double J();
double X(); double X();
//.......................................................................... //..........................................................................
Minkowski(){};//NULL CONSTRUCTOR Minkowski(){};//NULL CONSTRUCTOR
Minkowski(std::shared_ptr <Domain> Dm); Minkowski(std::shared_ptr <Domain> Dm);
~Minkowski(); ~Minkowski();
void ComputeScalar(const DoubleArray& Field, const double isovalue); void ComputeScalar(const DoubleArray& Field, const double isovalue);
void PrintAll(); void PrintAll();
}; };

1
analysis/TwoPhase.cpp
View File

@ -429,7 +429,6 @@ void TwoPhase::UpdateMeshValues()
} }
} }
} }
} }
void TwoPhase::ComputeLocal() void TwoPhase::ComputeLocal()
{ {