Skip to content

Commit

Permalink
chore: fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
asmfstatoil committed Sep 25, 2024
1 parent 81b7568 commit d408538
Show file tree
Hide file tree
Showing 20 changed files with 117 additions and 114 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public default void run() {
* run_step
* </p>
* In this method all thermodynamic and unit operations will be calculated in a steady state
* calculation. It does not solve resycles - only calculates one step.
* calculation. It does not solve recycles - only calculates one step.
*/
public default void run_step() {
run_step(UUID.randomUUID());
Expand All @@ -116,7 +116,7 @@ public default void run_step() {
* run_step
* </p>
* In this method all thermodynamic and unit operations will be calculated in a steady state
* calculation. Sets calc identifier UUID. It does not solve resycles - only calculates one step
* calculation. Sets calc identifier UUID. It does not solve recycles - only calculates one step
*
* @param value Calc identifier UUID to set.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,14 @@ public Thread runAsThread() {
/** {@inheritDoc} */
@Override
public void run(UUID id) {
boolean hasResycle = false;
boolean hasRecycle = false;
// boolean hasAdjuster = false;

// Initializing recycle controller
recycleController.clear();
for (int i = 0; i < unitOperations.size(); i++) {
if (unitOperations.get(i).getClass().getSimpleName().equals("Recycle")) {
hasResycle = true;
hasRecycle = true;
recycleController.addRecycle((Recycle) unitOperations.get(i));
}
if (unitOperations.get(i).getClass().getSimpleName().equals("Adjuster")) {
Expand Down Expand Up @@ -482,7 +482,7 @@ public void run(UUID id) {
* signalDB[timeStepNumber][3 * i + 3] = ((MeasurementDeviceInterface)
* measurementDevices.get(i)) .getUnit(); }
*/
} while ((!isConverged || (iter < 2 && hasResycle)) && iter < 100);
} while ((!isConverged || (iter < 2 && hasRecycle)) && iter < 100);

for (int i = 0; i < unitOperations.size(); i++) {
unitOperations.get(i).setCalculationIdentifier(id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void initializeModule() {
* Separator gasScrubber = new Separator("HC dew point control scrubber",
* gasCooler.getOutStream());
*
* Recycle HPliquidRecycle = new Recycle("Resycle"); double tolerance = 1e-2;
* Recycle HPliquidRecycle = new Recycle("Recycle"); double tolerance = 1e-2;
* HPliquidRecycle.setTolerance(tolerance);
* HPliquidRecycle.addStream(gasScrubber.getLiquidOutStream());
* inletSeparator.addStream(HPliquidRecycle.getOutStream());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ public class MixerGasProcessingModule extends ProcessModuleBaseClass {
Cooler secondStageAfterCooler;

/**
* <p>Constructor for MixerGasProcessingModule.</p>
* <p>
* Constructor for MixerGasProcessingModule.
* </p>
*
* @param name a {@link java.lang.String} object
*/
Expand Down Expand Up @@ -103,7 +105,7 @@ public void initializeModule() {
Separator gasScrubber =
new Separator("HC dew point control scrubber", gasCooler.getOutletStream());

Recycle HPliquidRecycle = new Recycle("Resycle");
Recycle HPliquidRecycle = new Recycle("Recycle");
double tolerance = 1e-2;
HPliquidRecycle.setTolerance(tolerance);
HPliquidRecycle.addStream(gasScrubber.getLiquidOutStream());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public void initializeModule() {

gasInletScrubber = new Separator("HP gas scrubber", inletGasCooler.getOutletStream());

Recycle HPliquidRecycle = new Recycle("Resycle");
Recycle HPliquidRecycle = new Recycle("Recycle");
double tolerance = 1e-10;
HPliquidRecycle.setTolerance(tolerance);
HPliquidRecycle.addStream(gasInletScrubber.getLiquidOutStream());
Expand Down Expand Up @@ -271,7 +271,7 @@ public static void main(String[] args) {
operations.add(wellStream);
operations.add(separationModule);
// separationModule.getUnit("")
// ((Recycle) operations.getUnit("Resycle")).setTolerance(1e-9);
// ((Recycle) operations.getUnit("Recycle")).setTolerance(1e-9);

operations.run();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public void initializeModule() {

gasInletScrubber = new Separator("HP gas scrubber", inletGasCooler.getOutletStream());

Recycle HPliquidRecycle = new Recycle("Resycle");
Recycle HPliquidRecycle = new Recycle("Recycle");
double tolerance = 1e-10;
HPliquidRecycle.setTolerance(tolerance);
HPliquidRecycle.addStream(gasInletScrubber.getLiquidOutStream());
Expand Down Expand Up @@ -267,7 +267,7 @@ public static void main(String[] args) {
operations.add(wellStream);
operations.add(separationModule);
// separationModule.getUnit("")
// ((Recycle) operations.getUnit("Resycle")).setTolerance(1e-9);
// ((Recycle) operations.getUnit("Recycle")).setTolerance(1e-9);

operations.run();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ public class WellFluidModule extends ProcessModuleBaseClass {
double exportOilTemperature = 273.15 + 30;

/**
* <p>Constructor for WellFluidModule.</p>
* <p>
* Constructor for WellFluidModule.
* </p>
*
* @param name a {@link java.lang.String} object
*/
Expand Down Expand Up @@ -253,7 +255,7 @@ public static void main(String[] args) {
operations.add(wellStream);
operations.add(separationModule);
// separationModule.getUnit("")
// ((Recycle) operations.getUnit("Resycle")).setTolerance(1e-9);
// ((Recycle) operations.getUnit("Recycle")).setTolerance(1e-9);

operations.run();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,19 @@ public void testProcess() {
ThrottlingValve valve1 = new ThrottlingValve("valve oil", oilHeater.getOutletStream());
valve1.setOutletPressure(10.0, "bara");

StreamInterface resycleScrubberStream = feedStream.clone();
resycleScrubberStream.setFlowRate(1.0, "kg/hr");
StreamInterface recycleScrubberStream = feedStream.clone();
recycleScrubberStream.setFlowRate(1.0, "kg/hr");

ThreePhaseSeparator secondStageSeparator =
new ThreePhaseSeparator("inlet separator", valve1.getOutletStream());
secondStageSeparator.addStream(resycleScrubberStream);
secondStageSeparator.addStream(recycleScrubberStream);

StreamInterface gasResycleStream = feedStream.clone();
gasResycleStream.setFlowRate(1.0, "kg/hr");
StreamInterface gasRecycleStream = feedStream.clone();
gasRecycleStream.setFlowRate(1.0, "kg/hr");

Mixer gasmixer = new Mixer("gas recycle mixer");
gasmixer.addStream(secondStageSeparator.getGasOutStream());
gasmixer.addStream(gasResycleStream);
gasmixer.addStream(gasRecycleStream);

// Setting up compressor module
Compressor seccondStageCompressor =
Expand All @@ -107,21 +107,21 @@ public void testProcess() {

Recycle recycle2 = new Recycle("recycle 2");
recycle2.addStream(recycleValve.getOutletStream());
recycle2.setOutletStream(gasResycleStream);
recycle2.setOutletStream(gasRecycleStream);

Recycle recycle1 = new Recycle("recycle 1");
recycle1.addStream(scrubber1.getLiquidOutStream());
recycle1.setOutletStream(resycleScrubberStream);
recycle1.setOutletStream(recycleScrubberStream);

neqsim.processSimulation.processSystem.ProcessSystem operations =
new neqsim.processSimulation.processSystem.ProcessSystem();
operations.add(feedStream);
operations.add(inletSeparator);
operations.add(oilHeater);
operations.add(valve1);
operations.add(resycleScrubberStream);
operations.add(recycleScrubberStream);
operations.add(secondStageSeparator);
operations.add(gasResycleStream);
operations.add(gasRecycleStream);
operations.add(gasmixer);
operations.add(seccondStageCompressor);
operations.add(afterCooler);
Expand All @@ -134,8 +134,7 @@ public void testProcess() {

operations.run();

assertEquals(2046.8012652616517
, resycleScrubberStream.getFlowRate("kg/hr"), 0.1);
assertEquals(2046.8012652616517, recycleScrubberStream.getFlowRate("kg/hr"), 0.1);

neqsim.processSimulation.processEquipment.compressor.CompressorChartGenerator compchartgenerator =
new neqsim.processSimulation.processEquipment.compressor.CompressorChartGenerator(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ public void runProcessTEG() throws InterruptedException {
waterFeed.setTemperature(90, "C");
waterFeed.setPressure(7.513533287063168, "bara");

Separator flashSep = new Separator("degasing separator", heatEx2.getOutStream());
Separator flashSep = new Separator("degassing separator", heatEx2.getOutStream());
flashSep.setInternalDiameter(1.2);

Stream flashGas = new Stream("gas from degasing separator", flashSep.getGasOutStream());
Stream flashGas = new Stream("gas from degassing separator", flashSep.getGasOutStream());

Stream flashLiquid =
new Stream("liquid from degasing separator", flashSep.getLiquidOutStream());
new Stream("liquid from degassing separator", flashSep.getLiquidOutStream());

Filter filter = new Filter("TEG fine filter", flashLiquid);
filter.setDeltaP(0.0, "bara");
Expand Down Expand Up @@ -296,11 +296,11 @@ public void runProcessTEG() throws InterruptedException {

Stream leanTEGtoabs = new Stream("lean TEG to absorber", coolerhOTteg3.getOutStream());

Recycle resycleLeanTEG = new Recycle("lean TEG recycle");
resycleLeanTEG.addStream(leanTEGtoabs);
resycleLeanTEG.setOutletStream(TEGFeed);
resycleLeanTEG.setPriority(200);
resycleLeanTEG.setDownstreamProperty("flow rate");
Recycle recycleLeanTEG = new Recycle("lean TEG recycle");
recycleLeanTEG.addStream(leanTEGtoabs);
recycleLeanTEG.setOutletStream(TEGFeed);
recycleLeanTEG.setPriority(200);
recycleLeanTEG.setDownstreamProperty("flow rate");

neqsim.processSimulation.processSystem.ProcessSystem operations1 =
new neqsim.processSimulation.processSystem.ProcessSystem();
Expand Down Expand Up @@ -362,7 +362,7 @@ public void runProcessTEG() throws InterruptedException {
operations4.add(hotLeanTEGPump);
operations4.add(coolerhOTteg3);
operations4.add(leanTEGtoabs);
operations4.add(resycleLeanTEG);
operations4.add(recycleLeanTEG);

neqsim.processSimulation.processSystem.ProcessSystem operations5 =
new neqsim.processSimulation.processSystem.ProcessSystem();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,16 @@ public void runProcessTEG() throws InterruptedException {
heatEx2.setUAvalue(2224.0);
p.add(heatEx2);

Separator flashSep = new Separator("degasing separator", heatEx2.getOutStream(0));
Separator flashSep = new Separator("degassing separator", heatEx2.getOutStream(0));
flashSep.setInternalDiameter(1.2);
p.add(flashSep);

StreamInterface flashGas =
new Stream("gas from degasing separator", flashSep.getGasOutStream());
new Stream("gas from degassing separator", flashSep.getGasOutStream());
p.add(flashGas);

StreamInterface flashLiquid =
new Stream("liquid from degasing separator", flashSep.getLiquidOutStream());
new Stream("liquid from degassing separator", flashSep.getLiquidOutStream());
p.add(flashLiquid);

Filter fineFilter = new Filter("TEG fine filter", flashLiquid);
Expand Down Expand Up @@ -313,12 +313,12 @@ public void runProcessTEG() throws InterruptedException {
makeupMixer.addStream(makeupTEG);
p.add(makeupMixer);

Recycle resycleLeanTEG = new Recycle("lean TEG resycle");
resycleLeanTEG.addStream(makeupMixer.getOutStream());
resycleLeanTEG.setOutletStream(TEGFeed);
resycleLeanTEG.setPriority(200);
resycleLeanTEG.setDownstreamProperty("flow rate");
p.add(resycleLeanTEG);
Recycle recycleLeanTEG = new Recycle("lean TEG recycle");
recycleLeanTEG.addStream(makeupMixer.getOutStream());
recycleLeanTEG.setOutletStream(TEGFeed);
recycleLeanTEG.setPriority(200);
recycleLeanTEG.setDownstreamProperty("flow rate");
p.add(recycleLeanTEG);

richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ public void testAntiSurgeControl() {
SetPoint pressureset =
new SetPoint("HP pump set", recycleValve, "pressure", separator1.getGasOutStream());

Recycle recycle = new Recycle("resycle 1");
Recycle recycle = new Recycle("recycle 1");
recycle.addStream(recycleValve.getOutletStream());
recycle.setOutletStream(resycstream);
recycle.setFlowAccuracy(1e-4);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@ public void runTEGProcessTest2() {

Stream leanTEGtoabs = new Stream("lean TEG to absorber", coolerhOTteg3.getOutletStream());

Recycle resycleLeanTEG = new Recycle("lean TEG resycle");
resycleLeanTEG.addStream(leanTEGtoabs);
resycleLeanTEG.setOutletStream(TEGFeed);
resycleLeanTEG.setPriority(200);
resycleLeanTEG.setDownstreamProperty("flow rate");
Recycle recycleLeanTEG = new Recycle("lean TEG recycle");
recycleLeanTEG.addStream(leanTEGtoabs);
recycleLeanTEG.setOutletStream(TEGFeed);
recycleLeanTEG.setPriority(200);
recycleLeanTEG.setDownstreamProperty("flow rate");

neqsim.processSimulation.processSystem.ProcessSystem operations =
new neqsim.processSimulation.processSystem.ProcessSystem();
Expand Down Expand Up @@ -321,7 +321,7 @@ public void runTEGProcessTest2() {
operations.add(makeupMixer);
operations.add(coolerhOTteg3);
operations.add(leanTEGtoabs);
operations.add(resycleLeanTEG);
operations.add(recycleLeanTEG);

// Check that process can run
operations.run();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -487,11 +487,11 @@ public void runTEGProcessTest2() {

Stream leanTEGtoabs = new Stream("resyc lean TEG to absorber", coolerhOTteg3.getOutletStream());

Recycle resycleLeanTEG = new Recycle("lean TEG resycle");
resycleLeanTEG.addStream(leanTEGtoabs);
resycleLeanTEG.setOutletStream(TEGFeed);
resycleLeanTEG.setPriority(200);
resycleLeanTEG.setDownstreamProperty("flow rate");
Recycle recycleLeanTEG = new Recycle("lean TEG recycle");
recycleLeanTEG.addStream(leanTEGtoabs);
recycleLeanTEG.setOutletStream(TEGFeed);
recycleLeanTEG.setPriority(200);
recycleLeanTEG.setDownstreamProperty("flow rate");

neqsim.processSimulation.processSystem.ProcessSystem operations =
new neqsim.processSimulation.processSystem.ProcessSystem();
Expand Down Expand Up @@ -552,7 +552,7 @@ public void runTEGProcessTest2() {
operations.add(makeupMixer);
operations.add(coolerhOTteg3);
operations.add(leanTEGtoabs);
operations.add(resycleLeanTEG);
operations.add(recycleLeanTEG);
operations.run();
/*
* System.out.println("flowo " + hotLeanTEGPump.getOutletStream().getFlowRate("kg/hr"));
Expand Down Expand Up @@ -805,11 +805,11 @@ public void testRun_step() {

Stream leanTEGtoabs = new Stream("resyc lean TEG to absorber", coolerhOTteg3.getOutletStream());

Recycle resycleLeanTEG = new Recycle("lean TEG resycle");
resycleLeanTEG.addStream(leanTEGtoabs);
resycleLeanTEG.setOutletStream(TEGFeed);
resycleLeanTEG.setPriority(200);
resycleLeanTEG.setDownstreamProperty("flow rate");
Recycle recycleLeanTEG = new Recycle("lean TEG recycle");
recycleLeanTEG.addStream(leanTEGtoabs);
recycleLeanTEG.setOutletStream(TEGFeed);
recycleLeanTEG.setPriority(200);
recycleLeanTEG.setDownstreamProperty("flow rate");

neqsim.processSimulation.processSystem.ProcessSystem operations =
new neqsim.processSimulation.processSystem.ProcessSystem();
Expand Down Expand Up @@ -870,7 +870,7 @@ public void testRun_step() {
operations.add(makeupMixer);
operations.add(coolerhOTteg3);
operations.add(leanTEGtoabs);
operations.add(resycleLeanTEG);
operations.add(recycleLeanTEG);
operations.run();
dryFeedGasMidgard.setFlowRate(11.1, "MSm3/day");
operations.run_step();
Expand Down
Loading

0 comments on commit d408538

Please sign in to comment.