Merge pull request #63 from brenda-br/Fix-35HEADmaster

Restructure Project and Deployment

1 files changed, 0 insertions, 70 deletions

diff --git a/OMChem/adiabatic_exp.py b/OMChem/adiabatic_exp.py
deleted file mode 100644
index 2754f0a..0000000
--- a/OMChem/adiabatic_exp.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from OMChem.EngStm import EngStm
-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"
-        self.mode = None
-        self.modeVal = None
-
-        # new 
-        self.no_of_input = 1 
-        self.no_of_output = 1  
-        AdiabaticExpander.counter += 1  
-
-    def getname(self):
-        return self.name
-
-    def connect(self,InputStms = None,OutputStms = None):
-        self.InputStms = InputStms
-        self.OutputStms = OutputStms
-
-    def modesList(self):
-        return ["pressDrop","outP","genPow"]
-
-    def paramgetter(self,mode="pressDrop"):
-        self.mode = mode
-        dict = {"eff":None,self.mode:None,"thermoPackage":None}
-        return dict
-        
-    def paramsetter(self,dict):
-        self.eff = dict['eff']
-        self.modeVal = dict[self.mode]
-
-    def OM_Flowsheet_Init(self, addedcomp):
-        self.OM_data_init = ''
-        self.OM_data_init = self.OM_data_init + 'Simulator.Streams.Energy_Stream '+self.EngStms.name+';\n'
-        self.OM_data_init = self.OM_data_init + ("model adiaComp"+str(self.count)+"\n")
-        self.OM_data_init = self.OM_data_init + ("extends Simulator.Unit_Operations.Adiabatic_Expander;\n" )
-        self.OM_data_init = self.OM_data_init + ("extends Simulator.Files.Thermodynamic_Packages."+self.thermoPackage+";\n")
-        self.OM_data_init = self.OM_data_init + ("end adiaComp"+str(self.count)+";\n")
-        comp_count = len(addedcomp)
-        self.OM_data_init = self.OM_data_init + (
-        "adiaComp"+str(self.count)+" "+ self.name + "(Nc = " + str(comp_count))
-        self.OM_data_init = self.OM_data_init + (",comp = {")
-        comp = str(addedcomp).strip('[').strip(']')
-        comp = comp.replace("'", "")
-        self.OM_data_init = self.OM_data_init + comp + ("},")+("eff="+self.eff+");\n")
-        return self.OM_data_init
-
-    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')
-  
-        self.OM_data_eqn = self.OM_data_eqn + (self.name+'.'+self.mode+'='+ self.modeVal + ';\n')
-
-        return self.OM_data_eqn
-