|
@@ -823,7 +823,7 @@ namespace OTSGBCalculate
|
|
|
COTSParticleList listBAndDParticles;//
|
|
|
listBAndDParticles.clear();
|
|
|
// get all the all particles for each level
|
|
|
- //mapAllParticles.clear();
|
|
|
+
|
|
|
for (auto pParticle : listParticle)
|
|
|
{ // compute length width ratio
|
|
|
if (pParticle->GetType() == OTS_PARTICLE_TYPE::INVALID)//here we take all the particles except Invalid.
|
|
@@ -862,7 +862,7 @@ namespace OTSGBCalculate
|
|
|
listAThinParticles.push_back(gbp);
|
|
|
}
|
|
|
|
|
|
- //mapAllParticles[pParticle] = GBParticle(pParticle, GB_CLASSIFY_TYPE::A_TYPE, wt);
|
|
|
+
|
|
|
}
|
|
|
else if (nChemicalType == GB_CHEMICAL_TYPE::CHE_O)
|
|
|
{
|
|
@@ -873,13 +873,13 @@ namespace OTSGBCalculate
|
|
|
{
|
|
|
listAThinParticles.push_back(gbp);
|
|
|
}
|
|
|
- //mapAllParticles[pParticle] = GBParticle(pParticle, GB_CLASSIFY_TYPE::C_TYPE, wt);
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
else//长宽比小于3的颗粒,有3种情况,一种是串条状的B类颗粒,一种是单独的D类颗粒,如果费雷特直径大于13则为DS类颗粒
|
|
|
{
|
|
|
// B, or D or DS
|
|
|
- // compute Feret's diameter
|
|
|
+
|
|
|
double dFeretDiameter = pParticle->GetFeretDiameter();
|
|
|
if (dFeretDiameter >= 13)
|
|
|
{
|
|
@@ -891,8 +891,7 @@ namespace OTSGBCalculate
|
|
|
else
|
|
|
{
|
|
|
// B or D
|
|
|
- //GBParticle gbP = GBParticle(pParticle, GB_CLASSIFY_TYPE::INVALID, GB_WIDTH_TYPE::INVALID);
|
|
|
- //不能确定是B或D,先设为INVALID
|
|
|
+
|
|
|
listBAndDParticles.push_back(pParticle);
|
|
|
|
|
|
}
|
|
@@ -916,7 +915,7 @@ namespace OTSGBCalculate
|
|
|
{
|
|
|
listDThinParticles.push_back(pGBParticle);
|
|
|
}
|
|
|
- //mapAllParticles[pGBParticle.myPart] = GBParticle(pGBParticle.myPart, GB_CLASSIFY_TYPE::D_TYPE, wt);
|
|
|
+
|
|
|
}
|
|
|
else//找到了相邻接的颗粒,不是孤立的则为B类
|
|
|
{
|