소스 검색

fix the bug when doing GroupClassify on MnS-Silicate.

gsp 3 년 전
부모
커밋
330732ec5c
1개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 3
      OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

+ 4 - 3
OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

@@ -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;
 	}