Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to prepare for v 3.0 #287

Merged
merged 2 commits into from
Oct 1, 2024
Merged

update to prepare for v 3.0 #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875e041
update to prepare for v 3.0
EvenSol Oct 1, 2024
bf91f86
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified neqsim/lib/java11/neqsim-2.5.35.jar
View file
Open in desktop
Binary file not shown.
Binary file modified neqsim/lib/java8/neqsim-2.5.35-Java8.jar
View file
Open in desktop
Binary file not shown.
88 changes: 55 additions & 33 deletions neqsim/process/processTools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ def stream(thermoSystem, name="stream ?", t=0, p=0):
thermoSystem.setTemperature(t)
if p != 0:
thermoSystem.setPressure(p)
stream = jNeqSim.processSimulation.processEquipment.stream.Stream(thermoSystem)
stream.setName(name)
stream = jNeqSim.processSimulation.processEquipment.stream.Stream(
name, thermoSystem
)
processoperations.add(stream)
return stream

Expand All @@ -38,32 +39,37 @@ def neqstream(thermoSystem, name="stream ?", t=0, p=0):
thermoSystem.setTemperature(t)
if p != 0:
thermoSystem.setPressure(p)
stream = jNeqSim.processSimulation.processEquipment.stream.NeqStream(thermoSystem)
stream = jNeqSim.processSimulation.processEquipment.stream.NeqStream(
name, thermoSystem
)
stream.setName(name)
processoperations.add(stream)
return stream


def recycle(teststream, name="recycle ?"):
recycle1 = jNeqSim.processSimulation.processEquipment.util.Recycle()
recycle1 = jNeqSim.processSimulation.processEquipment.util.Recycle(name)
recycle1.addStream(teststream)
processoperations.add(recycle1)
return recycle1


def saturator(teststream, name="water saturator"):
streamsaturator = (
jNeqSim.processSimulation.processEquipment.util.StreamSaturatorUtil(teststream)
jNeqSim.processSimulation.processEquipment.util.StreamSaturatorUtil(
name, teststream
)
)
processoperations.add(streamsaturator)
return streamsaturator


def glycoldehydrationlmodule(teststream, name="TEG process"):
dehydrationlmodule = (
jNeqSim.processSimulation.processSystem.processModules.GlycolDehydrationlModule()
jNeqSim.processSimulation.processSystem.processModules.GlycolDehydrationlModule(
name
)
)
dehydrationlmodule.setName(name)
dehydrationlmodule.addInputStream("gasStreamToAbsorber", teststream)
processoperations.add(dehydrationlmodule)
return dehydrationlmodule
Expand All @@ -78,7 +84,7 @@ def openprocess(filename):

def separator(teststream, name="separator ?"):
separator = jNeqSim.processSimulation.processEquipment.separator.Separator(
teststream
name, teststream
)
separator.setName(name)
processoperations.add(separator)
Expand All @@ -87,30 +93,34 @@ def separator(teststream, name="separator ?"):

def GORfitter(teststream, name="GOR fitter ?"):
GORfitter1 = jNeqSim.processSimulation.processEquipment.util.GORfitter(
name, teststream
name, name, teststream
)
GORfitter1.setName(name)
processoperations.add(GORfitter1)
return GORfitter1


def simpleTEGAbsorber(name="TEG absorber ?"):
absorber = jNeqSim.processSimulation.processEquipment.absorber.SimpleTEGAbsorber()
absorber = jNeqSim.processSimulation.processEquipment.absorber.SimpleTEGAbsorber(
name
)
absorber.setName(name)
processoperations.add(absorber)
return absorber


def waterStripperColumn(name="water stripper ?"):
stripper = jNeqSim.processSimulation.processEquipment.absorber.WaterStripperColumn()
stripper = jNeqSim.processSimulation.processEquipment.absorber.WaterStripperColumn(
name
)
stripper.setName(name)
processoperations.add(stripper)
return stripper


def gasscrubber(teststream, name="scrubber ?"):
separator = jNeqSim.processSimulation.processEquipment.separator.GasScrubber(
teststream
name, teststream
)
separator.setName(name)
processoperations.add(separator)
Expand All @@ -120,16 +130,18 @@ def gasscrubber(teststream, name="scrubber ?"):
def separator3phase(teststream, name="separator ?"):
separator = (
jNeqSim.processSimulation.processEquipment.separator.ThreePhaseSeparator(
teststream
name, teststream
)
)
separator.setName(name)
processoperations.add(separator)
return separator


def valve(teststream, p=1.0, name="valve ?"):
valve = jNeqSim.processSimulation.processEquipment.valve.ThrottlingValve(teststream)
def valve(teststream, p=1.0, name="valve ??"):
valve = jNeqSim.processSimulation.processEquipment.valve.ThrottlingValve(
name, teststream
)
valve.setOutletPressure(p)
valve.setName(name)
processoperations.add(valve)
Expand All @@ -156,15 +168,15 @@ def setpoint(name1, unit1, name2, unit2):
return setp


def filters(teststream):
filter2 = jNeqSim.processSimulation.processEquipment.filter.Filter(teststream)
def filters(teststream, name="filter?"):
filter2 = jNeqSim.processSimulation.processEquipment.filter.Filter(name, teststream)
processoperations.add(filter2)
return filter2


