|
@@ -66,6 +66,7 @@ namespace OTSClassifyEngine
|
|
|
// the element chemistries list is an inclusion
|
|
|
CElementChemistriesList listElChemsInc;
|
|
|
CElementChemistriesList listElChemsIncNoFe;
|
|
|
+
|
|
|
double dMolarSum = 0.0f;
|
|
|
double dMolarSumNoFe = 0.0f;
|
|
|
OTS_PARTICLE_TYPE incId;
|
|
@@ -107,7 +108,7 @@ namespace OTSClassifyEngine
|
|
|
{// identified, return TRUE
|
|
|
a_nIncId = nIncId;
|
|
|
IDENTIFIED_INC_GRP_ID grpid;
|
|
|
- GroupClassify(listElChemsIncNoFe,nIncId, grpid);
|
|
|
+ GroupClassify(a_listElementChemistries,nIncId, grpid);
|
|
|
a_GrpId = (int)grpid;
|
|
|
return TRUE;
|
|
|
}
|
|
@@ -126,7 +127,7 @@ namespace OTSClassifyEngine
|
|
|
// identified, return TRUE
|
|
|
a_nIncId = nIncId;
|
|
|
IDENTIFIED_INC_GRP_ID grpid;
|
|
|
- GroupClassify(listElChemsIncNoFe,nIncId, grpid);
|
|
|
+ GroupClassify(a_listElementChemistries,nIncId, grpid);
|
|
|
a_GrpId = (int)grpid;
|
|
|
return TRUE;
|
|
|
}
|
|
@@ -134,7 +135,7 @@ namespace OTSClassifyEngine
|
|
|
// can't identify this inclusion
|
|
|
a_nIncId = (int)OTS_PARTICLE_TYPE::NOT_IDENTIFIED;
|
|
|
IDENTIFIED_INC_GRP_ID grpid;
|
|
|
- GroupClassify(listElChemsIncNoFe,nIncId, grpid);
|
|
|
+ GroupClassify(a_listElementChemistries,nIncId, grpid);
|
|
|
a_GrpId = (int)grpid;
|
|
|
return TRUE;
|
|
|
}
|