Skip to content

Commit

Permalink
update (#1132)
Browse files Browse the repository at this point in the history
  • Loading branch information
EvenSol authored Oct 8, 2024
1 parent 3d182ae commit d6d5203
Show file tree
Hide file tree
Showing 59 changed files with 106 additions and 106 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.stream.Stream;
import neqsim.processsimulation.processequipment.stream.StreamInterface;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.processsimulation.processequipment.heatExchanger;
package neqsim.processsimulation.processequipment.heatexchanger;

import java.util.UUID;
import com.google.gson.GsonBuilder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Created on 15. mars 2001, 14:17
*/

package neqsim.processsimulation.processequipment.heatExchanger;
package neqsim.processsimulation.processequipment.heatexchanger;

import java.util.UUID;
import com.google.gson.GsonBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.processsimulation.processequipment.heatExchanger;
package neqsim.processsimulation.processequipment.heatexchanger;

/**
* <p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Created on 15. mars 2001, 14:17
*/

package neqsim.processsimulation.processequipment.heatExchanger;
package neqsim.processsimulation.processequipment.heatexchanger;

import java.util.UUID;
import com.google.gson.GsonBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.processsimulation.processequipment.heatExchanger;
package neqsim.processsimulation.processequipment.heatexchanger;

import neqsim.processsimulation.SimulationInterface;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.processsimulation.processequipment.heatExchanger;
package neqsim.processsimulation.processequipment.heatexchanger;

import java.util.UUID;
import neqsim.processsimulation.processequipment.stream.StreamInterface;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.processsimulation.processequipment.heatExchanger;
package neqsim.processsimulation.processequipment.heatexchanger;

import java.util.UUID;
import neqsim.processsimulation.processequipment.TwoPortEquipment;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package neqsim.processsimulation.processequipment.powerGeneration;
package neqsim.processsimulation.processequipment.powergeneration;

import java.util.UUID;
import org.apache.logging.log4j.LogManager;
Expand All @@ -7,8 +7,8 @@
import neqsim.processsimulation.processequipment.TwoPortEquipment;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.expander.Expander;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.stream.Stream;
import neqsim.processsimulation.processequipment.stream.StreamInterface;
import neqsim.thermo.ThermodynamicConstantsInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import neqsim.processsimulation.processequipment.TwoPortEquipment;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator;
import neqsim.processsimulation.processequipment.stream.Stream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ public double getCoolerDuty(String unit) {
for (int i = 0; i < unitOperations.size(); i++) {
if (unitOperations.get(i).getClass().getSimpleName().equals("Cooler")) {
heat +=
((neqsim.processsimulation.processequipment.heatExchanger.Cooler) unitOperations.get(i))
((neqsim.processsimulation.processequipment.heatexchanger.Cooler) unitOperations.get(i))
.getDuty();
}
}
Expand All @@ -843,7 +843,7 @@ public double getHeaterDuty(String unit) {
for (int i = 0; i < unitOperations.size(); i++) {
if (unitOperations.get(i).getClass().getSimpleName().equals("Heater")) {
heat +=
((neqsim.processsimulation.processequipment.heatExchanger.Heater) unitOperations.get(i))
((neqsim.processsimulation.processequipment.heatexchanger.Heater) unitOperations.get(i))
.getDuty();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import neqsim.processsimulation.processequipment.distillation.DistillationColumn;
import neqsim.processsimulation.processequipment.distillation.Reboiler;
import neqsim.processsimulation.processequipment.expander.Expander;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.splitter.Splitter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import org.apache.logging.log4j.Logger;
import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass;
import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.stream.Stream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.UUID;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.Separator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.UUID;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.pump.PumpInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.util.UUID;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.compressor.CompressorInterface;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.stream.Stream;
import neqsim.processsimulation.processequipment.stream.StreamInterface;
import neqsim.processsimulation.processequipment.valve.ThrottlingValve;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.util.UUID;
import neqsim.processsimulation.processequipment.ProcessEquipmentInterface;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.util.UUID;
import neqsim.processsimulation.processequipment.ProcessEquipmentInterface;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package neqsim.processsimulation.processsystem.processmodules;

import java.util.UUID;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package neqsim.processsimulation.util.monitor;

import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger;

/**
* <p>
Expand Down Expand Up @@ -37,7 +37,7 @@ public HXResponse() {}
* </p>
*
* @param inputHeatExchanger a
* {@link neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger} object
* {@link neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger} object
*/
public HXResponse(HeatExchanger inputHeatExchanger) {
name = inputHeatExchanger.getName();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package neqsim.processsimulation.util.monitor;

import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;

/**
* <p>
Expand All @@ -22,7 +22,7 @@ public class HeaterResponse {
* Constructor for HeaterResponse.
* </p>
*
* @param inputHeater a {@link neqsim.processsimulation.processequipment.heatExchanger.Heater} object
* @param inputHeater a {@link neqsim.processsimulation.processequipment.heatexchanger.Heater} object
*/
public HeaterResponse(Heater inputHeater) {
name = inputHeater.getName();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign;
import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign;
import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.GasScrubber;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.stream.Stream;
import neqsim.processsimulation.processequipment.util.Recycle;
Expand Down Expand Up @@ -90,8 +90,8 @@ void testRun2() {

Stream stream_Cold = new Stream("Stream2", testSystem2);

neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger heatExchanger1 =
new neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger("heatEx",
neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger heatExchanger1 =
new neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger("heatEx",
stream_Hot, stream_Cold);

neqsim.processsimulation.processsystem.ProcessSystem operations =
Expand All @@ -108,7 +108,7 @@ void testRun2() {

assertEquals(15780.77130, heatExchanger1.getUAvalue(), 1e-3);

heatExchanger1 = new neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger(
heatExchanger1 = new neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger(
"heatEx", stream_Hot, stream_Cold);
heatExchanger1.setDeltaT(1.0);
heatExchanger1.run();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.stream.Stream;
import neqsim.processsimulation.processsystem.ProcessSystem;
import neqsim.thermo.system.SystemSrkEos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import neqsim.processsimulation.processequipment.powerGeneration.GasTurbine;
import neqsim.processsimulation.processequipment.powergeneration.GasTurbine;
import neqsim.processsimulation.processequipment.stream.Stream;
import neqsim.thermo.system.SystemSrkEos;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ void testRunTransientRes2() {
compressor.setPolytropicEfficiency(0.6);
compressor.setCompressionRatio(2.0);

neqsim.processsimulation.processequipment.heatExchanger.Cooler intercooler =
new neqsim.processsimulation.processequipment.heatExchanger.Cooler("cooler",
neqsim.processsimulation.processequipment.heatexchanger.Cooler intercooler =
new neqsim.processsimulation.processequipment.heatexchanger.Cooler("cooler",
compressor.getOutletStream());
intercooler.setOutTemperature(25.0, "C");

Expand All @@ -98,8 +98,8 @@ void testRunTransientRes2() {
compressor2.setPolytropicEfficiency(0.6);
compressor2.setCompressionRatio(2.0);

neqsim.processsimulation.processequipment.heatExchanger.Heater cooler1 =
new neqsim.processsimulation.processequipment.heatExchanger.Heater("cooler 1",
neqsim.processsimulation.processequipment.heatexchanger.Heater cooler1 =
new neqsim.processsimulation.processequipment.heatexchanger.Heater("cooler 1",
compressor2.getOutletStream());
cooler1.setOutTemperature(30.0, "C");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn;
import neqsim.processsimulation.processequipment.distillation.DistillationColumn;
import neqsim.processsimulation.processequipment.filter.Filter;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.StaticMixer;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.Separator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.distillation.DistillationColumn;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.stream.Stream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn;
import neqsim.processsimulation.processequipment.distillation.DistillationColumn;
import neqsim.processsimulation.processequipment.filter.Filter;
import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.Separator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Test;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.Mixer;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.Separator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import neqsim.processsimulation.measurementdevice.PressureTransmitter;
import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter;
import neqsim.processsimulation.processequipment.compressor.Compressor;
import neqsim.processsimulation.processequipment.heatExchanger.Cooler;
import neqsim.processsimulation.processequipment.heatexchanger.Cooler;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.processsimulation.processequipment.splitter.Splitter;
import neqsim.processsimulation.processequipment.stream.Stream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn;
import neqsim.processsimulation.processequipment.distillation.DistillationColumn;
import neqsim.processsimulation.processequipment.filter.Filter;
import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.StaticMixer;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.Separator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn;
import neqsim.processsimulation.processequipment.distillation.DistillationColumn;
import neqsim.processsimulation.processequipment.filter.Filter;
import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatExchanger.Heater;
import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger;
import neqsim.processsimulation.processequipment.heatexchanger.Heater;
import neqsim.processsimulation.processequipment.mixer.StaticMixer;
import neqsim.processsimulation.processequipment.pump.Pump;
import neqsim.processsimulation.processequipment.separator.Separator;
Expand Down
Loading

0 comments on commit d6d5203

Please sign in to comment.