Updated to match changes in radiostack.[ch]xx

[flightgear.git] / src / FDM / JSBSim / FGAtmosphere.cpp

diff --git a/src/FDM/JSBSim/FGAtmosphere.cpp b/src/FDM/JSBSim/FGAtmosphere.cpp
index 30c172cffd050fddc277e513419884a36885fcd9..e2ea8131d1aababaae5576e0a6f8ee43ea2ce97e 100644 (file)
--- a/src/FDM/JSBSim/FGAtmosphere.cpp
+++ b/src/FDM/JSBSim/FGAtmosphere.cpp
@@ -36,6 +36,7 @@ HISTORY
 11/24/98   JSB   Created
 07/23/99   TP    Added implementation of 1959 Standard Atmosphere
                  Moved calculation of Mach number to FGTranslation
+                 Later updated to '76 model
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 COMMENTS, REFERENCES,  and NOTES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -108,14 +109,18 @@ bool FGAtmosphere::InitModel(void)
   FGModel::InitModel();
 
   Calculate(h);
-  SLtemperature = temperature;
-  SLpressure    = pressure;
-  SLdensity     = density;
-  SLsoundspeed  = sqrt(SHRatio*Reng*temperature);
-  rSLtemperature = 1.0/temperature;
-  rSLpressure    = 1.0/pressure;
-  rSLdensity     = 1.0/density;
+  SLtemperature = intTemperature;
+  SLpressure    = intPressure;
+  SLdensity     = intDensity;
+  SLsoundspeed  = sqrt(SHRatio*Reng*intTemperature);
+  rSLtemperature = 1.0/intTemperature;
+  rSLpressure    = 1.0/intPressure;
+  rSLdensity     = 1.0/intDensity;
   rSLsoundspeed  = 1.0/SLsoundspeed;
+  temperature=&intTemperature;
+  pressure=&intPressure;
+  density=&intDensity;
+  
   useExternal=false;
   
   return true;
@@ -130,11 +135,7 @@ bool FGAtmosphere::Run(void)
     if (!useExternal) {
       h = Position->Geth();
       Calculate(h);
-    } else {
-      density = exDensity;
-      pressure = exPressure;
-      temperature = exTemperature;
-    }
+    } 
 
     if (turbType != ttNone) {
       Turbulence();
@@ -145,7 +146,7 @@ bool FGAtmosphere::Run(void)
 
     if (psiw < 0) psiw += 2*M_PI;
 
-    soundspeed = sqrt(SHRatio*Reng*temperature);
+    soundspeed = sqrt(SHRatio*Reng*(*temperature));
 
     State->Seta(soundspeed);
 
@@ -239,18 +240,18 @@ void FGAtmosphere::Calculate(double altitude)
   }
  
   if (slope == 0) {
-    temperature = reftemp;
-    pressure = refpress*exp(-Inertial->SLgravity()/(reftemp*Reng)*(altitude-htab[i]));
-    //density = refdens*exp(-Inertial->SLgravity()/(reftemp*Reng)*(altitude-htab[i]));
-    density = pressure/(Reng*temperature);
+    intTemperature = reftemp;
+    intPressure = refpress*exp(-Inertial->SLgravity()/(reftemp*Reng)*(altitude-htab[i]));
+    //intDensity = refdens*exp(-Inertial->SLgravity()/(reftemp*Reng)*(altitude-htab[i]));
+    intDensity = intPressure/(Reng*intTemperature);
   } else {
-    temperature = reftemp+slope*(altitude-htab[i]);
-    pressure = refpress*pow(temperature/reftemp,-Inertial->SLgravity()/(slope*Reng));
-    //density = refdens*pow(temperature/reftemp,-(Inertial->SLgravity()/(slope*Reng)+1));
-    density = pressure/(Reng*temperature);
+    intTemperature = reftemp+slope*(altitude-htab[i]);
+    intPressure = refpress*pow(intTemperature/reftemp,-Inertial->SLgravity()/(slope*Reng));
+    //intDensity = refdens*pow(intTemperature/reftemp,-(Inertial->SLgravity()/(slope*Reng)+1));
+    intDensity = intPressure/(Reng*intTemperature);
   }
   lastIndex=i;
-  //cout << "Atmosphere:  h=" << altitude << " rho= " << density << endl;
+  //cout << "Atmosphere:  h=" << altitude << " rho= " << intDensity << endl;
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -294,10 +295,30 @@ void FGAtmosphere::Turbulence(void)
   }
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGAtmosphere::UseExternal(void) {
+  temperature=&exTemperature;
+  pressure=&exPressure;
+  density=&exDensity;
+  useExternal=true;
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGAtmosphere::UseInternal(void) {
+  temperature=&intTemperature;
+  pressure=&intPressure;
+  density=&intDensity;
+  useExternal=false;
+}
+  
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 void FGAtmosphere::bind(void)
 {
+  typedef double (FGAtmosphere::*PMF)(int) const;
   PropertyManager->Tie("atmosphere/T-R", this,
                        &FGAtmosphere::GetTemperature);
   PropertyManager->Tie("atmosphere/rho-slugs_ft3", this,
@@ -325,11 +346,11 @@ void FGAtmosphere::bind(void)
   PropertyManager->Tie("atmosphere/psiw-rad", this,
                        &FGAtmosphere::GetWindPsi);
   PropertyManager->Tie("atmosphere/p-turb-rad_sec", this,1,
-                       &FGAtmosphere::GetTurbPQR);
+                       (PMF)&FGAtmosphere::GetTurbPQR);
   PropertyManager->Tie("atmosphere/q-turb-rad_sec", this,2,
-                       &FGAtmosphere::GetTurbPQR);
+                       (PMF)&FGAtmosphere::GetTurbPQR);
   PropertyManager->Tie("atmosphere/r-turb-rad_sec", this,3,
-                       &FGAtmosphere::GetTurbPQR);
+                       (PMF)&FGAtmosphere::GetTurbPQR);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%