diff options
| author | brenda-br | 2023-02-24 11:55:27 +0530 |
|---|---|---|
| committer | brenda-br | 2023-02-24 11:55:27 +0530 |
| commit | 2b94618c50110c38cd67564a5b58630aeeb2adc5 (patch) | |
| tree | 180474d0ed0b1faba9066bb8b9d98432473d9157 | |
| parent | d476d2e053f937c0060f696312f301591e4f43ea (diff) | |
| download | Chemical-Simulator-GUI-2b94618c50110c38cd67564a5b58630aeeb2adc5.tar.gz Chemical-Simulator-GUI-2b94618c50110c38cd67564a5b58630aeeb2adc5.tar.bz2 Chemical-Simulator-GUI-2b94618c50110c38cd67564a5b58630aeeb2adc5.zip | |
Fix #62 Remove Redundant Lines
44 files changed, 43 insertions, 101 deletions
diff --git a/src/main/Simulator/Databases/__pycache__/Databases.cpython-37.pyc b/src/main/Simulator/Databases/__pycache__/Databases.cpython-37.pyc Binary files differindex dd554f1..861284c 100644 --- a/src/main/Simulator/Databases/__pycache__/Databases.cpython-37.pyc +++ b/src/main/Simulator/Databases/__pycache__/Databases.cpython-37.pyc diff --git a/src/main/Simulator/Graph.mo b/src/main/Simulator/Graph.mo index 020de5e..6a4b75a 100644 --- a/src/main/Simulator/Graph.mo +++ b/src/main/Simulator/Graph.mo @@ -2,5 +2,5 @@ model Graph import data = Simulator.Files.ChemsepDatabase; parameter data.Benzene comp1; parameter data.Toluene comp2; -extends BinaryEnvelopes.RaoultsLaw(Nc = 2, data_points = 40, comp = { comp1, comp2 }, T = fill( 23000, 40)); +extends BinaryEnvelopes.RaoultsLaw(Nc = 2, data_points = 40, comp = { comp1, comp2 }, P = fill( 25000, 40)); end Graph;
\ No newline at end of file diff --git a/src/main/python/DockWidgets/DockWidget.py b/src/main/python/DockWidgets/DockWidget.py index a97212a..fcfc172 100644 --- a/src/main/python/DockWidgets/DockWidget.py +++ b/src/main/python/DockWidgets/DockWidget.py @@ -51,13 +51,13 @@ class DockWidget(QDockWidget,ui_dialog): self.input_dict= {} for i in reversed(range(self.formLayout.count())): self.formLayout.removeRow(i) - print(self.comboBox.currentText()) + #print(self.comboBox.currentText()) for i in self.obj.variables: if self.obj.variables[i]['name'] == self.comboBox.currentText(): currentText = i break self.input_dict = self.obj.param_getter(currentText) - print('mode selection ', self.input_dict) + #print('mode selection ', self.input_dict) self.input_params_list() def input_params_list(self): diff --git a/src/main/python/DockWidgets/DockWidgetCompressorExpander.py b/src/main/python/DockWidgets/DockWidgetCompressorExpander.py index 2439801..8b23b8e 100644 --- a/src/main/python/DockWidgets/DockWidgetCompressorExpander.py +++ b/src/main/python/DockWidgets/DockWidgetCompressorExpander.py @@ -51,18 +51,18 @@ class DockWidgetCompressorExpander(QDockWidget,ui_dialog): self.input_dict= {} for i in reversed(range(self.formLayout.count())): self.formLayout.removeRow(i) - print(self.comboBox.currentText()) + #print(self.comboBox.currentText()) for i in self.obj.variables: if self.obj.variables[i]['name'] == self.comboBox.currentText(): currentText = i break self.input_dict = self.obj.param_getter(currentText) - print('mode selection ', self.input_dict) + #print('mode selection ', self.input_dict) self.input_params_list() def input_params_list(self): try: - print("input_params_list ", self.input_dict) + #print("input_params_list ", self.input_dict) for c,i in enumerate(self.input_dict): if i == None: continue @@ -98,11 +98,11 @@ class DockWidgetCompressorExpander(QDockWidget,ui_dialog): elif (i == "Thermo Package"): self.dict[i] = self.input_dict[i].currentText() else: - print(self.input_dict[i], i, self.obj.type) + #print(self.input_dict[i], i, self.obj.type) if (self.input_dict[i].text()): self.dict[i] = self.input_dict[i].text() else: - print(self.input_dict[i].text()) + #print(self.input_dict[i].text()) self.show_error() break @@ -137,19 +137,19 @@ class DockWidgetCompressorExpander(QDockWidget,ui_dialog): def results_category(self,name): flag = True try: - print("Under result category name ", name) + #print("Under result category name ", name) result=self.container.result obj = self.container.fetch_object(name) self.tableWidget.setRowCount(0) variKeys = list(obj.variables.keys()) - print(variKeys) + #print(variKeys) for i, val in enumerate(variKeys): propertyname = name + '.' + val - print(i,val, propertyname) + #print(i,val, propertyname) if propertyname in result[0]: ind = result[0].index(propertyname) resultval = str(result[-1][ind]) - print("######Resultsfetch####",val,resultval) + #print("######Resultsfetch####",val,resultval) rowPosition = self.tableWidget.rowCount() self.tableWidget.insertRow(rowPosition) self.tableWidget.setItem(rowPosition , 0, QTableWidgetItem(obj.variables[val]['name'])) diff --git a/src/main/python/DockWidgets/DockWidgetDistillationColumn.py b/src/main/python/DockWidgets/DockWidgetDistillationColumn.py index cf71f58..08e5bcd 100644 --- a/src/main/python/DockWidgets/DockWidgetDistillationColumn.py +++ b/src/main/python/DockWidgets/DockWidgetDistillationColumn.py @@ -162,30 +162,30 @@ class DockWidgetDistillationColumn(QDockWidget, ui_dialog): temp = i + 1 print(temp) - print(temp) - print(self.input_dict[temp+1]) + # print(temp) + # print(self.input_dict[temp+1]) self.dict.append(self.input_dict[temp+1].currentText()) - print(temp+1) + # print(temp+1) self.dict.append(int(self.input_dict[temp+2].text())) - print(temp+2) + #print(temp+2) self.dict.append(self.input_dict[temp+3].currentText()) - print(temp+3) + #print(temp+3) self.dict.append(self.input_dict[temp+4].currentText()) - print(temp+4) + #print(temp+4) self.dict.append(int(self.input_dict[temp+5].text())) - print(temp+5) + #print(temp+5) self.dict.append(int(self.input_dict[temp+6].text())) - print(temp+6) + #print(temp+6) self.dict.append(self.input_dict[temp+7].currentText()) - print(temp+7) + #print(temp+7) self.dict.append(self.input_dict[temp+8].currentText()) - print(temp+8) + #print(temp+8) self.dict.append(int(self.input_dict[temp+9].text())) - print(temp+9) + #print(temp+9) self.dict.append(self.input_dict[temp+10].currentText()) - print(temp + 10) + #print(temp + 10) - print("param ", self.dict) + #print("param ", self.dict) self.obj.param_setter(self.dict) if(self.isVisible()): currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() @@ -218,20 +218,20 @@ class DockWidgetDistillationColumn(QDockWidget, ui_dialog): def results_category(self,name): flag = True try: - print("Under result category name ", name) + #print("Under result category name ", name) result = self.container.result obj = self.container.fetch_object(name) self.tableWidget.setRowCount(0) variKeys = obj.result_parameters - print(variKeys) + #print(variKeys) for i, val in enumerate(variKeys): propertyname = name + '.' + val - print(i, val, propertyname) + #print(i, val, propertyname) if propertyname in result[0]: ind = result[0].index(propertyname) resultval = str(result[-1][ind]) obj.variables[val]['value'] = result[-1][ind] - print("######Resultsfetch####", val, resultval) + #print("######Resultsfetch####", val, resultval) rowPosition = self.tableWidget.rowCount() self.tableWidget.insertRow(rowPosition) self.tableWidget.setItem(rowPosition, 0, QTableWidgetItem(obj.variables[val]['name'])) @@ -269,7 +269,7 @@ class DockWidgetDistillationColumn(QDockWidget, ui_dialog): # else: # Stages_F_p[0][2] = result[-1][ind] else: - print(ind) + #print(ind) phase_no = int(result[0][ind][result[0][ind].index('[') + 1]) comp_no = int(result[0][ind][result[0][ind].index(']') - 1]) Stages_x_pc[0][comp_no - 1][phase_no - 1] = result[-1][ind] @@ -294,8 +294,8 @@ class DockWidgetDistillationColumn(QDockWidget, ui_dialog): # else: # Stages_F_p[i][2] = result[-1][ind] else: - print(ind) - print(result[0][ind]) + # print(ind) + # print(result[0][ind]) phase_no = int(result[0][ind].split('.')[-1][result[0][ind].split('.')[-1].index('[') + 1]) comp_no = int(result[0][ind].split('.')[-1][result[0][ind].split('.')[-1].index(']') - 1]) Stages_x_pc[i][comp_no - 1][phase_no - 1] = result[-1][ind] diff --git a/src/main/python/DockWidgets/DockWidgetFlash.py b/src/main/python/DockWidgets/DockWidgetFlash.py index 7742e62..a2abbeb 100644 --- a/src/main/python/DockWidgets/DockWidgetFlash.py +++ b/src/main/python/DockWidgets/DockWidgetFlash.py @@ -68,9 +68,9 @@ class DockWidgetFlash(QDockWidget,ui_dialog): def param(self): try: self.dict = [] - print("param.input_dict ", self.input_dict) + #print("param.input_dict ", self.input_dict) self.dict = [self.input_dict[0].currentText(),self.input_dict[1].isChecked(), float(self.input_dict[2].text()), self.input_dict[3].isChecked(), float(self.input_dict[4].text())] - print("param ", self.dict) + #print("param ", self.dict) self.obj.param_setter(self.dict) if(self.isVisible()): currentVal = self.parent().container.graphics.graphicsView.horizontalScrollBar().value() diff --git a/src/main/python/DockWidgets/DockWidgetMaterialStream.py b/src/main/python/DockWidgets/DockWidgetMaterialStream.py index 5bc77c5..684d1df 100644 --- a/src/main/python/DockWidgets/DockWidgetMaterialStream.py +++ b/src/main/python/DockWidgets/DockWidgetMaterialStream.py @@ -81,9 +81,6 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): l = QLineEdit(str(self.obj.variables['x_pc']['value'][j])) except: l = QLineEdit() - # if self.input_dict[i] != '': - # l.setText(str(self.obj.variables['x_pc']['value'][j])) - # print('l = ', str(self.obj.variables['x_pc']['value'][j])) self.input_dict[i] = "x_pc" lay.addWidget(QLabel(str(compound_selected[j])+":"),j,0, alignment= Qt.AlignLeft) @@ -339,8 +336,6 @@ class DockWidgetMaterialStream(QDockWidget,ui_dialog): self.input_dict = {} self.input_dict = self.obj.param_getter(self.comboBox.currentText()) # print("before", self.input_dict) - #self.input_dict.pop("x_pc") - # temp = self.input_dict.pop('thermo_package') for i in range(len(compound_selected)): #print(i) self.input_dict['x_pc[1,' + str(i+1) + ']'] = self.obj.variables['x_pc[1,' + str(i+1) +']']['value'] diff --git a/src/main/python/DockWidgets/DockWidgetShortcutColumn.py b/src/main/python/DockWidgets/DockWidgetShortcutColumn.py index 43d01e9..33605b4 100644 --- a/src/main/python/DockWidgets/DockWidgetShortcutColumn.py +++ b/src/main/python/DockWidgets/DockWidgetShortcutColumn.py @@ -120,20 +120,20 @@ class DockWidgetShortcutColumn(QDockWidget,ui_dialog): def results_category(self,name): flag = True try: - print("Under result category name ", name) + #print("Under result category name ", name) result=self.container.result obj = self.container.fetch_object(name) self.tableWidget.setRowCount(0) variKeys = obj.result_parameters - print(variKeys) + #print(variKeys) for i, val in enumerate(variKeys): propertyname = name + '.' + val - print(i,val, propertyname) + #print(i,val, propertyname) if propertyname in result[0]: ind = result[0].index(propertyname) resultval = str(result[-1][ind]) obj.variables[val]['value']= result[-1][ind] - print("######Resultsfetch####",val,resultval) + #print("######Resultsfetch####",val,resultval) rowPosition = self.tableWidget.rowCount() self.tableWidget.insertRow(rowPosition) self.tableWidget.setItem(rowPosition , 0, QTableWidgetItem(obj.variables[val]['name'])) diff --git a/src/main/python/DockWidgets/__pycache__/DistillationColumnStagewiseResults.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DistillationColumnStagewiseResults.cpython-37.pyc Binary files differindex 98f972c..d8c43f1 100644 --- a/src/main/python/DockWidgets/__pycache__/DistillationColumnStagewiseResults.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DistillationColumnStagewiseResults.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidget.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidget.cpython-37.pyc Binary files differindex 16d524f..4829b7e 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidget.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidget.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc Binary files differindex ddb230a..14c0665 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetCompoundSeparator.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetCompressorExpander.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetCompressorExpander.cpython-37.pyc Binary files differindex b50fc09..93827d9 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetCompressorExpander.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetCompressorExpander.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc Binary files differindex 7b8ffd6..c7de762 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetDistillationColumn.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc Binary files differindex 9bb461c..4b212fd 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetFlash.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc Binary files differindex 426a9a7..fea6a84 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetMaterialStream.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc Binary files differindex 05e5d7f..2974d48 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc Binary files differindex e6c7383..19bc102 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc Binary files differindex 9461f0b..df9b82e 100644 --- a/src/main/python/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/DockWidgetSplitter.cpython-37.pyc diff --git a/src/main/python/DockWidgets/__pycache__/__init__.cpython-37.pyc b/src/main/python/DockWidgets/__pycache__/__init__.cpython-37.pyc Binary files differindex afad453..9a9342e 100644 --- a/src/main/python/DockWidgets/__pycache__/__init__.cpython-37.pyc +++ b/src/main/python/DockWidgets/__pycache__/__init__.cpython-37.pyc diff --git a/src/main/python/OMChem/CompSep.py b/src/main/python/OMChem/CompSep.py index 9579498..d538acb 100644 --- a/src/main/python/OMChem/CompSep.py +++ b/src/main/python/OMChem/CompSep.py @@ -6,7 +6,6 @@ class CompSep(): self.SepFact = json.dumps(SepFact).replace('[','{').replace(']','}') self.SepStrm = str(SepStrm) self.SepFactValue = json.dumps(SepFactValue).replace('[','{').replace(']','}') - #self.name = name self.OM_data_eqn = '' self.OM_data_init = '' self.InputStms = [] diff --git a/src/main/python/OMChem/ConvReactor.py b/src/main/python/OMChem/ConvReactor.py index ccdf524..5c83106 100644 --- a/src/main/python/OMChem/ConvReactor.py +++ b/src/main/python/OMChem/ConvReactor.py @@ -16,7 +16,7 @@ class ConvReactor(): self.Tdef = str(Tdef) self.type = 'ConvReactor' - self.EngStms = EngStms(name="EngStm") + self.EngStms = EngStm(name="EngStm") def OM_Flowsheet_Init(self, addedcomp): self.OM_data_init = '' diff --git a/src/main/python/OMChem/DistCol.py b/src/main/python/OMChem/DistCol.py index 1492bc2..c4a88c3 100644 --- a/src/main/python/OMChem/DistCol.py +++ b/src/main/python/OMChem/DistCol.py @@ -5,7 +5,6 @@ class DistCol(): self.numStage = numStage self.numFeeds=numFeeds self.feedStages=feedStages - #self.name = name[0] self.name = name + str(DistCol.counter) self.OM_data_eqn = '' self.OM_data_init = '' @@ -13,7 +12,6 @@ class DistCol(): self.OutputStms = None self.EngStm1 = EngStm(name='EngStm1'+self.name) self.EngStm2 = EngStm(name='EngStm2'+self.name) - #self.count = name[1] self.count = DistCol.counter self.thermoPackage='Raoults_Law' self.type = 'DistCol' @@ -87,7 +85,6 @@ class DistCol(): def OM_Flowsheet_Eqn(self, addedcomp): self.OM_data_eqn = '' - # self.OM_data_eqn = self.name + '.pressDrop = ' + str(self.PressDrop) + ';\n' self.OM_data_eqn = self.OM_data_eqn + ('connect('+self.name+'.'+'condensor_duty'+','+ self.EngStm1.name+'.inlet);\n') self.OM_data_eqn = self.OM_data_eqn + ('connect('+self.name+'.reboiler_duty'+', '+self.EngStm2.name+'.inlet);\n') self.OM_data_eqn = self.OM_data_eqn + ('connect('+self.name+'.distillate'+", "+self.OutputStms[0].name+'.inlet);\n') diff --git a/src/main/python/OMChem/Flash.py b/src/main/python/OMChem/Flash.py index a3bf5dc..165849a 100644 --- a/src/main/python/OMChem/Flash.py +++ b/src/main/python/OMChem/Flash.py @@ -1,13 +1,11 @@ class Flash(): counter = 1 def __init__(self,name='Flash'): - #self.name = name[0] self.OM_data_eqn = '' self.OM_data_init = '' self.InputStms = None self.OutputStms = None self.type = 'flash' - #self.count = name[1] self.count = Flash.counter self.thermoPackage =None diff --git a/src/main/python/OMChem/Heater.py b/src/main/python/OMChem/Heater.py index cf9b8f1..a24253d 100644 --- a/src/main/python/OMChem/Heater.py +++ b/src/main/python/OMChem/Heater.py @@ -4,12 +4,9 @@ class Heater(): def __init__(self,name='Heater',PressureDrop = None, eff = None): self.PressureDrop = PressureDrop self.eff = eff - #self.name = name self.OM_data_eqn = '' self.OM_data_init = '' self.InputStms = None - #self.heatAdd=heatAdd - #self.outT = outT self.OutputStms = None self.EngStms = EngStm(name='EngStm'+name) self.type = 'Heater' @@ -67,7 +64,6 @@ class Heater(): def OM_Flowsheet_Eqn(self, addedcomp): self.OM_data_eqn = '' - # self.OM_data_eqn = self.name + '.pressDrop = ' + str(self.PressDrop) + ';\n' self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.name + '.outlet,' + self.OutputStms[0].name + '.inlet);\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.EngStms.name + '.outlet,' + self.name + '.energy);\n') diff --git a/src/main/python/OMChem/Pump.py b/src/main/python/OMChem/Pump.py index 3b6ed2c..e9b9149 100644 --- a/src/main/python/OMChem/Pump.py +++ b/src/main/python/OMChem/Pump.py @@ -3,12 +3,9 @@ class Pump(): counter = 1 def __init__(self,name='Pump',eff = None): self.eff = eff - #self.name = name self.OM_data_eqn = '' self.OM_data_init = '' self.InputStms = None - #self.heatAdd=heatAdd - #self.outT = outT self.OutputStms = None self.EngStms = EngStm(name='EngStm'+name) self.type = 'Pump' @@ -54,7 +51,6 @@ class Pump(): def OM_Flowsheet_Eqn(self, addedcomp): self.OM_data_eqn = '' - # self.OM_data_eqn = self.name + '.pressDrop = ' + str(self.PressDrop) + ';\n' self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.name + '.outlet,' + self.OutputStms[0].name + '.inlet);\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.EngStms.name + '.outlet,' + self.name + '.energy);\n') diff --git a/src/main/python/OMChem/ShortcutColumn.py b/src/main/python/OMChem/ShortcutColumn.py index a018873..60d9d1b 100644 --- a/src/main/python/OMChem/ShortcutColumn.py +++ b/src/main/python/OMChem/ShortcutColumn.py @@ -8,7 +8,6 @@ class ShortcutColumn(): self.HKey = HKey self.LKeyMolFrac = None self.HKeyMolFrac = None - #self.name = name[0] self.name = name + str(ShortcutColumn.counter) self.OM_data_eqn = '' self.OM_data_init = '' @@ -17,7 +16,6 @@ class ShortcutColumn(): self.EngStm1 = EngStm(name='EngStm1'+self.name) self.EngStm2 = EngStm(name='EngStm2'+self.name) - #self.count = name[1] self.count = ShortcutColumn.counter self.condType='' self.actR = None diff --git a/src/main/python/OMChem/Splitter.py b/src/main/python/OMChem/Splitter.py index f873146..98d41ab 100644 --- a/src/main/python/OMChem/Splitter.py +++ b/src/main/python/OMChem/Splitter.py @@ -51,7 +51,7 @@ class Splitter(): self.OM_data_eqn = '' comp_count = len(addedcomp) strcount = 1 - print("Output#########",self.OutputStms) + #print("Output#########",self.OutputStms) for strm in self.OutputStms: self.OM_data_eqn = self.OM_data_eqn + ( 'connect(' + strm.name + '.inlet,' + self.name + '.outlet[' + str(strcount) + ']);\n') diff --git a/src/main/python/OMChem/Valve.py b/src/main/python/OMChem/Valve.py index 9e8494b..05fa55f 100644 --- a/src/main/python/OMChem/Valve.py +++ b/src/main/python/OMChem/Valve.py @@ -1,10 +1,8 @@ class Valve(): counter = 1 def __init__(self,name='Valve'): - #self.PressDrop = PressureDrop self.mode = None self.modeVal = None - #self.name = name self.OM_data_eqn = '' self.OM_data_init = '' self.InputStms = None @@ -56,6 +54,5 @@ class Valve(): self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.name + '.outlet,' + self.OutputStms[0].name + '.inlet);\n') - print("asdfvfdasdsqdfdedfdfv12345678987654321234567898765") self.OM_data_eqn = self.OM_data_eqn + (self.name+'.'+self.mode+'='+ self.modeVal + ';\n') return self.OM_data_eqn
\ No newline at end of file diff --git a/src/main/python/OMChem/__pycache__/EngStm.cpython-37.pyc b/src/main/python/OMChem/__pycache__/EngStm.cpython-37.pyc Binary files differindex fd407a2..d065cdb 100644 --- a/src/main/python/OMChem/__pycache__/EngStm.cpython-37.pyc +++ b/src/main/python/OMChem/__pycache__/EngStm.cpython-37.pyc diff --git a/src/main/python/OMChem/__pycache__/Flowsheet.cpython-37.pyc b/src/main/python/OMChem/__pycache__/Flowsheet.cpython-37.pyc Binary files differindex d602758..2a2da08 100644 --- a/src/main/python/OMChem/__pycache__/Flowsheet.cpython-37.pyc +++ b/src/main/python/OMChem/__pycache__/Flowsheet.cpython-37.pyc diff --git a/src/main/python/OMChem/__pycache__/__init__.cpython-37.pyc b/src/main/python/OMChem/__pycache__/__init__.cpython-37.pyc Binary files differindex d9f9b6b..ee871fe 100644 --- a/src/main/python/OMChem/__pycache__/__init__.cpython-37.pyc +++ b/src/main/python/OMChem/__pycache__/__init__.cpython-37.pyc diff --git a/src/main/python/OMChem/adiabatic_comp.py b/src/main/python/OMChem/adiabatic_comp.py index d0a6b72..bda0476 100644 --- a/src/main/python/OMChem/adiabatic_comp.py +++ b/src/main/python/OMChem/adiabatic_comp.py @@ -3,7 +3,6 @@ class AdiabaticCompressor(): counter = 1 def __init__(self,name='AdiabaticCompressor', eff = None): self.eff = eff - #self.name = name[0] self.name = name + str(AdiabaticCompressor.counter) self.OM_data_eqn = '' @@ -11,7 +10,6 @@ class AdiabaticCompressor(): self.InputStms = None self.OutputStms = None self.EngStms = EngStm(name='EngStm'+self.name) - #self.count = name[1] self.count = AdiabaticCompressor.counter self.type = 'AdiabaticCompressor' self.thermoPackage ="RaoultsLaw" @@ -59,7 +57,6 @@ class AdiabaticCompressor(): def OM_Flowsheet_Eqn(self, addedcomp): self.OM_data_eqn = '' - # self.OM_data_eqn = self.name + '.pressDrop = ' + str(self.PressDrop) + ';\n' self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.name + '.outlet,' + self.OutputStms[0].name + '.inlet);\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.EngStms.name + '.outlet,' + self.name + '.energy);\n') diff --git a/src/main/python/OMChem/adiabatic_exp.py b/src/main/python/OMChem/adiabatic_exp.py index 2754f0a..48381fa 100644 --- a/src/main/python/OMChem/adiabatic_exp.py +++ b/src/main/python/OMChem/adiabatic_exp.py @@ -3,14 +3,12 @@ class AdiabaticExpander(): counter = 1 def __init__(self,name='AdiabaticExpander', eff = None): self.eff = eff - #self.name = name[0] self.name = name + str(AdiabaticExpander.counter) self.OM_data_eqn = '' self.OM_data_init = '' self.InputStms = None self.OutputStms = None self.EngStms = EngStm(name='EngStm'+self.name) - #self.count = name[1] self.count = AdiabaticExpander.counter self.type = 'AdiabaticExpander' self.thermoPackage ="RaoultsLaw" @@ -59,7 +57,6 @@ class AdiabaticExpander(): def OM_Flowsheet_Eqn(self, addedcomp): self.OM_data_eqn = '' - # self.OM_data_eqn = self.name + '.pressDrop = ' + str(self.PressDrop) + ';\n' self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.name + '.outlet,' + self.OutputStms[0].name + '.inlet);\n') self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.EngStms.name + '.outlet,' + self.name + '.energy);\n') diff --git a/src/main/python/utils/Bin_Phase_env.py b/src/main/python/utils/Bin_Phase_env.py index ee973f9..dd6f938 100644 --- a/src/main/python/utils/Bin_Phase_env.py +++ b/src/main/python/utils/Bin_Phase_env.py @@ -23,6 +23,7 @@ parentPath = os.path.dirname(parent) sys.path.append(parentPath) ui_dialog,_ = loadUiType(parentPath+'/ui/utils/Binary_Phase_Env.ui') +pg.CONFIG_OPTIONS['crashWarning'] = False class BinPhaseEnv(QWidget,ui_dialog): def __init__(self,comp): @@ -97,7 +98,7 @@ class BinPhaseEnv(QWidget,ui_dialog): self.omhome = '/usr' return os.path.join(self.omhome, 'bin', 'omc') except BaseException: - print("The OpenModelica compiler is missing in the System path please install it" ) + #print("The OpenModelica compiler is missing in the System path please install it" ) raise def plot(self): diff --git a/src/main/python/utils/ComponentSelector.py b/src/main/python/utils/ComponentSelector.py index a522834..44a2696 100644 --- a/src/main/python/utils/ComponentSelector.py +++ b/src/main/python/utils/ComponentSelector.py @@ -24,7 +24,6 @@ class ComponentSelector(QDialog,ui_dialog): self.setupUi(self) self.dict1=dict()#empty dictionary which will store the obj and its compound - #self.DB1=#instance of Database class in Database.py module self.instance=[ChemsepDatabase()] #list of all the instances self.lines=[] @@ -32,14 +31,7 @@ class ComponentSelector(QDialog,ui_dialog): x=i.get_comp_name_list() self.dict1[i]=x self.lines+=x - #print(self.lines) - - - #self.DB1_list=self.DB1.get_comp_name_list() - #storingchemsep - #database compound list in DB1_list - #self.dict1[self.DB1]=self.DB1_list #storing the list as a value and the db as key in dictionary - #self.lines=self.DB1_list #combined list of all the edited compounds + #print(self.lines) self.model = QStringListModel() self.model.setStringList(self.lines) diff --git a/src/main/python/utils/Graphics.py b/src/main/python/utils/Graphics.py index 017ebef..139fcba 100644 --- a/src/main/python/utils/Graphics.py +++ b/src/main/python/utils/Graphics.py @@ -492,12 +492,6 @@ class NodeItem(QtWidgets.QGraphicsItem): self.nin = int(text) self.obj.no_of_inputs = self.nin self.obj.variables['NI']['value'] = self.nin - # elif self.obj.type == 'Splitter' and not self.obj.saved: - # text, ok = QInputDialog.getText(self.container.graphicsView, 'Splitter', 'Enter number of output:') - # if ok and text: - # self.nop = int(text) - # self.obj.no_of_outputs = self.nop - # self.obj.variables['No']['value'] = self.nop elif self.obj.type == 'DistillationColumn'and not self.obj.saved: text, self.ok = QInputDialog.getText(self.container.graphicsView, 'DistillationColumn', 'Enter number of input(1-8):', echo=QLineEdit.Normal, text=str(self.obj.no_of_inputs)) @@ -533,7 +527,6 @@ class NodeItem(QtWidgets.QGraphicsItem): # updating input values if self.dock_widget.obj.type != 'MaterialStream': pass - #print(self.dock_widget.obj.type) try: self.dock_widget.obj.param_setter(self.dock_widget.obj.param_getter(self.dock_widget.obj.mode)) except Exception as e: diff --git a/src/main/python/utils/UnitOperations.py b/src/main/python/utils/UnitOperations.py index d3cf3d7..a016c55 100644 --- a/src/main/python/utils/UnitOperations.py +++ b/src/main/python/utils/UnitOperations.py @@ -268,10 +268,8 @@ class DistillationColumn(UnitOperation): self.EngStm2 = EngStm(name='EngStm2'+self.name) self.count = DistillationColumn.counter self.thermo_pack_req = True - # self.modes_list = ['RR', 'Nout', 'T'] self.modes_list = [] self.parameters = ['Nt', 'Ni', 'Ctype', 'Pcond', 'condmode', 'C_comp', 'C_Spec', 'Preb', 'rebmode', 'rebcomp', 'R_Spec'] - #self.parameters = ['Nt', 'InT_s', 'In_s', 'thermo_package', 'Ctype', 'Pcond', 'Preb'] self.result_parameters = ['Cduty.Q', 'Rduty.Q'] self.Cspec_list = ['Reflux Ratio','Product Molar Flow (mol/s)', 'Temperature (K)', 'Compound Molar Fraction', 'Compound Molar Flow (mol/s)'] self.Rspec_list = ['Product Molar Flow (mol/s)', 'Temperature (K)', 'Compound Molar Fraction', 'Compound Molar Flow (mol/s)'] @@ -360,17 +358,10 @@ class DistillationColumn(UnitOperation): + str(self.variables['Ni']['value']) + ",InT_s=" + "{" + str(self.variables['InT_s']['value']).strip('[').strip(']') + "}" + ',Ctype ="' + self.variables['Ctype']['value'] + '");\n') - # self.OM_data_init = self.OM_data_init + 'Simulator.Streams.Energy_Stream '+self.EngStm1.name+';\n' - # self.OM_data_init = self.OM_data_init + 'Simulator.Streams.Energy_Stream '+self.EngStm2.name+';\n' return self.OM_data_init def OM_Flowsheet_Equation(self): self.OM_data_eqn = '' - # self.OM_data_eqn = self.name + '.pressDrop = ' + str(self.PressDrop) + ';\n' - # self.OM_data_eqn = self.OM_data_eqn + ( - # 'connect(' + self.name + '.' + 'condensor_duty' + ',' + self.EngStm1.name + '.inlet);\n') - # self.OM_data_eqn = self.OM_data_eqn + ( - # 'connect(' + self.name + '.reboiler_duty' + ', ' + self.EngStm2.name + '.inlet);\n') self.OM_data_eqn = self.OM_data_eqn + ( 'connect(' + self.name + '.Dist' + ", " + self.output_stms[1].name + '.In);\n') self.OM_data_eqn = self.OM_data_eqn + ( @@ -476,11 +467,6 @@ class CompoundSeparator(UnitOperation): self.variables['SepVal_c']['value'][index//2] = float(params[i]) else: self.variables['SepFact_c']['value'][index//2] = params[i] - - # self.variables['SepFact_c']['value'] = json.dumps(self.variables['SepFact_c']['value']).replace('[','{').replace(']','}') - # self.variables['SepStrm']['value'] = str(self.variables['SepStrm']['value']) - # self.variables['SepVal_c']['value'] = json.dumps(self.variables['SepVal_c']['value']).replace('[','{').replace(']','}') - def OM_Flowsheet_Initialize(self): SepStrm = str(self.variables['SepStrm']['value']) diff --git a/src/main/python/utils/__pycache__/Bin_Phase_env.cpython-37.pyc b/src/main/python/utils/__pycache__/Bin_Phase_env.cpython-37.pyc Binary files differindex b5ecd9c..98c8c66 100644 --- a/src/main/python/utils/__pycache__/Bin_Phase_env.cpython-37.pyc +++ b/src/main/python/utils/__pycache__/Bin_Phase_env.cpython-37.pyc diff --git a/src/main/python/utils/__pycache__/ComponentSelector.cpython-37.pyc b/src/main/python/utils/__pycache__/ComponentSelector.cpython-37.pyc Binary files differindex 89175f7..90a6a0b 100644 --- a/src/main/python/utils/__pycache__/ComponentSelector.cpython-37.pyc +++ b/src/main/python/utils/__pycache__/ComponentSelector.cpython-37.pyc diff --git a/src/main/python/utils/__pycache__/Container.cpython-37.pyc b/src/main/python/utils/__pycache__/Container.cpython-37.pyc Binary files differindex 1aa6e29..48d3916 100644 --- a/src/main/python/utils/__pycache__/Container.cpython-37.pyc +++ b/src/main/python/utils/__pycache__/Container.cpython-37.pyc diff --git a/src/main/python/utils/__pycache__/Graphics.cpython-37.pyc b/src/main/python/utils/__pycache__/Graphics.cpython-37.pyc Binary files differindex f7366e5..d143f83 100644 --- a/src/main/python/utils/__pycache__/Graphics.cpython-37.pyc +++ b/src/main/python/utils/__pycache__/Graphics.cpython-37.pyc diff --git a/src/main/python/utils/__pycache__/Streams.cpython-37.pyc b/src/main/python/utils/__pycache__/Streams.cpython-37.pyc Binary files differindex 5bde993..a0b01a1 100644 --- a/src/main/python/utils/__pycache__/Streams.cpython-37.pyc +++ b/src/main/python/utils/__pycache__/Streams.cpython-37.pyc diff --git a/src/main/python/utils/__pycache__/UnitOperations.cpython-37.pyc b/src/main/python/utils/__pycache__/UnitOperations.cpython-37.pyc Binary files differindex 6385ffd..1c4a7f8 100644 --- a/src/main/python/utils/__pycache__/UnitOperations.cpython-37.pyc +++ b/src/main/python/utils/__pycache__/UnitOperations.cpython-37.pyc diff --git a/src/main/python/utils/__pycache__/__init__.cpython-37.pyc b/src/main/python/utils/__pycache__/__init__.cpython-37.pyc Binary files differindex b1c23fe..a687f51 100644 --- a/src/main/python/utils/__pycache__/__init__.cpython-37.pyc +++ b/src/main/python/utils/__pycache__/__init__.cpython-37.pyc |