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

refact: remove initType from System #1194

Merged
merged 1 commit into from
Nov 25, 2024
Merged

refact: remove initType from System #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 0 additions & 27 deletions src/main/java/neqsim/thermo/system/SystemInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,15 +914,6 @@ public default double getGamma2() {
*/
public double getIdealLiquidDensity(String unit);

/**
* <p>
* Getter for property initType.
* </p>
*
* @return a int
*/
public int getInitType();

/**
* method to return interfacial tension between two phases.
*
Expand Down Expand Up @@ -1674,15 +1665,6 @@ public default boolean hasSolidPhase() {
return hasPhaseType(PhaseType.SOLID); // || hasPhaseType(PhaseType.SOLIDCOMPLEX);
}

/**
* Calculate thermodynamic properties of the fluid using the init type set in fluid.
*
* @see getInitType
*/
public default void init() {
this.init(this.getInitType());
}

/**
* method to calculate thermodynamic properties of the fluid. The temperature, pressure, number of
* phases and composition of the phases will be used as basis for calculation.
Expand Down Expand Up @@ -2267,15 +2249,6 @@ public void setImplementedPressureDeriativesofFugacity(
public void setImplementedTemperatureDeriativesofFugacity(
boolean implementedTemperatureDeriativesofFugacity);

/**
* <p>
* Setter for property initType.
* </p>
*
* @param initType a int
*/
public void setInitType(int initType);

/**
* <p>
* Setter for property <code>maxNumberOfPhases</code>.
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/neqsim/thermo/system/SystemThermo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@ public abstract class SystemThermo implements SystemInterface {
private boolean implementedPressureDeriativesofFugacity = true;

private boolean implementedTemperatureDeriativesofFugacity = true;

/*
* Initialization type. 0 to initialize and 1 to reset, 2 to calculate T and P derivatives, 3 to
* calculate all derivatives and 4 to calculate all derivatives numerically
*/
protected int initType = 3;
protected InterphasePropertiesInterface interfaceProp = null;

// Initialization
Expand Down Expand Up @@ -2251,12 +2245,6 @@ public double getIdealLiquidDensity(String unit) {
}
}

/** {@inheritDoc} */
@Override
public int getInitType() {
return initType;
}

/** {@inheritDoc} */
@Override
public double getInterfacialTension(int phase1, int phase2) {
Expand Down Expand Up @@ -4443,12 +4431,6 @@ public void setImplementedTemperatureDeriativesofFugacity(
this.implementedTemperatureDeriativesofFugacity = implementedTemperatureDeriativesofFugacity;
}

/** {@inheritDoc} */
@Override
public void setInitType(int initType) {
this.initType = initType;
}

/**
* <p>
* setLastTBPasPlus.
Expand Down