From 9f86138b86efebb816a2289bf84b96d688615f41 Mon Sep 17 00:00:00 2001
From: lucaszhao19
Date: Mon, 23 Dec 2019 13:25:49 +0530
Subject: Feature implementation - saving and partial loading

---
 OMChem/Cooler.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'OMChem/Cooler.py')

diff --git a/OMChem/Cooler.py b/OMChem/Cooler.py
index 577b181..32fe594 100644
--- a/OMChem/Cooler.py
+++ b/OMChem/Cooler.py
@@ -1,9 +1,10 @@
 from OMChem.EngStm import EngStm
 class Cooler():
-    def __init__(self,name='cooler',PressureDrop = None, eff = None):
+    counter = 1
+    def __init__(self,name='Cooler',PressureDrop = None, eff = None):
         self.PressureDrop = PressureDrop
         self.eff = eff
-        self.name = name
+        # self.name = name
         self.OM_data_eqn = ''
         self.OM_data_init = ''
         self.InputStms = None
@@ -21,6 +22,15 @@ class Cooler():
                 'tempDrop':None,
                 'heatRem':None,
             }
+        # new 
+        self.name = name + str(Cooler.counter) 
+        self.no_of_input = 1 
+        self.no_of_output = 1  
+        Cooler.counter += 1  
+
+    def getname(self):
+        return self.name
+
     def connect(self,InputStms = None,OutputStms = None):
         self.InputStms = InputStms
         self.OutputStms = OutputStms
-- 
cgit 


From 8dfb7d836e438035be2284e49554dac36d0af7bf Mon Sep 17 00:00:00 2001
From: SaurabhAgarwala
Date: Fri, 3 Jan 2020 15:54:24 +0530
Subject: Made GUI compatible with the new Simulator, abbreviations updated to
 new convention and few bugs eliminated with code clean up at places

---
 OMChem/Cooler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OMChem/Cooler.py')

diff --git a/OMChem/Cooler.py b/OMChem/Cooler.py
index 32fe594..9a44033 100644
--- a/OMChem/Cooler.py
+++ b/OMChem/Cooler.py
@@ -54,7 +54,7 @@ class Cooler():
         comp_count = len(addedcomp)
         self.OM_data_init = self.OM_data_init + 'Simulator.Streams.Energy_Stream '+self.EngStms.name+';\n'
         self.OM_data_init = self.OM_data_init + (
-        "Simulator.Unit_Operations.Cooler " + self.name + "(NOC = " + str(comp_count))
+        "Simulator.Unit_Operations.Cooler " + self.name + "(Nc = " + str(comp_count))
         self.OM_data_init = self.OM_data_init + (",comp = {")
         comp = str(addedcomp).strip('[').strip(']')
         comp = comp.replace("'", "")
-- 
cgit