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.

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

style and docfix #664

Merged
merged 4 commits into from
May 5, 2023
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -69,24 +69,24 @@ public interface InterphasePropertiesInterface extends Cloneable {

/**
* <p>
* getSurfaceTension.
* Get Surface tension between two phases.
* </p>
*
* @param i a int
* @param j a int
* @return a double
* @param i First phase number.
* @param j Second phase number.
* @return Surface tension in default unit.
*/
public double getSurfaceTension(int i, int j);

/**
* <p>
* getSurfaceTension.
* Get Surface tension between two phases in a specified unit.
* </p>
*
* @param numb1 a int
* @param numb2 a int
* @param numb1 First phase number.
* @param numb2 Second phase number.
* @param unit a {@link java.lang.String} object
* @return a double
* @return Surface tension in specified unit.
*/
public double getSurfaceTension(int numb1, int numb2, String unit);

Original file line number Diff line number Diff line change
@@ -53,7 +53,9 @@ public double calcPureComponentSurfaceTension(int componentNumber) {
/**
* {@inheritDoc}
*
* <p>
* Calculates the surfacetension using the Firozabadi Ramley (1988) method for mixtures Units: N/m
* </p>
*/
@Override
public double calcSurfaceTension(int interface1, int interface2) {
@@ -65,9 +67,10 @@ public double calcSurfaceTension(int interface1, int interface2) {
- system.getPhase(interface1).getPhysicalProperties().getDensity());
double Tr = system.getPhase(interface1).getTemperature()
/ system.getPhase(interface1).getPseudoCriticalTemperature();
// System.out.println("deltaDens " + deltaDens + " Tr " + Tr + " phasetyaae " +
// system.getPhase(interface1).getPhaseTypeName());
double a1 = 0.0, b1 = 0.0;
// System.out.println("deltaDens " + deltaDens + " Tr " + Tr + " phasetype " +
// system.getPhase(interface1).getType());
double a1 = 0.0;
double b1 = 0.0;
if (deltaDens / 1000.0 < 0.2) {
a1 = 2.2062;
b1 = -0.94716;