@@ -556,45 +556,6 @@ def loadChemkinFile(path, dictionaryPath=None):
556556 if dictionaryPath :
557557 speciesDict = loadSpeciesDictionary (dictionaryPath )
558558
559- def checkDuplicateKinetics (reaction , kinetics ,comments ,dupReactionList ,reactionList ):
560- if 'DUP' in kinetics :
561- kinetics = kinetics .replace ('\n DUP' ,'' )
562- reaction = readKineticsEntry (kinetics ,speciesDict ,energyUnits ,moleculeUnits )
563- reaction .kinetics .comment = comments
564- if dupReactionList :
565- if not reaction .hasTemplate (dupReactionList [- 1 ].reactants ,dupReactionList [- 1 ].products ):
566- # It's not the same kind of duplicate reaction
567- oldReactionKinetics = MultiKinetics ()
568- for item in dupReactionList :
569- oldReactionKinetics .kineticsList .append (item .kinetics )
570- oldReaction = dupReactionList [0 ]
571- oldReaction .kinetics = oldReactionKinetics
572- reactionList .append (oldReaction )
573- dupReactionList = []
574- dupReactionList .append (reaction )
575- kinetics = ''
576- comments = ''
577- return reaction , kinetics , comments , dupReactionList , reactionList
578-
579- else :
580- # No more duplicate reactions
581- if dupReactionList :
582- # add previous reaction if they were duplicate reactions
583- oldReactionKinetics = MultiKinetics ()
584- for item in dupReactionList :
585- oldReactionKinetics .kineticsList .append (item .kinetics )
586- oldReaction = dupReactionList [0 ]
587- oldReaction .kinetics = oldReactionKinetics
588- reactionList .append (oldReaction )
589- dupReactionList = []
590- # add this new, nonduplicate reaction
591- reaction = readKineticsEntry (kinetics ,speciesDict ,energyUnits ,moleculeUnits )
592- reaction .kinetics .comment = comments
593- reactionList .append (reaction )
594- kinetics = ''
595- comments = ''
596- return reaction , kinetics , comments , dupReactionList , reactionList
597-
598559 with open (path , 'r' ) as f :
599560
600561 line0 = f .readline ()
0 commit comments