Skip to content

Ref rahmat 2 #945

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

Merged
merged 4 commits into from
Mar 9, 2024
Merged

Ref rahmat 2 #945

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e00bbe3
refact: remove redundant variable definitions
asmfstatoil Mar 8, 2024
cca3c72
refact: remove duplicate setters/getters
asmfstatoil Mar 8, 2024
2ad431e
Merge branch 'master' into ref_rahmat_2
asmfstatoil Mar 9, 2024
d169cf6
rem: redundant methods
asmfstatoil Mar 9, 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
144 changes: 0 additions & 144 deletions src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,84 +1123,6 @@ public double dFdVdVdV() {
+ useDISP2 * dF_DISP2_SAFTdVdVdV()) * 1.0e-20;
}

/** {@inheritDoc} */
@Override
public double getmdSAFT() {
return mdSAFT;
}

/** {@inheritDoc} */
@Override
public void setmdSAFT(double mdSAFT) {
this.mdSAFT = mdSAFT;
}

/** {@inheritDoc} */
@Override
public double getmSAFT() {
return mSAFT;
}

/** {@inheritDoc} */
@Override
public void setmSAFT(double mSAFT) {
this.mSAFT = mSAFT;
}

/** {@inheritDoc} */
@Override
public double getAHSSAFT() {
return aHSSAFT;
}

/** {@inheritDoc} */
@Override
public void setAHSSAFT(double aHSSAFT) {
this.aHSSAFT = aHSSAFT;
}

/** {@inheritDoc} */
@Override
public double getMmin1SAFT() {
return mmin1SAFT;
}

/** {@inheritDoc} */
@Override
public void setMmin1SAFT(double mmin1SAFT) {
this.mmin1SAFT = mmin1SAFT;
}

/** {@inheritDoc} */
@Override
public double getVolumeSAFT() {
return volumeSAFT;
}

/** {@inheritDoc} */
@Override
public void setVolumeSAFT(double volumeSAFT) {
this.volumeSAFT = volumeSAFT;
}

/** {@inheritDoc} */
@Override
public double getDgHSSAFTdN() {
return dgHSSAFTdN;
}

/** {@inheritDoc} */
@Override
public void setDgHSSAFTdN(double dgHSSAFTdN) {
this.dgHSSAFTdN = dgHSSAFTdN;
}

/** {@inheritDoc} */
@Override
public double getDnSAFTdV() {
return dnSAFTdV;
}

// added by rahmat
/**
* <p>
Expand All @@ -1223,72 +1145,6 @@ public double getdDSAFTdT() {
return temp;
}

/** {@inheritDoc} */
@Override
public void setDnSAFTdV(double dnSAFTdV) {
this.dnSAFTdV = dnSAFTdV;
}

/** {@inheritDoc} */
@Override
public double getF1dispVolTerm() {
return F1dispVolTerm;
}

/** {@inheritDoc} */
@Override
public void setF1dispVolTerm(double F1dispVolTerm) {
this.F1dispVolTerm = F1dispVolTerm;
}

/** {@inheritDoc} */
@Override
public double getF1dispSumTerm() {
return F1dispSumTerm;
}

/** {@inheritDoc} */
@Override
public double getF1dispI1() {
return F1dispI1;
}

/** {@inheritDoc} */
@Override
public double getF2dispI2() {
return F2dispI2;
}

/** {@inheritDoc} */
@Override
public void setF2dispI2(double F2dispI2) {
this.F2dispI2 = F2dispI2;
}

/** {@inheritDoc} */
@Override
public double getF2dispZHC() {
return F2dispZHC;
}

/** {@inheritDoc} */
@Override
public void setF2dispZHC(double F2dispZHC) {
this.F2dispZHC = F2dispZHC;
}

/** {@inheritDoc} */
@Override
public double getF2dispZHCdN() {
return F2dispZHCdN;
}

/** {@inheritDoc} */
@Override
public double getF2dispZHCdm() {
return F2dispZHCdm;
}

/** {@inheritDoc} */
@Override
public double molarVolume(double pressure, double temperature, double A, double B, PhaseType pt)
Expand Down