From d476d2e053f937c0060f696312f301591e4f43ea Mon Sep 17 00:00:00 2001 From: brenda-br Date: Thu, 23 Feb 2023 22:14:39 +0530 Subject: Restructure Code -1 --- src/main/python/OMChem/CompSep.py | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/main/python/OMChem/CompSep.py (limited to 'src/main/python/OMChem/CompSep.py') diff --git a/src/main/python/OMChem/CompSep.py b/src/main/python/OMChem/CompSep.py new file mode 100644 index 0000000..9579498 --- /dev/null +++ b/src/main/python/OMChem/CompSep.py @@ -0,0 +1,72 @@ +from OMChem.EngStm import EngStm +import json +class CompSep(): + counter = 1 + def __init__(self,CompNames = [],name='CompSep',SepFact=['Molar_Flow','Mass_Flow'],SepStrm=1,SepFactValue=[]): + 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 = [] + self.OutputStms = [] + self.type = 'CompSep' + self.EngStms = EngStm(name='EngStm') + + # new + self.name = name + str(CompSep.counter) + self.no_of_input = 1 + self.no_of_output = 2 + CompSep.counter += 1 + + def getname(self): + return self.name + + def modesList(self): + return [] + + def paramgetter(self,mode=None): + dict = {"SepStrm":None,"SepFactValue":None,"SepFact":None} + return dict + + def paramsetter(self,dict): + self.SepStrm = dict['SepStrm'] + self.SepFactValue = dict['SepFactValue'] + self.SepFact = dict['SepFact'] + + def OM_Flowsheet_Init(self, addedcomp): + self.OM_data_init = '' + 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.Compound_Separator " + 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 + ("},") + self.OM_data_init = self.OM_data_init + ("sepFact = "+self.SepFact+",sepStrm = " + self.SepStrm + ", sepFactVal = " + self.SepFactValue + ");\n") + + return self.OM_data_init + + def connect(self,InputStms = None,OutputStms = []): + self.InputStms = InputStms + self.OutputStms = OutputStms + + def OM_Flowsheet_Eqn(self, addedcomp): + self.OM_data_eqn = '' + comp_count = len(addedcomp) + strcount = 1 + self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') + + for strm in self.OutputStms: + self.OM_data_eqn = self.OM_data_eqn + ('connect(' + strm.name + '.inlet,' + self.name + '.outlet'+str(strcount)+');\n') + strcount += 1 + + self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.EngStms.name + '.outlet,' + self.name + '.energy);\n') + sepFac = str(self.SepFactValue).strip('[').strip(']') + + self.OM_data_eqn = self.OM_data_eqn + (self.name+'.sepFactVal= {'+ sepFac + '};\n') + + return self.OM_data_eqn + -- cgit From 2b94618c50110c38cd67564a5b58630aeeb2adc5 Mon Sep 17 00:00:00 2001 From: brenda-br Date: Fri, 24 Feb 2023 11:55:27 +0530 Subject: Fix #62 Remove Redundant Lines --- src/main/python/OMChem/CompSep.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/python/OMChem/CompSep.py') 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 = [] -- cgit From 7af3526e105cc330422f8742ec5edec1c4a0a98f Mon Sep 17 00:00:00 2001 From: brenda-br Date: Thu, 2 Mar 2023 15:49:11 +0530 Subject: Restructuring Finalized for App Bundling --- src/main/python/OMChem/CompSep.py | 71 --------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 src/main/python/OMChem/CompSep.py (limited to 'src/main/python/OMChem/CompSep.py') diff --git a/src/main/python/OMChem/CompSep.py b/src/main/python/OMChem/CompSep.py deleted file mode 100644 index d538acb..0000000 --- a/src/main/python/OMChem/CompSep.py +++ /dev/null @@ -1,71 +0,0 @@ -from OMChem.EngStm import EngStm -import json -class CompSep(): - counter = 1 - def __init__(self,CompNames = [],name='CompSep',SepFact=['Molar_Flow','Mass_Flow'],SepStrm=1,SepFactValue=[]): - self.SepFact = json.dumps(SepFact).replace('[','{').replace(']','}') - self.SepStrm = str(SepStrm) - self.SepFactValue = json.dumps(SepFactValue).replace('[','{').replace(']','}') - self.OM_data_eqn = '' - self.OM_data_init = '' - self.InputStms = [] - self.OutputStms = [] - self.type = 'CompSep' - self.EngStms = EngStm(name='EngStm') - - # new - self.name = name + str(CompSep.counter) - self.no_of_input = 1 - self.no_of_output = 2 - CompSep.counter += 1 - - def getname(self): - return self.name - - def modesList(self): - return [] - - def paramgetter(self,mode=None): - dict = {"SepStrm":None,"SepFactValue":None,"SepFact":None} - return dict - - def paramsetter(self,dict): - self.SepStrm = dict['SepStrm'] - self.SepFactValue = dict['SepFactValue'] - self.SepFact = dict['SepFact'] - - def OM_Flowsheet_Init(self, addedcomp): - self.OM_data_init = '' - 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.Compound_Separator " + 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 + ("},") - self.OM_data_init = self.OM_data_init + ("sepFact = "+self.SepFact+",sepStrm = " + self.SepStrm + ", sepFactVal = " + self.SepFactValue + ");\n") - - return self.OM_data_init - - def connect(self,InputStms = None,OutputStms = []): - self.InputStms = InputStms - self.OutputStms = OutputStms - - def OM_Flowsheet_Eqn(self, addedcomp): - self.OM_data_eqn = '' - comp_count = len(addedcomp) - strcount = 1 - self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') - - for strm in self.OutputStms: - self.OM_data_eqn = self.OM_data_eqn + ('connect(' + strm.name + '.inlet,' + self.name + '.outlet'+str(strcount)+');\n') - strcount += 1 - - self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.EngStms.name + '.outlet,' + self.name + '.energy);\n') - sepFac = str(self.SepFactValue).strip('[').strip(']') - - self.OM_data_eqn = self.OM_data_eqn + (self.name+'.sepFactVal= {'+ sepFac + '};\n') - - return self.OM_data_eqn - -- cgit From 3cbdd4238867bc860282f7cf702d73b5be6e3f86 Mon Sep 17 00:00:00 2001 From: brenda-br Date: Sat, 4 Mar 2023 11:32:15 +0530 Subject: Revert "Restructuring Finalized for App Bundling" This reverts commit 7af3526e105cc330422f8742ec5edec1c4a0a98f. --- src/main/python/OMChem/CompSep.py | 71 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 src/main/python/OMChem/CompSep.py (limited to 'src/main/python/OMChem/CompSep.py') diff --git a/src/main/python/OMChem/CompSep.py b/src/main/python/OMChem/CompSep.py new file mode 100644 index 0000000..d538acb --- /dev/null +++ b/src/main/python/OMChem/CompSep.py @@ -0,0 +1,71 @@ +from OMChem.EngStm import EngStm +import json +class CompSep(): + counter = 1 + def __init__(self,CompNames = [],name='CompSep',SepFact=['Molar_Flow','Mass_Flow'],SepStrm=1,SepFactValue=[]): + self.SepFact = json.dumps(SepFact).replace('[','{').replace(']','}') + self.SepStrm = str(SepStrm) + self.SepFactValue = json.dumps(SepFactValue).replace('[','{').replace(']','}') + self.OM_data_eqn = '' + self.OM_data_init = '' + self.InputStms = [] + self.OutputStms = [] + self.type = 'CompSep' + self.EngStms = EngStm(name='EngStm') + + # new + self.name = name + str(CompSep.counter) + self.no_of_input = 1 + self.no_of_output = 2 + CompSep.counter += 1 + + def getname(self): + return self.name + + def modesList(self): + return [] + + def paramgetter(self,mode=None): + dict = {"SepStrm":None,"SepFactValue":None,"SepFact":None} + return dict + + def paramsetter(self,dict): + self.SepStrm = dict['SepStrm'] + self.SepFactValue = dict['SepFactValue'] + self.SepFact = dict['SepFact'] + + def OM_Flowsheet_Init(self, addedcomp): + self.OM_data_init = '' + 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.Compound_Separator " + 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 + ("},") + self.OM_data_init = self.OM_data_init + ("sepFact = "+self.SepFact+",sepStrm = " + self.SepStrm + ", sepFactVal = " + self.SepFactValue + ");\n") + + return self.OM_data_init + + def connect(self,InputStms = None,OutputStms = []): + self.InputStms = InputStms + self.OutputStms = OutputStms + + def OM_Flowsheet_Eqn(self, addedcomp): + self.OM_data_eqn = '' + comp_count = len(addedcomp) + strcount = 1 + self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.InputStms[0].name + '.outlet,' + self.name + '.inlet' + ');\n') + + for strm in self.OutputStms: + self.OM_data_eqn = self.OM_data_eqn + ('connect(' + strm.name + '.inlet,' + self.name + '.outlet'+str(strcount)+');\n') + strcount += 1 + + self.OM_data_eqn = self.OM_data_eqn + ('connect(' + self.EngStms.name + '.outlet,' + self.name + '.energy);\n') + sepFac = str(self.SepFactValue).strip('[').strip(']') + + self.OM_data_eqn = self.OM_data_eqn + (self.name+'.sepFactVal= {'+ sepFac + '};\n') + + return self.OM_data_eqn + -- cgit