def compressor(teststream, pres=10.0, name="compressor ?"):
compressor = jNeqSim.processSimulation.processEquipment.compressor.Compressor(
teststream
name, teststream
)
compressor.setOutletPressure(pres)
compressor.setName(name)
Expand Down Expand Up @@ -207,30 +219,32 @@ def compressorStoneWallCurve(compressor, curveConditions, stoneWallflow, stoneWa


def pump(teststream, p=1.0, name="pump ?"):
pump = jNeqSim.processSimulation.processEquipment.pump.Pump(teststream)
pump = jNeqSim.processSimulation.processEquipment.pump.Pump(name, teststream)
pump.setOutletPressure(p)
pump.setName(name)
processoperations.add(pump)
return pump


def expander(teststream, p, name="expander ?"):
expander = jNeqSim.processSimulation.processEquipment.expander.Expander(teststream)
expander = jNeqSim.processSimulation.processEquipment.expander.Expander(
name, teststream
)
expander.setOutletPressure(p)
expander.setName(name)
processoperations.add(expander)
return expander


def mixer(name=""):
mixer = jNeqSim.processSimulation.processEquipment.mixer.Mixer()
mixer = jNeqSim.processSimulation.processEquipment.mixer.Mixer(name)
mixer.setName(name)
processoperations.add(mixer)
return mixer


def phasemixer(name=""):
mixer = jNeqSim.processSimulation.processEquipment.mixer.StaticPhaseMixer()
mixer = jNeqSim.processSimulation.processEquipment.mixer.StaticPhaseMixer(name)
mixer.setName(name)
processoperations.add(mixer)
return mixer
Expand Down Expand Up @@ -259,7 +273,9 @@ def compsplitter(teststream, splitfactors, name=""):


def splitter(teststream, splitfactors=[], name=""):
splitter = jNeqSim.processSimulation.processEquipment.splitter.Splitter(teststream)
splitter = jNeqSim.processSimulation.processEquipment.splitter.Splitter(
name, teststream
)
if len(splitfactors) > 0:
splitter.setSplitNumber(len(splitfactors))
splitter.setSplitFactors(JDouble[:](splitfactors))
Expand All @@ -268,8 +284,10 @@ def splitter(teststream, splitfactors=[], name=""):
return splitter


def heater(teststream, name=""):
heater = jNeqSim.processSimulation.processEquipment.heatExchanger.Heater(teststream)
def heater(teststream, name="heater?"):
heater = jNeqSim.processSimulation.processEquipment.heatExchanger.Heater(
name, teststream
)
heater.setName(name)
processoperations.add(heater)
return heater
Expand All @@ -288,8 +306,10 @@ def simplereservoir(
return reserv


def cooler(teststream, name=""):
cooler = jNeqSim.processSimulation.processEquipment.heatExchanger.Cooler(teststream)
def cooler(teststream, name="cooler?"):
cooler = jNeqSim.processSimulation.processEquipment.heatExchanger.Cooler(
name, teststream
)
cooler.setName(name)
processoperations.add(cooler)
return cooler
Expand All @@ -298,7 +318,7 @@ def cooler(teststream, name=""):
def heatExchanger(stream1, stream2=None, name=""):
if stream2 is None:
heater = jNeqSim.processSimulation.processEquipment.heatExchanger.HeatExchanger(
stream1
name, stream1
)
else:
heater = jNeqSim.processSimulation.processEquipment.heatExchanger.HeatExchanger(
Expand All @@ -312,7 +332,7 @@ def heatExchanger(stream1, stream2=None, name=""):
def distillationColumn(trays=5, reboil=True, condenser=True, name="destColumn"):
distillationColumn = (
jNeqSim.processSimulation.processEquipment.distillation.DistillationColumn(
trays, reboil, condenser
name, trays, reboil, condenser
)
)
distillationColumn.setName(name)
Expand All @@ -322,7 +342,7 @@ def distillationColumn(trays=5, reboil=True, condenser=True, name="destColumn"):

def neqheater(teststream, name=""):
neqheater = jNeqSim.processSimulation.processEquipment.heatExchanger.NeqHeater(
teststream
name, teststream
)
neqheater.setName(name)
processoperations.add(neqheater)
Expand All @@ -331,7 +351,7 @@ def neqheater(teststream, name=""):

def twophasepipe(teststream, position, diameter, height, outTemp, rough):
pipe = jNeqSim.processSimulation.processEquipment.pipeline.TwoPhasePipeLine(
teststream
name, teststream
)
pipe.setOutputFileName("c:/tempNew20.nc")
pipe.setInitialFlowPattern("annular")
Expand All @@ -351,7 +371,9 @@ def twophasepipe(teststream, position, diameter, height, outTemp, rough):


def pipe(teststream, length, deltaElevation, diameter, rough):
pipe = jNeqSim.processSimulation.processEquipment.pipeline.AdiabaticPipe(teststream)
pipe = jNeqSim.processSimulation.processEquipment.pipeline.AdiabaticPipe(
name, teststream
)
pipe.setDiameter(diameter)
pipe.setLength(length)
pipe.setPipeWallRoughness(rough)
Expand All @@ -373,7 +395,7 @@ def pipeline(
numberOfNodesInLeg=50,
):
pipe = jNeqSim.processSimulation.processEquipment.pipeline.OnePhasePipeLine(
teststream
name, teststream
)
pipe.setOutputFileName("c:/tempNew20.nc")
numberOfLegs = len(position) - 1
Expand Down
8 changes: 4 additions & 4 deletions neqsim/process/unitop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ def getConditionAnalysisMessage(self):
# Add the logic to calculate or retrieve the pressure.
# This will depend on how pressure is handled in your 'unitop' class.
return 0.0 # Replace 0.0 with the actual pressure value or calculatio

@JOverride # Implement the missing 'needRecalculation' method
def needRecalculation():
return True
def needRecalculation():
return True

@JOverride # Implement the missing 'getExergyChange' method
def getResultTable(self):
# Add the logic to calculate or retrieve the pressure.
Expand Down
Loading
Loading