From 624b23021afe8fde0c9863a4e0d9a3e276f1a2a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Tue, 2 May 2023 15:10:46 +0200 Subject: [PATCH 1/2] wip --- .../surfaceTension/FirozabadiRamleyInterfaceTension.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/FirozabadiRamleyInterfaceTension.java b/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/FirozabadiRamleyInterfaceTension.java index d534a49add..7706f313d3 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/FirozabadiRamleyInterfaceTension.java +++ b/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/FirozabadiRamleyInterfaceTension.java @@ -53,7 +53,9 @@ public double calcPureComponentSurfaceTension(int componentNumber) { /** * {@inheritDoc} * + *

* Calculates the surfacetension using the Firozabadi Ramley (1988) method for mixtures Units: N/m + *

*/ @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; From 179717264475a060ffd3406a150d8566cf64abe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Tue, 2 May 2023 15:57:06 +0200 Subject: [PATCH 2/2] wip --- .../InterphasePropertiesInterface.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/InterphasePropertiesInterface.java b/src/main/java/neqsim/physicalProperties/interfaceProperties/InterphasePropertiesInterface.java index 94ed6c9776..0b8c0b20ca 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/InterphasePropertiesInterface.java +++ b/src/main/java/neqsim/physicalProperties/interfaceProperties/InterphasePropertiesInterface.java @@ -69,24 +69,24 @@ public interface InterphasePropertiesInterface extends Cloneable { /** *

- * getSurfaceTension. + * Get Surface tension between two phases. *

* - * @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); /** *

- * getSurfaceTension. + * Get Surface tension between two phases in a specified unit. *

* - * @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);