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

updated runanalysis for phi

Browse Source
This commit is contained in:
James E McClure 2018-05-05 23:56:58 -04:00
parent 8911435b10
commit 865c0b5777
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
analysis/runAnalysis.cpp
View File

@ -492,10 +492,13 @@ void runAnalysis::run( int timestep, TwoPhase& Averages, const double *Phi,
matches(type,AnalysisType::IdentifyBlobs) ) matches(type,AnalysisType::IdentifyBlobs) )
{ {
phase = std::shared_ptr<DoubleArray>(new DoubleArray(d_N[0],d_N[1],d_N[2])); phase = std::shared_ptr<DoubleArray>(new DoubleArray(d_N[0],d_N[1],d_N[2]));
ScaLBL_CopyToHost(phase->data(),Phi,N*sizeof(double)); //ScaLBL_CopyToHost(phase->data(),Phi,N*sizeof(double));
ScaLBL_Comm.RegularLayout(Map,Phi,phase.get());
} }
if ( matches(type,AnalysisType::CopyPhaseIndicator) ) { if ( matches(type,AnalysisType::CopyPhaseIndicator) ) {
memcpy(Averages.Phase_tplus.data(),phase->data(),N*sizeof(double)); memcpy(Averages.Phase_tplus.data(),phase->data(),N*sizeof(double));
//Averages.ColorToSignedDistance(d_beta,Averages.Phase,Averages.Phase_tplus); //Averages.ColorToSignedDistance(d_beta,Averages.Phase,Averages.Phase_tplus);
} }
if ( matches(type,AnalysisType::ComputeAverages) ) { if ( matches(type,AnalysisType::ComputeAverages) ) {

2
tests/lbpm_dfh_simulator.cpp
View File

@ -751,7 +751,7 @@ int main(int argc, char **argv)
PROFILE_STOP("Update"); PROFILE_STOP("Update");
// Run the analysis // Run the analysis
// analysis.run( timestep, *Averages, Phi, Pressure, Velocity, fq, Den ); analysis.run( timestep, *Averages, Phi, Pressure, Velocity, fq, Den );
} }
analysis.finish(); analysis.finish();