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 --- OMChem/Valve.py | 61 --------------------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 OMChem/Valve.py (limited to 'OMChem/Valve.py') diff --git a/OMChem/Valve.py b/OMChem/Valve.py deleted file mode 100644 index 9e8494b..0000000 --- a/OMChem/Valve.py +++ /dev/null @@ -1,61 +0,0 @@ -class Valve(): - counter = 1 - def __init__(self,name='Valve'): - #self.PressDrop = PressureDrop - self.mode = None - self.modeVal = None - #self.name = name - self.OM_data_eqn = '' - self.OM_data_init = '' - self.InputStms = None - self.OutputStms = None - self.type = 'Valve' - - self.Prop = { - 'pressDrop':None, - 'outP':None - } - # new - self.name = name + str(Valve.counter) - self.no_of_input = 1 - self.no_of_output = 1 - Valve.counter += 1 - - def getname(self): - return self.name - - def modesList(self): - return ["pressDrop","outP"] - - def paramgetter(self,mode="pressDrop"): - self.mode = mode - dict = {self.mode:None} - return dict - - def paramsetter(self,dict): - - self.modeVal = dict[self.mode] - - def connect(self,InputStms = None,OutputStms = None): - self.InputStms = InputStms - self.OutputStms = OutputStms - - def OM_Flowsheet_Init(self, addedcomp): - self.OM_data_init = '' - comp_count = len(addedcomp) - self.OM_data_init = self.OM_data_init + ( - "Simulator.Unit_Operations.Valve " + 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 + ("});\n") - return self.OM_data_init - - def OM_Flowsheet_Eqn(self, addedcomp): - self.OM_data_eqn = '' - - 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') - print("asdfvfdasdsqdfdedfdfv12345678987654321234567898765") - self.OM_data_eqn = self.OM_data_eqn + (self.name+'.'+self.mode+'='+ self.modeVal + ';\n') - return self.OM_data_eqn \ No newline at end of file -- 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 --- OMChem/Valve.py | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 OMChem/Valve.py (limited to 'OMChem/Valve.py') diff --git a/OMChem/Valve.py b/OMChem/Valve.py new file mode 100644 index 0000000..05fa55f --- /dev/null +++ b/OMChem/Valve.py @@ -0,0 +1,58 @@ +class Valve(): + counter = 1 + def __init__(self,name='Valve'): + self.mode = None + self.modeVal = None + self.OM_data_eqn = '' + self.OM_data_init = '' + self.InputStms = None + self.OutputStms = None + self.type = 'Valve' + + self.Prop = { + 'pressDrop':None, + 'outP':None + } + # new + self.name = name + str(Valve.counter) + self.no_of_input = 1 + self.no_of_output = 1 + Valve.counter += 1 + + def getname(self): + return self.name + + def modesList(self): + return ["pressDrop","outP"] + + def paramgetter(self,mode="pressDrop"): + self.mode = mode + dict = {self.mode:None} + return dict + + def paramsetter(self,dict): + + self.modeVal = dict[self.mode] + + def connect(self,InputStms = None,OutputStms = None): + self.InputStms = InputStms + self.OutputStms = OutputStms + + def OM_Flowsheet_Init(self, addedcomp): + self.OM_data_init = '' + comp_count = len(addedcomp) + self.OM_data_init = self.OM_data_init + ( + "Simulator.Unit_Operations.Valve " + 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 + ("});\n") + return self.OM_data_init + + def OM_Flowsheet_Eqn(self, addedcomp): + self.OM_data_eqn = '' + + 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 + (self.name+'.'+self.mode+'='+ self.modeVal + ';\n') + return self.OM_data_eqn \ No newline at end of file -- 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. --- OMChem/Valve.py | 58 --------------------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 OMChem/Valve.py (limited to 'OMChem/Valve.py') diff --git a/OMChem/Valve.py b/OMChem/Valve.py deleted file mode 100644 index 05fa55f..0000000 --- a/OMChem/Valve.py +++ /dev/null @@ -1,58 +0,0 @@ -class Valve(): - counter = 1 - def __init__(self,name='Valve'): - self.mode = None - self.modeVal = None - self.OM_data_eqn = '' - self.OM_data_init = '' - self.InputStms = None - self.OutputStms = None - self.type = 'Valve' - - self.Prop = { - 'pressDrop':None, - 'outP':None - } - # new - self.name = name + str(Valve.counter) - self.no_of_input = 1 - self.no_of_output = 1 - Valve.counter += 1 - - def getname(self): - return self.name - - def modesList(self): - return ["pressDrop","outP"] - - def paramgetter(self,mode="pressDrop"): - self.mode = mode - dict = {self.mode:None} - return dict - - def paramsetter(self,dict): - - self.modeVal = dict[self.mode] - - def connect(self,InputStms = None,OutputStms = None): - self.InputStms = InputStms - self.OutputStms = OutputStms - - def OM_Flowsheet_Init(self, addedcomp): - self.OM_data_init = '' - comp_count = len(addedcomp) - self.OM_data_init = self.OM_data_init + ( - "Simulator.Unit_Operations.Valve " + 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 + ("});\n") - return self.OM_data_init - - def OM_Flowsheet_Eqn(self, addedcomp): - self.OM_data_eqn = '' - - 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 + (self.name+'.'+self.mode+'='+ self.modeVal + ';\n') - return self.OM_data_eqn \ No newline at end of file -- cgit