Generalization for integer and float variables in flowsheet_initialization

6 files changed, 5 insertions, 5 deletions

diff --git a/DockWidgets/DockWidgetMixer.py b/DockWidgets/DockWidgetMixer.py
index 28cbff0..01bfd48 100644
--- a/DockWidgets/DockWidgetMixer.py
+++ b/DockWidgets/DockWidgetMixer.py
@@ -52,7 +52,7 @@ class DockWidgetMixer(QDockWidget,ui_dialog):
         try:
             self.dict={}
             print("param.input_dict ", self.input_dict)
-            self.dict = [int(self.input_dict[0].text()),self.input_dict[1].currentText()]
+            self.dict = [int(self.input_dict[0].text()), '"' + self.input_dict[1].currentText() + '"']
             print("param ", self.dict)
             self.obj.param_setter(self.dict)
             self.hide()
diff --git a/DockWidgets/__pycache__/DockWidget.cpython-37.pyc b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc
index 73e3283..0733a15 100644
--- a/DockWidgets/__pycache__/DockWidget.cpython-37.pyc
+++ b/DockWidgets/__pycache__/DockWidget.cpython-37.pyc
diff --git a/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc
index fa45bf4..6bfb174 100644
--- a/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc
+++ b/DockWidgets/__pycache__/DockWidgetMixer.cpython-37.pyc
diff --git a/Simulator/Simulator/UnitOperations/Splitter.mo b/Simulator/Simulator/UnitOperations/Splitter.mo
index 8b03997..9871ea7 100644
--- a/Simulator/Simulator/UnitOperations/Splitter.mo
+++ b/Simulator/Simulator/UnitOperations/Splitter.mo
@@ -5,7 +5,7 @@ model Splitter
 //Header Files and Parameters
   extends Simulator.Files.Icons.Splitter;
   parameter Simulator.Files.ChemsepDatabase.GeneralProperties C[Nc];
-  parameter Integer Nc = 2 "Number of Components", No = 2 "Number of outlet streams";
+  parameter Integer Nc = 3 "Number of Components", No = 2 "Number of outlet streams";
   parameter String CalcType "Split_Ratio, Mass_Flow or Molar_Flow";
   
 //=============================================================================
@@ -21,7 +21,7 @@ model Splitter
   
   Real Pout_s[No](each min = 0, each start = Pg) "Outlet Pressure";
   Real Tout_s[No](each min = 0, each start = Tg) "Outlet Temperature";
-  Real xout_sc[No, Nc](each min = 0, each max = 1, start = xguess) "Outlet Mixture Molar Fraction";
+  Real xout_sc[No, Nc](each min = 0, each max = 1) "Outlet Mixture Molar Fraction";
   Real Fout_c[No](each min = 0,  start = Fg) "Outlet Mixture Molar Flow";
   Real Fmout_c[No](each min = 0, start = Fg) "Outlet Mixture Mass Flow";
   
diff --git a/Undo.dat b/Undo.dat
index 09e1639..2fa64d0 100644
--- a/Undo.dat
+++ b/Undo.dat
diff --git a/UnitOperations.py b/UnitOperations.py
index ea7c916..595a49d 100644
--- a/UnitOperations.py
+++ b/UnitOperations.py
@@ -130,8 +130,8 @@ class UnitOperation():
 
             for k in self.parameters:
                 self.OM_data_init += ', '
-                self.OM_data_init += k + ' = ' + ('"' + self.variables[k]['value'] + '"' if isinstance(self.variables[k]['value'], str)
-                     else str(json.dumps(self.variables[k]['value']).replace('[', '{').replace(']', '}')))
+                self.OM_data_init += k + ' = ' + (json.dumps(self.variables[k]['value']) if json.dumps(self.variables[k]['value']).replace('"', '').replace('_', '').isalpha()
+                                                   else json.dumps(self.variables[k]['value']).replace('[', '{').replace(']', '}').replace('"', ''))
 
             self.OM_data_init += ');\n'
         return self.OM_data_init