Fixes for problem for running simulation

5 files changed, 8 insertions, 8 deletions

diff --git a/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc
index bc4eb06..bc258f6 100644
--- a/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc
+++ b/DockWidgets/__pycache__/DockWidgetShortcutColumn.cpython-37.pyc
diff --git a/OMChem/Flowsheet.py b/OMChem/Flowsheet.py
index 79608ec..4fb0459 100644
--- a/OMChem/Flowsheet.py
+++ b/OMChem/Flowsheet.py
@@ -121,7 +121,7 @@ class Flowsheet():
         self.stm = ['MaterialStream','EngStm']
         for unitop in self.unit_operations:
             if unitop.type not in self.stm:
-                for j in unitop.output_stms: 
+                for j in unitop.output_stms.values():
                     self.outlist.append(j)  
                 
         for unitop in self.unit_operations:
diff --git a/Streams.py b/Streams.py
index f5bdabe..4127945 100644
--- a/Streams.py
+++ b/Streams.py
@@ -311,7 +311,6 @@ class MaterialStream():
         self.OM_data_init = self.OM_data_init + ');\n'        
         return self.OM_data_init
 
-
     def OM_Flowsheet_Equation(self,addedcomp,method):
         self.OM_data_eqn = ''
         self.comp_count = len(addedcomp)
diff --git a/Undo.dat b/Undo.dat
index d22999d..e69de29 100644
--- a/Undo.dat
+++ b/Undo.dat
diff --git a/UnitOperations.py b/UnitOperations.py
index 33479d3..833d972 100644
--- a/UnitOperations.py
+++ b/UnitOperations.py
@@ -141,20 +141,21 @@ class UnitOperation():
 
         if len(self.input_stms)>1 or self.type == 'Mixer':
             strcount = 1
-            for strm in self.input_stms:
+            for strm in self.input_stms.values():
                 self.OM_data_eqn += ('connect(' + strm.name + '.Out,' + self.name + '.In[' + str(strcount) + ']);\n')
                 strcount += 1
         else:
-            self.OM_data_eqn += ('connect(' + self.name + '.In,' + self.input_stms[0].name + '.Out);\n')
+            print(self.input_stms)
+            self.OM_data_eqn += ('connect(' + self.name + '.In,' + self.input_stms[1].name + '.Out);\n')
 
         if len(self.output_stms)>1:
             strcount = 1
-            for strm in self.output_stms:
+            for strm in self.output_stms.values():
                 self.OM_data_eqn += ('connect(' + strm.name + '.In,' + self.name + '.Out[' + str(strcount) + ']);\n')
                 strcount += 1
         else:
             print("self.output_stms ", self.output_stms)
-            self.OM_data_eqn += ('connect(' + self.name + '.Out,' + self.output_stms[0].name + '.In);\n')    
+            self.OM_data_eqn += ('connect(' + self.name + '.Out,' + self.output_stms[1].name + '.In);\n')
         
         if self.mode:
             self.OM_data_eqn += (self.name + '.' + self.mode + '=' + str(self.mode_val) + ';\n')
@@ -219,7 +220,7 @@ class ShortcutColumn(UnitOperation):
     def OM_Flowsheet_Equation(self):
         self.OM_data_eqn = ''
        
-        self.OM_data_eqn += ('connect(' + self.name + '.In,' + self.input_stms[0].name + '.Out);\n')
+        self.OM_data_eqn += ('connect(' + self.name + '.In,' + self.input_stms[1].name + '.Out);\n')
 
         strcount = 1
         for strm in self.output_stms:
@@ -343,7 +344,7 @@ class DistillationColumn(UnitOperation):
                 'connect(' + self.name + '.Bot' + ", " + self.output_stms[1].name + '.In);\n')
         for i in range(len(self.input_stms)):
             self.OM_data_eqn = self.OM_data_eqn + (
-                    'connect(' + self.input_stms[i].name + '.Out' + ", " + self.name + '.In_s[' + str(
+                    'connect(' + self.input_stms[i +1].name + '.Out' + ", " + self.name + '.In_s[' + str(
                 i + 1) + ']);\n')
         # ['Product Molar Flow   (mol/s)', 'Temperature  (K)', 'Compound Molar Fraction',
         #  'Compound Molar Flow    (mol/s)']