Basics on catalog list model in the GUI.

[flightgear.git] / src / Environment / atmosphere.hxx

diff --git a/src/Environment/atmosphere.hxx b/src/Environment/atmosphere.hxx
index 73fa494771fcf202bbe377ed5ba0c22e582c0af5..8c21186bb73979d271cfa982d24120d41e80323c 100644 (file)
--- a/src/Environment/atmosphere.hxx
+++ b/src/Environment/atmosphere.hxx
@@ -27,12 +27,9 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/interpolater.hxx>
-#include "boost/tuple/tuple.hpp"
-using namespace boost;
 
 #include <cmath>
-
-using namespace std;
+#include <utility>
 
 /**
  * Model the atmosphere in a way consistent with the laws
@@ -84,7 +81,7 @@ public:
 
 extern const ISA_layer ISA_def[];
 
-tuple<double,double> PT_vs_hpt(
+std::pair<double,double> PT_vs_hpt(
           const double hh, 
           const double _p0 = atmodel::ISA::P0,
           const double _t0 = atmodel::ISA::T0);
@@ -111,6 +108,15 @@ public:
 // Field pressure in pascals
 // Valid for fields within the troposphere only.
     double QNH(const double field_elev, const double field_press);
+/**
+ * Invert the QNH calculation to get the field pressure from a metar
+ * report. Valid for fields within the troposphere only.
+ * @param field_elev field elevation in m
+ * @param qnh altimeter setting in pascals
+ * @return field pressure _in pascals_. Caller gets to convert to inHg
+ * or millibars 
+ */
+    static double fieldPressure(const double field_elev, const double qnh);
 };
 
 
@@ -130,9 +136,6 @@ public:
 
 
 class FGAltimeter : public FGAtmoCache {
-    double kset;
-    double kft;
-
 public:
     FGAltimeter();
     double reading_ft(const double p_inHg,