Commit b61b15ea authored by Luc Maisonobe's avatar Luc Maisonobe

Fixed error in relative humidity units in Marini-Marray model.

Fixes issue #352.
parent 6724c798
...@@ -119,7 +119,7 @@ public class MariniMurrayModel implements TroposphericModel { ...@@ -119,7 +119,7 @@ public class MariniMurrayModel implements TroposphericModel {
* *
* See: Giacomo, P., Equation for the dertermination of the density of moist air, Metrologia, V. 18, 1982 * See: Giacomo, P., Equation for the dertermination of the density of moist air, Metrologia, V. 18, 1982
* *
* @param rh relative humidity, in percent. * @param rh relative humidity, in percent (50% -> 0.5).
* @return the water vapor, in mbar (1 mbar = 100 Pa). * @return the water vapor, in mbar (1 mbar = 100 Pa).
*/ */
private double getWaterVapor(final double rh) { private double getWaterVapor(final double rh) {
...@@ -134,7 +134,7 @@ public class MariniMurrayModel implements TroposphericModel { ...@@ -134,7 +134,7 @@ public class MariniMurrayModel implements TroposphericModel {
// enhancement factor, equation (4) of reference paper // enhancement factor, equation (4) of reference paper
final double fw = 1.00062 + (3.14 * 1e-6) * P0 + (5.6 * 1e-7) * FastMath.pow(T0 - 273.15, 2); final double fw = 1.00062 + (3.14 * 1e-6) * P0 + (5.6 * 1e-7) * FastMath.pow(T0 - 273.15, 2);
final double e = (rh / 100.0) * fw * es; final double e = rh * fw * es;
return e; return e;
} }
} }
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
</properties> </properties>
<body> <body>
<release version="9.2" date="TBD" description="TBD"> <release version="9.2" date="TBD" description="TBD">
<action dev="luc" type="fix">
Fixed error in relative humidity units in Marini-Marray tropospheric model.
Fixes issue #352.
</action>
<action dev="luc" type="fix"> <action dev="luc" type="fix">
Fixed DSST events detection in the osculating case. Fixed DSST events detection in the osculating case.
Fixes issue #398. Fixes issue #398.
......
...@@ -69,7 +69,7 @@ public class MariniMurrayModelTest { ...@@ -69,7 +69,7 @@ public class MariniMurrayModelTest {
double height = 0; double height = 0;
double elevation = 10; double elevation = 10;
double expectedValue = 13.25126; double expectedValue = 13.26069;
double actualValue = model.pathDelay(FastMath.toRadians(elevation), height); double actualValue = model.pathDelay(FastMath.toRadians(elevation), height);
Assert.assertEquals(expectedValue, actualValue, 1.0e-5); Assert.assertEquals(expectedValue, actualValue, 1.0e-5);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment