update subphase / minkowski for Euler

This commit is contained in:
James E McClure committed 2020-08-03 07:08:14 -04:00
1 parent d88455a854
commit a1df2b57de
2 files changed
+9 -8

No files matched your search

+5 -4
View File
@@ -94,11 +94,13 @@ void Minkowski::ComputeScalar(const DoubleArray& Field, const double isovalue)
//Xi += 0.25*double(object.VertexCount);
// check if vertices are at corners
for (int idx=0; idx<object.VertexCount; idx++){
auto P1 = object.vertex.coords(idx);
/*auto P1 = object.vertex.coords(idx);
if ( remainder(P1.x,1.0)==0.0 && remainder(P1.y,1.0)==0.0 && remainder(P1.z,1.0)==0.0 ){
Xi += 0.125;
}
else Xi += 0.25;
else
*/
Xi += 0.25;
}
/*double nside_extern = double(npts);
double nside_intern = double(npts)-3.0;
@@ -150,9 +152,8 @@ void Minkowski::MeasureObject(){
}
CalcDist(distance,id,*Dm);
//Mean3D(distance,smooth_distance);
Eikonal(distance, id, *Dm, 20, {true, true, true});
//Eikonal(distance, id, *Dm, 20, {true, true, true});
ComputeScalar(distance,0.0);
}
+4 -4
View File
@@ -427,13 +427,13 @@ void SubPhase::Full(){
}
}
// measure the whole object
morph_n->MeasureObject(0.5/beta,Phi);
morph_n->MeasureObject();//0.5/beta,Phi);
nd.V = morph_n->V();
nd.A = morph_n->A();
nd.H = morph_n->H();
nd.X = morph_n->X();
// measure only the connected part
nd.Nc = morph_n->MeasureConnectedPathway(0.5/beta,Phi);
nd.Nc = morph_n->MeasureConnectedPathway();//0.5/beta,Phi);
nc.V = morph_n->V();
nc.A = morph_n->A();
nc.H = morph_n->H();
@@ -475,13 +475,13 @@ void SubPhase::Full(){
}
}
}
morph_w->MeasureObject(-0.5/beta,Phi);
morph_w->MeasureObject();//-0.5/beta,Phi);
wd.V = morph_w->V();
wd.A = morph_w->A();
wd.H = morph_w->H();
wd.X = morph_w->X();
// measure only the connected part
wd.Nc = morph_w->MeasureConnectedPathway(-0.5/beta,Phi);
wd.Nc = morph_w->MeasureConnectedPathway();//-0.5/beta,Phi);
wc.V = morph_w->V();
wc.A = morph_w->A();
wc.H = morph_w->H();