JSBSim Flight Dynamics Model

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4929/src/models/propulsion

Modified Files:
      Tag: JSB_New_XML
	FGTurbine.cpp 
Log Message:
Cleaned up uninitialized  pointers in FGTURbine

Index: FGTurbine.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/Attic/FGTurbine.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** FGTurbine.cpp	16 Mar 2005 13:05:06 -0000	1.1.2.2
--- FGTurbine.cpp	18 Mar 2005 03:26:15 -0000	1.1.2.3
***************
*** 387,390 ****
--- 387,391 ----
    Fire = false;
    EGT_degC = 0.0;
+   IdleThrustLookup = MilThrustLookup = MaxThrustLookup = InjectionLookup = 0;
  }

Update of /cvsroot/jsbsim/JSBSim/src/math
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4929/src/math

Modified Files:
      Tag: JSB_New_XML
	FGFunction.cpp 
Log Message:
Cleaned up uninitialized  pointers in FGTURbine

Index: FGFunction.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/math/Attic/FGFunction.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGFunction.cpp	6 Mar 2005 16:54:18 -0000	1.1.2.1
--- FGFunction.cpp	18 Mar 2005 03:26:15 -0000	1.1.2.2
***************
*** 107,110 ****
--- 107,118 ----
  //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
+ FGFunction::~FGFunction(void)
+ {
+   string tmp = PropertyManager->mkPropertyName(Prefix + Name, false); // Allow upper case
+   PropertyManager->Untie(tmp);
+ }
+ 
+ //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
  void FGFunction::cacheValue(bool cache)
  {
***************
*** 195,206 ****
  
  //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- 
- FGFunction::~FGFunction(void)
- {
-   string tmp = PropertyManager->mkPropertyName(Prefix + Name, false); // Allow upper case
-   PropertyManager->Untie(tmp);
- }
- 
- //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  //    The bitmasked value choices are as follows:
  //    unset: In this case (the default) JSBSim would only print
--- 203,206 ----

Update of /cvsroot/jsbsim/JSBSim/src/input_output
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13387/src/input_output

Modified Files:
      Tag: JSB_New_XML
	FGPropertyManager.cpp FGPropertyManager.h 
Log Message:
Added changes to allow properties to be printed for a unique aircraft. Set JSBSIM_DEBUG environment variable to 32 (e.g. export JSBSIM_DEBUG=32) to see the properties on the printed on standard out

Index: FGPropertyManager.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/input_output/Attic/FGPropertyManager.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** FGPropertyManager.cpp	16 Mar 2005 13:05:04 -0000	1.1.2.2
--- FGPropertyManager.cpp	17 Mar 2005 13:04:18 -0000	1.1.2.3
***************
*** 270,277 ****
  void FGPropertyManager::Tie (const string &name, bool *pointer, bool useDefault)
  {
!   if (!tie(name.c_str(), SGRawValuePointer<bool>(pointer),
!                                  useDefault))
!     cout <<
!            "Failed to tie property " << name << " to a pointer" << endl;
  }
  
--- 270,277 ----
  void FGPropertyManager::Tie (const string &name, bool *pointer, bool useDefault)
  {
!   if (!tie(name.c_str(), SGRawValuePointer<bool>(pointer), useDefault))
!     cout << "Failed to tie property " << name << " to a pointer" << endl;
!   else if (debug_lvl & 0x20)
!     cout << name << endl;
  }
  
***************
*** 281,288 ****
                                            bool useDefault )
  {
!   if (!tie(name.c_str(), SGRawValuePointer<int>(pointer),
!                                  useDefault))
!     cout <<
!            "Failed to tie property " << name << " to a pointer" << endl;
  }
  
--- 281,288 ----
                                            bool useDefault )
  {
!   if (!tie(name.c_str(), SGRawValuePointer<int>(pointer), useDefault))
!     cout << "Failed to tie property " << name << " to a pointer" << endl;
!   else if (debug_lvl & 0x20)
!     cout << name << endl;
  }
  
***************
*** 292,299 ****
                                            bool useDefault )
  {
!   if (!tie(name.c_str(), SGRawValuePointer<long>(pointer),
!                                  useDefault))
!     cout <<
!            "Failed to tie property " << name << " to a pointer" << endl;
  }
  
--- 292,299 ----
                                            bool useDefault )
  {
!   if (!tie(name.c_str(), SGRawValuePointer<long>(pointer), useDefault))
!     cout << "Failed to tie property " << name << " to a pointer" << endl;
!   else if (debug_lvl & 0x20)
!     cout << name << endl;
  }
  
***************
*** 303,321 ****
                                            bool useDefault )
  {
!   if (!tie(name.c_str(), SGRawValuePointer<float>(pointer),
!                                  useDefault))
!     cout <<
!            "Failed to tie property " << name << " to a pointer" << endl;
  }
  
  //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
! void FGPropertyManager::Tie (const string &name, double *pointer,
!                                            bool useDefault)
  {
!   if (!tie(name.c_str(), SGRawValuePointer<double>(pointer),
!                                  useDefault))
!     cout <<
!            "Failed to tie property " << name << " to a pointer" << endl;
  }
  
--- 303,320 ----
                                            bool useDefault )
  {
!   if (!tie(name.c_str(), SGRawValuePointer<float>(pointer), useDefault))
!     cout << "Failed to tie property " << name << " to a pointer" << endl;
!   else if (debug_lvl & 0x20)
!     cout << name << endl;
  }
  
  //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
! void FGPropertyManager::Tie (const string &name, double *pointer, bool useDefault)
  {
!   if (!tie(name.c_str(), SGRawValuePointer<double>(pointer), useDefault))
!     cout << "Failed to tie property " << name << " to a pointer" << endl;
!   else if (debug_lvl & 0x20)
!     cout << name << endl;
  }
  

Index: FGPropertyManager.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/input_output/Attic/FGPropertyManager.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** FGPropertyManager.h	16 Mar 2005 13:05:04 -0000	1.1.2.2
--- FGPropertyManager.h	17 Mar 2005 13:04:18 -0000	1.1.2.3
***************
*** 38,46 ****
  #include <string>
  #ifdef FGFS
! #include <simgear/props/props.hxx>
  #else
! #include "simgear/props/props.hxx"
  #endif
  
  /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  DEFINITIONS
--- 38,48 ----
  #include <string>
  #ifdef FGFS
! #  include <simgear/props/props.hxx>
  #else
! #  include "simgear/props/props.hxx"
  #endif
  
+ #include "FGJSBBase.h"
+ 
  /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  DEFINITIONS
***************
*** 69,73 ****
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
  
! class FGPropertyManager : public SGPropertyNode {
    private:
      bool suppress_warning;
--- 71,76 ----
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
  
! class FGPropertyManager : public SGPropertyNode, public FGJSBBase
! {
    private:
      bool suppress_warning;
***************
*** 503,515 ****
  
      template <class V> inline void
!     Tie (const string &name, V (*getter)(), void (*setter)(V) = 0,
!                                               bool useDefault = true)
      {
!       if (!tie(name.c_str(), SGRawValueFunctions<V>(getter, setter),
!          useDefault))
!       {
!         cout <<
!          "Failed to tie property " << name << " to functions" << endl;
!       }
      }
  
--- 506,515 ----
  
      template <class V> inline void
!     Tie (const string &name, V (*getter)(), void (*setter)(V) = 0, bool useDefault = true)
      {
!       if (!tie(name.c_str(), SGRawValueFunctions<V>(getter, setter), useDefault))
!         cout << "Failed to tie property " << name << " to functions" << endl;
!       else if (debug_lvl & 0x20)
!         cout << name << endl;
      }
  
***************
*** 533,546 ****
       *        discarded; defaults to true.
       */
!     template <class V> inline void Tie (const string &name,
!                                         int index, V (*getter)(int),
!            void (*setter)(int, V) = 0, bool useDefault = true)
      {
!       if (!tie(name.c_str(),
!            SGRawValueFunctionsIndexed<V>(index, getter, setter), useDefault))
!       {
!         cout <<
!          "Failed to tie property " << name << " to indexed functions" << endl;
!       }
      }
  
--- 533,543 ----
       *        discarded; defaults to true.
       */
!     template <class V> inline void Tie (const string &name, int index, V (*getter)(int),
!                                 void (*setter)(int, V) = 0, bool useDefault = true)
      {
!       if (!tie(name.c_str(), SGRawValueFunctionsIndexed<V>(index, getter, setter), useDefault))
!         cout << "Failed to tie property " << name << " to indexed functions" << endl;
!       else if (debug_lvl & 0x20)
!         cout << name << endl;
      }
  
***************
*** 569,578 ****
             void (T::*setter)(V) = 0, bool useDefault = true)
      {
!       if (!tie(name.c_str(),
!              SGRawValueMethods<T,V>(*obj, getter, setter), useDefault))
!       {
!         cout <<
!          "Failed to tie property " << name << " to object methods" << endl;
!       }
      }
  
--- 566,573 ----
             void (T::*setter)(V) = 0, bool useDefault = true)
      {
!       if (!tie(name.c_str(), SGRawValueMethods<T,V>(*obj, getter, setter), useDefault))
!         cout << "Failed to tie property " << name << " to object methods" << endl;
!       else if (debug_lvl & 0x20)
!         cout << name << endl;
      }
  
***************
*** 597,610 ****
       */
      template <class T, class V> inline void
!     Tie (const string &name, T * obj, int index,
!            V (T::*getter)(int) const, void (T::*setter)(int, V) = 0,
!                                               bool useDefault = true)
      {
!       if (!tie(name.c_str(),
!           SGRawValueMethodsIndexed<T,V>(*obj, index, getter, setter), useDefault))
!       {
!         cout <<
!          "Failed to tie property " << name << " to indexed object methods" << endl;
!       }
     }
  };
--- 592,602 ----
       */
      template <class T, class V> inline void
!     Tie (const string &name, T * obj, int index, V (T::*getter)(int) const,
!                          void (T::*setter)(int, V) = 0, bool useDefault = true)
      {
!       if (!tie(name.c_str(), SGRawValueMethodsIndexed<T,V>(*obj, index, getter, setter), useDefault))
!         cout << "Failed to tie property " << name << " to indexed object methods" << endl;
!       else if (debug_lvl & 0x20)
!         cout << name << endl;
     }
  };

Update of /cvsroot/jsbsim/JSBSim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13387/src

Modified Files:
      Tag: JSB_New_XML
	FGFDMExec.cpp 
Log Message:
Added changes to allow properties to be printed for a unique aircraft. Set JSBSIM_DEBUG environment variable to 32 (e.g. export JSBSIM_DEBUG=32) to see the properties on the printed on standard out

Index: FGFDMExec.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/Attic/FGFDMExec.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** FGFDMExec.cpp	16 Mar 2005 13:05:04 -0000	1.1.2.2
--- FGFDMExec.cpp	17 Mar 2005 13:04:17 -0000	1.1.2.3
***************
*** 477,480 ****
--- 477,482 ----
    bool result = true; // true for success
  
+   if (debug_lvl & ~1) return result;
+ 
    if (el->FindElement("author"))
      cout << "  Model Author:  " << el->FindElement("author")->GetDataLine() << endl;
***************
*** 500,504 ****
    Aircraft->SetAircraftName(AircraftName);
  
!   if (debug_lvl > 0) cout << underon << "Reading Aircraft Configuration File"
              << underoff << ": " << highint << AircraftName << normint << endl;
  
--- 502,506 ----
    Aircraft->SetAircraftName(AircraftName);
  
!   if (debug_lvl & 1) cout << underon << "Reading Aircraft Configuration File"
              << underoff << ": " << highint << AircraftName << normint << endl;
  
***************
*** 506,510 ****
    Release    = el->GetAttributeValue("release");
  
!   if (debug_lvl > 0)
      cout << "                            Version: " << highint << CFGVersion
                                                      << normint << endl;
--- 508,512 ----
    Release    = el->GetAttributeValue("release");
  
!   if (debug_lvl & 1)
      cout << "                            Version: " << highint << CFGVersion
                                                      << normint << endl;
***************
*** 517,521 ****
    }
  
!   if (Release == "ALPHA") {
      cout << endl << endl
           << highint << "This aircraft model is an " << fgred << Release
--- 519,523 ----
    }
  
!   if (Release == "ALPHA" && (debug_lvl & 1)) {
      cout << endl << endl
           << highint << "This aircraft model is an " << fgred << Release
***************
*** 525,529 ****
           << fgred << highint << "Use this model for development purposes ONLY!!!"
           << normint << reset << endl << endl;
!   } else if (Release == "BETA") {
      cout << endl << endl
           << highint << "This aircraft model is a " << fgred << Release
--- 527,531 ----
           << fgred << highint << "Use this model for development purposes ONLY!!!"
           << normint << reset << endl << endl;
!   } else if (Release == "BETA" && (debug_lvl & 1)) {
      cout << endl << endl
           << highint << "This aircraft model is a " << fgred << Release
***************
*** 532,540 ****
           << fgblue << highint << "Use this model for development purposes ONLY!!!"
           << normint << reset << endl << endl;
!   } else if (Release == "PRODUCTION") {
      cout << endl << endl
           << highint << "This aircraft model is a " << fgblue << Release
           << reset << highint << " release." << endl << endl << reset;
!   } else {
      cout << endl << endl
           << highint << "This aircraft model is an " << fgred << Release
--- 534,542 ----
           << fgblue << highint << "Use this model for development purposes ONLY!!!"
           << normint << reset << endl << endl;
!   } else if (Release == "PRODUCTION" && (debug_lvl & 1)) {
      cout << endl << endl
           << highint << "This aircraft model is a " << fgblue << Release
           << reset << highint << " release." << endl << endl << reset;
!   } else if (debug_lvl & 1) {
      cout << endl << endl
           << highint << "This aircraft model is an " << fgred << Release

Update of /cvsroot/jsbsim/JSBSim/src/models
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13387/src/models

Modified Files:
      Tag: JSB_New_XML
	FGAtmosphere.cpp 
Log Message:
Added changes to allow properties to be printed for a unique aircraft. Set JSBSIM_DEBUG environment variable to 32 (e.g. export JSBSIM_DEBUG=32) to see the properties on the printed on standard out

Index: FGAtmosphere.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/Attic/FGAtmosphere.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGAtmosphere.cpp	6 Mar 2005 16:54:19 -0000	1.1.2.1
--- FGAtmosphere.cpp	17 Mar 2005 13:04:18 -0000	1.1.2.2
***************
*** 244,248 ****
        T_dev = T_dev_sl * ( 1.0 - (h/36089.239));
      }
!   } 
    density_altitude = h + T_dev * 66.7;
  
--- 244,248 ----
        T_dev = T_dev_sl * ( 1.0 - (h/36089.239));
      }
!   }
    density_altitude = h + T_dev * 66.7;
  
***************
*** 520,524 ****
    if (debug_lvl & 16) { // Sanity checking
    }
!   if (debug_lvl & 32) { // Turbulence
      if (frame == 0 && from == 2) {
        cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "
--- 520,524 ----
    if (debug_lvl & 16) { // Sanity checking
    }
!   if (debug_lvl & 128) { // Turbulence
      if (frame == 0 && from == 2) {
        cout << "vTurbulence(X), vTurbulence(Y), vTurbulence(Z), "

Update of /cvsroot/jsbsim/JSBSim/src/math
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13387/src/math

Modified Files:
      Tag: JSB_New_XML
	FGTable.cpp 
Log Message:
Added changes to allow properties to be printed for a unique aircraft. Set JSBSIM_DEBUG environment variable to 32 (e.g. export JSBSIM_DEBUG=32) to see the properties on the printed on standard out

Index: FGTable.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/math/Attic/FGTable.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGTable.cpp	6 Mar 2005 16:54:18 -0000	1.1.2.1
--- FGTable.cpp	17 Mar 2005 13:04:18 -0000	1.1.2.2
***************
*** 194,198 ****
      break;
    }
!   Print();
  }
  
--- 194,198 ----
      break;
    }
!   if (debug_lvl & 1) Print();
  }

Update of /cvsroot/jsbsim/JSBSim/aircraft/fokker100
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8728/aircraft/fokker100

Modified Files:
      Tag: JSB_New_XML
	fokker100.xml 
Log Message:
Fixed Fokker100 config

Index: fokker100.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/aircraft/fokker100/fokker100.xml,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -C2 -r1.17.2.2 -r1.17.2.3
*** fokker100.xml	16 Mar 2005 13:05:02 -0000	1.17.2.2
--- fokker100.xml	16 Mar 2005 13:08:23 -0000	1.17.2.3
***************
*** 1,6 ****
  <!-- Failed to tie property fcs/spoiler-control to object methods
  Failed to tie property output-value to object methods
  Failed to tie property output-norm to object methods -->
- <?xml version="1.0"?>
  <?xml-stylesheet href="JSBSim.xsl" type="application/xml"?>
  <fdm_config name="Fokker 100" version="2.0" release="BETA">
--- 1,6 ----
+ <?xml version="1.0"?>
  <!-- Failed to tie property fcs/spoiler-control to object methods
  Failed to tie property output-value to object methods
  Failed to tie property output-norm to object methods -->
  <?xml-stylesheet href="JSBSim.xsl" type="application/xml"?>
  <fdm_config name="Fokker 100" version="2.0" release="BETA">
***************
*** 176,180 ****
              </thruster>
          </engine>
!         <tank type="FUEL">    <!-- Tank number 0 --> 
              <location unit="IN">
                  <x> 587.4 </x>
--- 176,180 ----
              </thruster>
          </engine>
!         <tank type="FUEL">    <!-- Tank number 0 -->
              <location unit="IN">
                  <x> 587.4 </x>
***************
*** 185,189 ****
              <contents unit="LBS"> 688.5 </contents>
          </tank>
!         <tank type="FUEL">    <!-- Tank number 1 --> 
              <location unit="IN">
                  <x> 587.4 </x>
--- 185,189 ----
              <contents unit="LBS"> 688.5 </contents>
          </tank>
!         <tank type="FUEL">    <!-- Tank number 1 -->
              <location unit="IN">
                  <x> 587.4 </x>
***************
*** 194,198 ****
              <contents unit="LBS"> 688.5 </contents>
          </tank>
!         <tank type="FUEL">    <!-- Tank number 2 --> 
              <location unit="IN">
                  <x> 587.4 </x>
--- 194,198 ----
              <contents unit="LBS"> 688.5 </contents>
          </tank>
!         <tank type="FUEL">    <!-- Tank number 2 -->
              <location unit="IN">
                  <x> 587.4 </x>
***************
*** 388,416 ****
      <aerodynamics>
  
          <axis name="DRAG">
-             <function name="aero/function/kCDge">
-                 <description>Change_in_drag_due_to_ground_effect</description>
-                 <product>
-                       <table>
-                           <independentVar>aero/h_b-mac-ft</independentVar>
-                           <tableData>
-                               0.0000	0.0350	
-                               0.1000	0.4170	
-                               0.1500	0.5390	
-                               0.2000	0.6240	
-                               0.3000	0.7510	
-                               0.4000	0.8000	
-                               0.5000	0.8960	
-                               0.6000	0.9390	
-                               0.7000	0.9740	
-                               0.8000	0.9810	
-                               0.9000	0.9900	
-                               1.0000	0.9940	
-                               1.1000	1.0000	
-                           </tableData>
-                       </table>
-                 </product>
-             </function>
-  === MOVE THE ABOVE FACTOR kCDge OUTSIDE OF AND BEFORE ANY <AXIS> DEFINITION ===
              <function name="aero/coefficient/CD0">
                  <description>Drag_at_zero_lift</description>
--- 388,440 ----
      <aerodynamics>
  
+         <function name="aero/function/kCDge">
+             <description>Change_in_drag_due_to_ground_effect</description>
+             <product>
+                   <table>
+                       <independentVar>aero/h_b-mac-ft</independentVar>
+                       <tableData>
+                           0.0000	0.0350
+                           0.1000	0.4170
+                           0.1500	0.5390
+                           0.2000	0.6240
+                           0.3000	0.7510
+                           0.4000	0.8000
+                           0.5000	0.8960
+                           0.6000	0.9390
+                           0.7000	0.9740
+                           0.8000	0.9810
+                           0.9000	0.9900
+                           1.0000	0.9940
+                           1.1000	1.0000
+                       </tableData>
+                   </table>
+             </product>
+         </function>
+ 
+         <function name="aero/function/kCLge">
+             <description>Change_in_lift_due_to_ground_effect</description>
+             <product>
+                   <table>
+                       <independentVar>aero/h_b-mac-ft</independentVar>
+                       <tableData>
+                           0.0000	1.3910
+                           0.1000	1.2350
+                           0.1500	1.1670
+                           0.2000	1.1350
+                           0.3000	1.0850
+                           0.4000	1.1020
+                           0.5000	1.0350
+                           0.6000	1.0240
+                           0.7000	1.0150
+                           0.8000	1.0110
+                           0.9000	1.0060
+                           1.0000	1.0040
+                           1.1000	1.0000
+                       </tableData>
+                   </table>
+             </product>
+         </function>
+ 
          <axis name="DRAG">
              <function name="aero/coefficient/CD0">
                  <description>Drag_at_zero_lift</description>
***************
*** 422,430 ****
                            <independentVar>aero/alpha-rad</independentVar>
                            <tableData>
!                               -1.5700	1.5000	
!                               -0.2600	0.0400	
!                               0.0000	0.0192	
!                               0.2600	0.0400	
!                               1.5700	1.5000	
                            </tableData>
                        </table>
--- 446,454 ----
                            <independentVar>aero/alpha-rad</independentVar>
                            <tableData>
!                               -1.5700	1.5000
!                               -0.2600	0.0400
!                               0.0000	0.0192
!                               0.2600	0.0400
!                               1.5700	1.5000
                            </tableData>
                        </table>
***************
*** 459,468 ****
                            <independentVar>velocities/mach-norm</independentVar>
                            <tableData>
!                               0.0000	0.0000	
!                               0.6500	0.0000	
!                               0.7700	0.0015	
!                               0.8600	0.0200	
!                               1.1000	0.0390	
!                               1.8000	0.0260	
                            </tableData>
                        </table>
--- 483,492 ----
                            <independentVar>velocities/mach-norm</independentVar>
                            <tableData>
!                               0.0000	0.0000
!                               0.6500	0.0000
!                               0.7700	0.0015
!                               0.8600	0.0200
!                               1.1000	0.0390
!                               1.8000	0.0260
                            </tableData>
                        </table>
***************
*** 504,512 ****
                            <independentVar>aero/beta-rad</independentVar>
                            <tableData>
!                               -1.5700	1.2300	
!                               -0.2600	0.0500	
!                               0.0000	0.0000	
!                               0.2600	0.0500	
!                               1.5700	1.2300	
                            </tableData>
                        </table>
--- 528,536 ----
                            <independentVar>aero/beta-rad</independentVar>
                            <tableData>
!                               -1.5700	1.2300
!                               -0.2600	0.0500
!                               0.0000	0.0000
!                               0.2600	0.0500
!                               1.5700	1.2300
                            </tableData>
                        </table>
***************
*** 537,564 ****
  
          <axis name="LIFT">
-             <function name="aero/function/kCLge">
-                 <description>Change_in_lift_due_to_ground_effect</description>
-                 <product>
-                       <table>
-                           <independentVar>aero/h_b-mac-ft</independentVar>
-                           <tableData>
-                               0.0000	1.3910	
-                               0.1000	1.2350	
-                               0.1500	1.1670	
-                               0.2000	1.1350	
-                               0.3000	1.0850	
-                               0.4000	1.1020	
-                               0.5000	1.0350	
-                               0.6000	1.0240	
-                               0.7000	1.0150	
-                               0.8000	1.0110	
-                               0.9000	1.0060	
-                               1.0000	1.0040	
-                               1.1000	1.0000	
-                           </tableData>
-                       </table>
-                 </product>
-             </function>
-  === MOVE THE ABOVE FACTOR kCLge OUTSIDE OF AND BEFORE ANY <AXIS> DEFINITION ===
              <function name="aero/coefficient/CLalpha">
                  <description>Lift_due_to_alpha</description>
--- 561,564 ----
***************
*** 570,577 ****
                            <independentVar>aero/alpha-rad</independentVar>
                            <tableData>
!                               -0.2000	-0.6800	
!                               0.0000	0.2000	
!                               0.2300	1.3000	
!                               0.6000	0.6000	
                            </tableData>
                        </table>
--- 570,577 ----
                            <independentVar>aero/alpha-rad</independentVar>
                            <tableData>
!                               -0.2000	-0.6800
!                               0.0000	0.2000
!                               0.2300	1.3000
!                               0.6000	0.6000
                            </tableData>
                        </table>
***************
*** 587,593 ****
                            <independentVar>fcs/components/flaps-control/output-norm</independentVar>
                            <tableData>
!                               0.0000	0.0000	
!                               0.3570	0.4900	
!                               1.0000	1.1800	
                            </tableData>
                        </table>
--- 587,593 ----
                            <independentVar>fcs/components/flaps-control/output-norm</independentVar>
                            <tableData>
!                               0.0000	0.0000
!                               0.3570	0.4900
!                               1.0000	1.1800
                            </tableData>
                        </table>
***************
*** 658,663 ****
                            <independentVar>velocities/mach-norm</independentVar>
                            <tableData>
!                               0.0000	0.1000	
!                               2.0000	0.0330	
                            </tableData>
                        </table>
--- 658,663 ----
                            <independentVar>velocities/mach-norm</independentVar>
                            <tableData>
!                               0.0000	0.1000
!                               2.0000	0.0330
                            </tableData>
                        </table>
***************
*** 683,704 ****
                            <independentVar>aero/h_b-mac-ft</independentVar>
                            <tableData>
!                               0.0000	1.2030	
!                               0.1000	1.1270	
!                               0.1500	1.0900	
!                               0.2000	1.0730	
!                               0.3000	1.0460	
!                               0.4000	1.0550	
!                               0.5000	1.0190	
!                               0.6000	1.0130	
!                               0.7000	1.0080	
!                               0.8000	1.0060	
!                               0.9000	1.0030	
!                               1.0000	1.0020	
!                               1.1000	1.0000	
                            </tableData>
                        </table>
                  </product>
              </function>
!  === MOVE THE ABOVE FACTOR kCmge OUTSIDE OF AND BEFORE ANY <AXIS> DEFINITION ===
              <function name="aero/coefficient/Cmo">
                  <description>Pitching_moment_at_zero_alpha</description>
--- 683,704 ----
                            <independentVar>aero/h_b-mac-ft</independentVar>
                            <tableData>
!                               0.0000	1.2030
!                               0.1000	1.1270
!                               0.1500	1.0900
!                               0.2000	1.0730
!                               0.3000	1.0460
!                               0.4000	1.0550
!                               0.5000	1.0190
!                               0.6000	1.0130
!                               0.7000	1.0080
!                               0.8000	1.0060
!                               0.9000	1.0030
!                               1.0000	1.0020
!                               1.1000	1.0000
                            </tableData>
                        </table>
                  </product>
              </function>
! 
              <function name="aero/coefficient/Cmo">
                  <description>Pitching_moment_at_zero_alpha</description>
***************
*** 731,736 ****
                            <independentVar>velocities/mach-norm</independentVar>
                            <tableData>
!                               0.0000	-1.2000	
!                               2.0000	-0.3000	
                            </tableData>
                        </table>
--- 731,736 ----
                            <independentVar>velocities/mach-norm</independentVar>
                            <tableData>
!                               0.0000	-1.2000
!                               2.0000	-0.3000
                            </tableData>
                        </table>

Update of /cvsroot/jsbsim/JSBSim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735

Modified Files:
      Tag: JSB_New_XML
	JSBSim.cbx 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: JSBSim.cbx
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/JSBSim.cbx,v
retrieving revision 1.10.2.10
retrieving revision 1.10.2.11
diff -C2 -r1.10.2.10 -r1.10.2.11
*** JSBSim.cbx	8 Mar 2005 13:46:08 -0000	1.10.2.10
--- JSBSim.cbx	16 Mar 2005 13:05:02 -0000	1.10.2.11
***************
*** 84,88 ****
    <property category="runtime.5" name="ConfigurationName" value="747"/>

    <property category="runtime.5" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>

!   <property category="runtime.5" name="native.exec.args" value="--aircraft=747 --initfile=reset00"/>

    <property category="runtime.5" name="native.target.override" value="0"/>

    <property category="team" name="ignorePath.0" value=".deps"/>

--- 84,88 ----
    <property category="runtime.5" name="ConfigurationName" value="747"/>

    <property category="runtime.5" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>

!   <property category="runtime.5" name="native.exec.args" value="--script=scripts/B747_script1.xml"/>

    <property category="runtime.5" name="native.target.override" value="0"/>

    <property category="team" name="ignorePath.0" value=".deps"/>

Update of /cvsroot/jsbsim/JSBSim/aircraft/fokker100
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735/aircraft/fokker100

Modified Files:
      Tag: JSB_New_XML
	fokker100.xml 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: fokker100.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/aircraft/fokker100/fokker100.xml,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -C2 -r1.17.2.1 -r1.17.2.2
*** fokker100.xml	27 Jan 2005 12:19:02 -0000	1.17.2.1
--- fokker100.xml	16 Mar 2005 13:05:02 -0000	1.17.2.2
***************
*** 1,5 ****
! Failed to tie property fcs/spoiler-control to object methods
  Failed to tie property output-value to object methods
! Failed to tie property output-norm to object methods
  <?xml version="1.0"?>
  <?xml-stylesheet href="JSBSim.xsl" type="application/xml"?>
--- 1,5 ----
! <!-- Failed to tie property fcs/spoiler-control to object methods
  Failed to tie property output-value to object methods
! Failed to tie property output-norm to object methods -->
  <?xml version="1.0"?>
  <?xml-stylesheet href="JSBSim.xsl" type="application/xml"?>

Update of /cvsroot/jsbsim/JSBSim/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735/scripts

Modified Files:
      Tag: JSB_New_XML
	B747_script1.xml 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: B747_script1.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/scripts/Attic/B747_script1.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** B747_script1.xml	15 Mar 2005 13:54:40 -0000	1.1.2.1
--- B747_script1.xml	16 Mar 2005 13:05:03 -0000	1.1.2.2
***************
*** 7,11 ****
    <use aircraft="747"/>
    <use initialize="reset00"/>
!   <run start="0.0" end="1700" dt="0.0083333">
  
      <when>
--- 7,11 ----
    <use aircraft="747"/>
    <use initialize="reset00"/>
!   <run start="0.0" end="700" dt="0.0083333">
  
      <when>

Update of /cvsroot/jsbsim/JSBSim/aircraft/ball
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735/aircraft/ball

Modified Files:
      Tag: JSB_New_XML
	ball.xml 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: ball.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/aircraft/ball/ball.xml,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C2 -r1.7.2.1 -r1.7.2.2
*** ball.xml	27 Jan 2005 12:18:59 -0000	1.7.2.1
--- ball.xml	16 Mar 2005 13:05:02 -0000	1.7.2.2
***************
*** 4,12 ****
  
      <fileheader>
!         <author> Author Name </author>
!         <filecreationdate> Creation Date </filecreationdate>
!         <description> Description </description>
!         <version> Version </version>
!         <reference refID="None" author="n/a" title="n/a" date="n/a"/>
      </fileheader>
  
--- 4,11 ----
  
      <fileheader>
!         <author> Jon Berndt </author>
!         <filecreationdate> 6/2004 </filecreationdate>
!         <description> Test file </description>
!         <version> Version 1.0 </version>
      </fileheader>

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735/src/models/propulsion

Modified Files:
      Tag: JSB_New_XML
	FGTurbine.cpp 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: FGTurbine.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/Attic/FGTurbine.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGTurbine.cpp	6 Mar 2005 16:54:21 -0000	1.1.2.1
--- FGTurbine.cpp	16 Mar 2005 13:05:06 -0000	1.1.2.2
***************
*** 393,396 ****
--- 393,399 ----
  bool FGTurbine::Load(FGFDMExec* exec, Element *el)
  {
+   char property_prefix[80];
+   snprintf(property_prefix, 80, "propulsion/engine[%u]/", EngineNumber);
+ 
    if (el->FindElement("milthrust"))
      MilThrust = el->FindElementValueAsNumberConvertTo("milthrust","LBS");
***************
*** 429,439 ****
      name = function_element->GetAttributeValue("name");
      if (name == "IdleThrust") {
!       IdleThrustLookup = new FGFunction(PropertyManager, function_element);
      } else if (name == "MilThrust") {
!       MilThrustLookup = new FGFunction(PropertyManager, function_element);
      } else if (name == "AugThrust") {
!       MaxThrustLookup = new FGFunction(PropertyManager, function_element);
      } else if (name == "Injection") {
!       InjectionLookup = new FGFunction(PropertyManager, function_element);
      } else {
        cerr << "Unknown function type: " << name << " in turbine definition." <<
--- 432,442 ----
      name = function_element->GetAttributeValue("name");
      if (name == "IdleThrust") {
!       IdleThrustLookup = new FGFunction(PropertyManager, function_element, property_prefix);
      } else if (name == "MilThrust") {
!       MilThrustLookup = new FGFunction(PropertyManager, function_element, property_prefix);
      } else if (name == "AugThrust") {
!       MaxThrustLookup = new FGFunction(PropertyManager, function_element, property_prefix);
      } else if (name == "Injection") {
!       InjectionLookup = new FGFunction(PropertyManager, function_element, property_prefix);
      } else {
        cerr << "Unknown function type: " << name << " in turbine definition." <<
***************
*** 486,492 ****
    char property_name[80];
  
!   snprintf(property_name, 80, "propulsion/n1[%u]", EngineNumber);
    PropertyManager->Tie( property_name, &N1);
!   snprintf(property_name, 80, "propulsion/n2[%u]", EngineNumber);
    PropertyManager->Tie( property_name, &N2);
  }
--- 489,495 ----
    char property_name[80];
  
!   snprintf(property_name, 80, "propulsion/engine[%u]/n1", EngineNumber);
    PropertyManager->Tie( property_name, &N1);
!   snprintf(property_name, 80, "propulsion/engine[%u]/n2", EngineNumber);
    PropertyManager->Tie( property_name, &N2);
  }
***************
*** 498,504 ****
    char property_name[80];
  
!   snprintf(property_name, 80, "propulsion/n1[%u]", EngineNumber);
    PropertyManager->Untie(property_name);
!   snprintf(property_name, 80, "propulsion/n2[%u]", EngineNumber);
    PropertyManager->Untie(property_name);
  }
--- 501,507 ----
    char property_name[80];
  
!   snprintf(property_name, 80, "propulsion/engine[%u]/n1", EngineNumber);
    PropertyManager->Untie(property_name);
!   snprintf(property_name, 80, "propulsion/engine[%u]/n2", EngineNumber);
    PropertyManager->Untie(property_name);
  }

Update of /cvsroot/jsbsim/JSBSim/src/models
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735/src/models

Modified Files:
      Tag: JSB_New_XML
	FGFCS.cpp FGPropulsion.cpp FGPropulsion.h 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: FGFCS.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/Attic/FGFCS.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGFCS.cpp	6 Mar 2005 16:54:19 -0000	1.1.2.1
--- FGFCS.cpp	16 Mar 2005 13:05:05 -0000	1.1.2.2
***************
*** 89,94 ****
  FGFCS::~FGFCS()
  {
!   unbind( PropertyManager->GetNode("fcs") );
!   if (PropertyManager->GetNode("ap")) unbind( PropertyManager->GetNode("ap") );
    PropertyManager->Untie( "gear/gear-cmd-norm" );
    PropertyManager->Untie( "gear/gear-pos-norm" );
--- 89,94 ----
  FGFCS::~FGFCS()
  {
!   if (PropertyManager->HasNode("fcs")) unbind( PropertyManager->GetNode("fcs") );
!   if (PropertyManager->HasNode("ap")) unbind( PropertyManager->GetNode("ap") );
    PropertyManager->Untie( "gear/gear-cmd-norm" );
    PropertyManager->Untie( "gear/gear-pos-norm" );
***************
*** 609,616 ****
  {
    int N = node->nChildren();
!   for(int i=0;i<N;i++) {
!     if(node->getChild(i)->nChildren() ) {
        unbind( (FGPropertyManager*)node->getChild(i) );
!     } else if( node->getChild(i)->isTied() ) {
        node->getChild(i)->untie();
      }
--- 609,616 ----
  {
    int N = node->nChildren();
!   for (int i=0; i<N; i++) {
!     if (node->getChild(i)->nChildren() ) {
        unbind( (FGPropertyManager*)node->getChild(i) );
!     } else if ( node->getChild(i)->isTied() ) {
        node->getChild(i)->untie();
      }

Index: FGPropulsion.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/Attic/FGPropulsion.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** FGPropulsion.cpp	15 Mar 2005 13:19:12 -0000	1.1.2.4
--- FGPropulsion.cpp	16 Mar 2005 13:05:05 -0000	1.1.2.5
***************
*** 79,84 ****
    refuel = false;
    fuel_freeze = false;
! 
!   bind();
  
    Debug(0);
--- 79,86 ----
    refuel = false;
    fuel_freeze = false;
!   HavePistonEngine =
!   HaveTurbineEngine =
!   HaveRocketEngine =
!   HaveElectricEngine = false;
  
    Debug(0);
***************
*** 296,305 ****
--- 298,311 ----
      type = document->GetName();
      if (type == "piston_engine") {
+       HavePistonEngine = true;
        Engines.push_back(new FGPiston(FDMExec, document, numEngines));
      } else if (type == "turbine_engine") {
+       HaveTurbineEngine = true;
        Engines.push_back(new FGTurbine(FDMExec, document, numEngines));
      } else if (type == "rocket_engine") {
+       HaveRocketEngine = true;
        Engines.push_back(new FGRocket(FDMExec, document, numEngines));
      } else if (type == "electric_engine") {
+       HaveElectricEngine = true;
        Engines.push_back(new FGElectric(FDMExec, document, numEngines));
      } else {
***************
*** 334,337 ****
--- 340,345 ----
    if (!ThrottleAdded) FCS->AddThrottle(); // need to have at least one throttle
  
+   bind();
+ 
    return true;
  }
***************
*** 577,586 ****
    typedef int (FGPropulsion::*iPMF)(void) const;
  
!   PropertyManager->Tie("propulsion/magneto_cmd", this, (iPMF)0, &FGPropulsion::SetMagnetos, true);
!   PropertyManager->Tie("propulsion/starter_cmd", this, (iPMF)0, &FGPropulsion::SetStarter,  true);
!   PropertyManager->Tie("propulsion/cutoff_cmd", this,  (iPMF)0, &FGPropulsion::SetCutoff,   true);
  
!   PropertyManager->Tie("propulsion/advance-ratio", this, &FGPropulsion::GetAdvanceRatio);
!   PropertyManager->Tie("propulsion/blade-angle", this, &FGPropulsion::GetBladeAngle);
  
    PropertyManager->Tie("propulsion/active_engine", this, (iPMF)&FGPropulsion::GetActiveEngine, &FGPropulsion::SetActiveEngine, true);
--- 585,598 ----
    typedef int (FGPropulsion::*iPMF)(void) const;
  
!   if (HaveTurbineEngine) {
!     PropertyManager->Tie("propulsion/starter_cmd", this, (iPMF)0, &FGPropulsion::SetStarter,  true);
!     PropertyManager->Tie("propulsion/cutoff_cmd", this,  (iPMF)0, &FGPropulsion::SetCutoff,   true);
!   }
  
!   if (HavePistonEngine) {
!     PropertyManager->Tie("propulsion/magneto_cmd", this, (iPMF)0, &FGPropulsion::SetMagnetos, true);
!     PropertyManager->Tie("propulsion/advance-ratio", this, &FGPropulsion::GetAdvanceRatio);
!     PropertyManager->Tie("propulsion/blade-angle", this, &FGPropulsion::GetBladeAngle);
!   }
  
    PropertyManager->Tie("propulsion/active_engine", this, (iPMF)&FGPropulsion::GetActiveEngine, &FGPropulsion::SetActiveEngine, true);
***************
*** 591,599 ****
  void FGPropulsion::unbind(void)
  {
!   PropertyManager->Untie("propulsion/magneto_cmd");
!   PropertyManager->Untie("propulsion/starter_cmd");
!   PropertyManager->Untie("propulsion/cutoff_cmd");
!   PropertyManager->Untie("propulsion/advance-ratio");
!   PropertyManager->Untie("propulsion/blade-angle");
    PropertyManager->Untie("propulsion/active_engine");
  }
--- 603,616 ----
  void FGPropulsion::unbind(void)
  {
!   CurrentEngine = 0;
!   if (HaveTurbineEngine) {
!     PropertyManager->Untie("propulsion/starter_cmd");
!     PropertyManager->Untie("propulsion/cutoff_cmd");
!   }
!   if (HavePistonEngine) {
!     PropertyManager->Untie("propulsion/magneto_cmd");
!     PropertyManager->Untie("propulsion/advance-ratio");
!     PropertyManager->Untie("propulsion/blade-angle");
!   }
    PropertyManager->Untie("propulsion/active_engine");
  }

Index: FGPropulsion.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/Attic/FGPropulsion.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** FGPropulsion.h	11 Mar 2005 14:24:59 -0000	1.1.2.2
--- FGPropulsion.h	16 Mar 2005 13:05:05 -0000	1.1.2.3
***************
*** 205,208 ****
--- 205,212 ----
    bool refuel;
    bool fuel_freeze;
+   bool HavePistonEngine;
+   bool HaveTurbineEngine;
+   bool HaveRocketEngine;
+   bool HaveElectricEngine;
  
    void Debug(int from);

Update of /cvsroot/jsbsim/JSBSim/src/input_output
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735/src/input_output

Modified Files:
      Tag: JSB_New_XML
	FGPropertyManager.cpp FGPropertyManager.h 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: FGPropertyManager.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/input_output/Attic/FGPropertyManager.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGPropertyManager.cpp	6 Mar 2005 16:54:18 -0000	1.1.2.1
--- FGPropertyManager.cpp	16 Mar 2005 13:05:04 -0000	1.1.2.2
***************
*** 77,81 ****
  {
    SGPropertyNode* node=this->getNode(path.c_str(), create);
!   if(node == 0)
      cout << "FGPropertyManager::GetNode() No node found for "
           << path << endl;
--- 77,81 ----
  {
    SGPropertyNode* node=this->getNode(path.c_str(), create);
!   if (node == 0 && !suppress_warning)
      cout << "FGPropertyManager::GetNode() No node found for "
           << path << endl;
***************
*** 96,100 ****
  bool FGPropertyManager::HasNode (const string &path)
  {
!   return (GetNode(path, false) != 0);
  }
  
--- 96,104 ----
  bool FGPropertyManager::HasNode (const string &path)
  {
!   // Checking if a node exists shouldn't write a warning if it doesn't exist
!   suppress_warning = true;
!   bool has_node = (GetNode(path, false) != 0);
!   suppress_warning = false;
!   return has_node;
  }
  

Index: FGPropertyManager.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/input_output/Attic/FGPropertyManager.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGPropertyManager.h	6 Mar 2005 16:54:18 -0000	1.1.2.1
--- FGPropertyManager.h	16 Mar 2005 13:05:04 -0000	1.1.2.2
***************
*** 70,76 ****
  
  class FGPropertyManager : public SGPropertyNode {
    public:
      /// Constructor
!     FGPropertyManager(void) {}
      /// Destructor
      ~FGPropertyManager(void) {}
--- 70,78 ----
  
  class FGPropertyManager : public SGPropertyNode {
+   private:
+     bool suppress_warning;
    public:
      /// Constructor
!     FGPropertyManager(void) {suppress_warning = false;}
      /// Destructor
      ~FGPropertyManager(void) {}

Update of /cvsroot/jsbsim/JSBSim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7735/src

Modified Files:
      Tag: JSB_New_XML
	FGFDMExec.cpp 
Log Message:
Numerous propulsion system tweaks: moved binding of propulsion system properties to after Load instead of at construction, because at that time the system is determined; only bind() needed properties; fixed various superfluous error messages

Index: FGFDMExec.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/Attic/FGFDMExec.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGFDMExec.cpp	6 Mar 2005 16:54:17 -0000	1.1.2.1
--- FGFDMExec.cpp	16 Mar 2005 13:05:04 -0000	1.1.2.2
***************
*** 164,167 ****
--- 164,169 ----
  FGFDMExec::~FGFDMExec()
  {
+   instance->Untie("simulation/do_trim");
+ 
    try {
      DeAllocate();
***************
*** 171,175 ****
    }
  
-   instance->Untie("simulation/do_trim");
    for (unsigned int i=1; i<SlaveFDMList.size(); i++) delete SlaveFDMList[i]->exec;
    SlaveFDMList.clear();
--- 173,176 ----

Update of /cvsroot/jsbsim/JSBSim/aircraft/747
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25115

Added Files:
      Tag: JSB_New_XML
	747.xml 
Log Message:
Add 747.xml file - 747-100.xml is old format

--- NEW FILE ---
<?xml version="1.0"?>
<?xml-stylesheet href="JSBSim.xsl" type="application/xml"?>
<fdm_config name="1970 Boeing 747 100B" version="2.0" release="BETA">

    <fileheader>
        <author>Darren Jones</author>
        <email>darrenpauljones@...>
        <organization>Department of Mechanical Engineering,
                      University of Bath,
                      UK                                    </organization>
        <filecreationdate>2003</filecreationdate>
        <description> Models a 1970 Boeing 747-100B with Pratt and Whitney JT9D-3
                      turbofan engines                      </description>
        <version>1.0</version>
        <note>Since a moving stabilizer property is not available the
              speedbrake property is being used to emulate the Boeing
              747 trimmable horizontal stabilizer.</note>
        <note>Aircraft origin for measurements is the nose.</note>
        <limitation>Aerodynamic effects of undercarriage not modelled</limitation>
[...1159 lines suppressed...]
                </product>
            </function>
        </axis>
    </aerodynamics>
    <output name="JSBout747.csv" type="CSV" rate="5">
        <simulation> OFF </simulation>
        <atmosphere> OFF </atmosphere>
        <massprops> ON </massprops>
        <aerosurfaces> OFF </aerosurfaces>
        <rates> ON </rates>
        <velocities> ON </velocities>
        <forces> ON </forces>
        <moments> ON </moments>
        <position> ON </position>
        <coefficients> OFF </coefficients>
        <ground_reactions> ON </ground_reactions>
        <fcs> OFF </fcs>
        <propulsion> OFF </propulsion>
    </output>
</fdm_config>

Update of /cvsroot/jsbsim/JSBSim/aircraft/747
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373

Added Files:
      Tag: JSB_New_XML
	reset00.xml 
Log Message:
New reset fiel for 747

--- NEW FILE ---
<?xml version="1.0"?>
<initialize name="reset00">
  <!--
    This file sets up the aircraft to start off
    from the runway in preparation for takeoff.
  -->
  <ubody unit="FT/SEC">    0.0  </ubody>
  <vbody unit="FT/SEC">    0.0  </vbody>
  <wbody unit="FT/SEC">    0.0  </wbody>
  <latitude unit="DEG">   47.0  </latitude>
  <longitude unit="DEG"> 122.0  </longitude>
  <phi unit="DEG">         0.0  </phi>
  <theta unit="DEG">       0.0  </theta>
  <psi unit="DEG">       200.0  </psi>
  <altitude unit="FT">    15.3  </altitude>
</initialize>

Update of /cvsroot/jsbsim/JSBSim/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4515

Added Files:
      Tag: JSB_New_XML
	B747_script1.xml 
Log Message:
New script file for 747

--- NEW FILE ---
<?xml version="1.0"?>
<runscript name="B747 takeoff run">
  <!--
    This run is for testing the 747 model
  -->

  <use aircraft="747"/>
  <use initialize="reset00"/>
  <run start="0.0" end="1700" dt="0.0083333">

    <when>
      <parameter name="sim-time-sec" comparison="ge" value="0.25"/>
      <set name="propulsion/starter_cmd" value="1" tc ="0.05"/>
    </when>
    <when>
      <parameter name="sim-time-sec" comparison="ge" value="5.0"/>
      <set name="propulsion/cutoff_cmd" value="0" tc ="0.05"/>
    </when>
    <when>
      <parameter name="sim-time-sec" comparison="ge" value="6.0"/>
      <set name="fcs/throttle-cmd-norm[0]" value="1.0" action="FG_RAMP" tc ="0.5"/>
    </when>
    <when>
      <parameter name="sim-time-sec" comparison="ge" value="6.0"/>
      <set name="fcs/throttle-cmd-norm[1]" value="1.0" action="FG_RAMP" tc ="0.5"/>
    </when>
    <when>
      <parameter name="sim-time-sec" comparison="ge" value="6.0"/>
      <set name="fcs/throttle-cmd-norm[2]" value="1.0" action="FG_RAMP" tc ="0.5"/>
    </when>
    <when>
      <parameter name="sim-time-sec" comparison="ge" value="6.0"/>
      <set name="fcs/throttle-cmd-norm[3]" value="1.0" action="FG_RAMP" tc ="0.5"/>
    </when>
<!--
    <when>
      <parameter name="sim-time-sec" comparison="ge" value="0.10"/>
      <parameter name="sim-time-sec" comparison="le" value="0.11"/>
      <set name="simulation/do_trim" value="2"/>
    </when>

    <when>
      <parameter name="sim-time-sec" comparison="ge" value="0.25"/>
      <parameter name="sim-time-sec" comparison="le" value="1.00"/>
      <set name="fcs/throttle-cmd-norm" value="1.0" action="FG_RAMP" tc ="0.05"/>
      <set name="fcs/mixture-cmd-norm" value="0.87" action="FG_RAMP" tc ="0.05"/>
      <set name="propulsion/magneto_cmd" value="3"/>
      <set name="propulsion/starter_cmd" value="1"/>
    </when>

    <when>
      <parameter name="position/h-agl-ft" comparison="ge" value="5"/>
      <set name="ap/heading_setpoint" value="200"/>
      <set name="ap/attitude_hold" value="0"/>
      <set name="ap/heading_hold" value="1"/>
    </when>

    <when>
      <parameter name="aero/qbar-psf" comparison="ge" value="4.0"/>
      <set name="ap/altitude_setpoint" value="100.0" action="FG_EXP" tc ="2.0"/>
      <set name="ap/altitude_hold" value="1"/>
      <set name="fcs/flap-cmd-norm" value=".33"/>
    </when>

    <when>
      <parameter name="aero/qbar-psf" comparison="ge" value="5.0"/>
      <set name="ap/altitude_setpoint" value="8000.0" action="FG_EXP" tc ="3.0"/>
      <set name="ap/altitude_hold" value="1"/>
    </when>

    <when>
      <parameter name="position/h-agl-ft" comparison="ge" value="100.0"/>
      <set name="fcs/mixture-cmd-norm" value="0.69" action="FG_EXP" tc ="400.0"/>
      <set name="fcs/flap-cmd-norm" value="0"/>
    </when>
-->
  </run>

</runscript>

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv804

Modified Files:
      Tag: JSB_New_XML
	FGTank.cpp 
Log Message:
Fixed uninitialized terms in tank

Index: FGTank.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/Attic/FGTank.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** FGTank.cpp	6 Mar 2005 16:54:21 -0000	1.1.2.1
--- FGTank.cpp	15 Mar 2005 13:39:22 -0000	1.1.2.2
***************
*** 61,64 ****
--- 61,65 ----
    Temperature = -9999.0;
    Auxiliary = exec->GetAuxiliary();
+   Radius = Capacity = Contents = 0.0;
  
    type = el->GetAttributeValue("type");
***************
*** 71,77 ****
    else          cerr << "No location found for this tank." << endl;
  
!   Radius = el->FindElementValueAsNumberConvertTo("radius", "IN");
!   Capacity = el->FindElementValueAsNumberConvertTo("capacity", "LBS");
!   Contents = el->FindElementValueAsNumberConvertTo("contents", "LBS");
    if (el->FindElement("temperature"))
      Temperature = el->FindElementValueAsNumber("temperature");
--- 72,81 ----
    else          cerr << "No location found for this tank." << endl;
  
!   if (el->FindElement("radius"))
!     Radius = el->FindElementValueAsNumberConvertTo("radius", "IN");
!   if (el->FindElement("capacity"))
!     Capacity = el->FindElementValueAsNumberConvertTo("capacity", "LBS");
!   if (el->FindElement("contents"))
!     Contents = el->FindElementValueAsNumberConvertTo("contents", "LBS");
    if (el->FindElement("temperature"))
      Temperature = el->FindElementValueAsNumber("temperature");

Update of /cvsroot/jsbsim/JSBSim/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31248

Modified Files:
      Tag: JSB_New_XML
	P51prop.xml prop30FP2B.xml propC10v.xml propC6v.xml 
	propC8v.xml prop_75in2f.xml prop_81in2v.xml prop_generic2f.xml 
	t56_prop.xml 
Log Message:
Fixed XML line in prop files

Index: P51prop.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/P51prop.xml,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -r1.1.4.2 -r1.1.4.3
*** P51prop.xml	11 Mar 2005 22:27:25 -0000	1.1.4.2
--- P51prop.xml	15 Mar 2005 13:30:27 -0000	1.1.4.3
***************
*** 1,3 ****
! <xml version="1.0"?>
  <!-- Generated by Aero-Matic v 0.8
  
--- 1,3 ----
! <?xml version="1.0"?>
  <!-- Generated by Aero-Matic v 0.8
  

Index: prop30FP2B.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/prop30FP2B.xml,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C2 -r1.5.4.1 -r1.5.4.2
*** prop30FP2B.xml	11 Mar 2005 22:27:25 -0000	1.5.4.1
--- prop30FP2B.xml	15 Mar 2005 13:30:27 -0000	1.5.4.2
***************
*** 1,3 ****
! <xml version="1.0"?>
  
  <propeller name="30 Degree Fixed Pitch 2 Blade 5868-9 Clark Y">
--- 1,3 ----
! <?xml version="1.0"?>
  
  <propeller name="30 Degree Fixed Pitch 2 Blade 5868-9 Clark Y">

Index: propC10v.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/propC10v.xml,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -C2 -r1.5.4.2 -r1.5.4.3
*** propC10v.xml	11 Mar 2005 22:27:25 -0000	1.5.4.2
--- propC10v.xml	15 Mar 2005 13:30:27 -0000	1.5.4.3
***************
*** 1,3 ****
! <xml version="1.0"?>
  
  <propeller name="Clark Y 0.08 t/c ratio, variable pitch">
--- 1,3 ----
! <?xml version="1.0"?>
  
  <propeller name="Clark Y 0.08 t/c ratio, variable pitch">

Index: propC6v.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/propC6v.xml,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -r1.4.4.1 -r1.4.4.2
*** propC6v.xml	11 Mar 2005 22:27:25 -0000	1.4.4.1
--- propC6v.xml	15 Mar 2005 13:30:27 -0000	1.4.4.2
***************
*** 1,3 ****
! <xml version="1.0"?>
  
  <propeller name="Clark Y 0.06 thickness/chord ratio variable pitch">
--- 1,3 ----
! <?xml version="1.0"?>
  
  <propeller name="Clark Y 0.06 thickness/chord ratio variable pitch">

Index: propC8v.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/propC8v.xml,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -r1.4.4.1 -r1.4.4.2
*** propC8v.xml	11 Mar 2005 22:27:26 -0000	1.4.4.1
--- propC8v.xml	15 Mar 2005 13:30:27 -0000	1.4.4.2
***************
*** 1,3 ****
! <xml version="1.0"?>
  
  <propeller name="Clark Y 0.08 thickness/chord ratio variable pitch">
--- 1,3 ----
! <?xml version="1.0"?>
  
  <propeller name="Clark Y 0.08 thickness/chord ratio variable pitch">

Index: prop_75in2f.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/prop_75in2f.xml,v
retrieving revision 1.12.4.1
retrieving revision 1.12.4.2
diff -C2 -r1.12.4.1 -r1.12.4.2
*** prop_75in2f.xml	11 Mar 2005 22:27:25 -0000	1.12.4.1
--- prop_75in2f.xml	15 Mar 2005 13:30:27 -0000	1.12.4.2
***************
*** 1,3 ****
! <xml version="1.0"?>
  
  <propeller name="Fixed-Pitch 75-inch Two-Blade Propeller">
--- 1,3 ----
! <?xml version="1.0"?>
  
  <propeller name="Fixed-Pitch 75-inch Two-Blade Propeller">

Index: prop_81in2v.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/prop_81in2v.xml,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -r1.2.4.1 -r1.2.4.2
*** prop_81in2v.xml	11 Mar 2005 22:27:25 -0000	1.2.4.1
--- prop_81in2v.xml	15 Mar 2005 13:30:27 -0000	1.2.4.2
***************
*** 1,3 ****
! <xml version="1.0"?>
  
  <propeller name="81 inch, 2 blade variable-pitch propeller">
--- 1,3 ----
! <?xml version="1.0"?>
  
  <propeller name="81 inch, 2 blade variable-pitch propeller">

Index: prop_generic2f.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/prop_generic2f.xml,v
retrieving revision 1.18.4.1
retrieving revision 1.18.4.2
diff -C2 -r1.18.4.1 -r1.18.4.2
*** prop_generic2f.xml	11 Mar 2005 22:27:26 -0000	1.18.4.1
--- prop_generic2f.xml	15 Mar 2005 13:30:27 -0000	1.18.4.2
***************
*** 1,3 ****
! <xml version="1.0"?>
  
  <propeller name="generic2f">
--- 1,3 ----
! <?xml version="1.0"?>
  
  <propeller name="generic2f">

Index: t56_prop.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/engine/t56_prop.xml,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** t56_prop.xml	11 Mar 2005 22:27:26 -0000	1.4.2.1
--- t56_prop.xml	15 Mar 2005 13:30:27 -0000	1.4.2.2
***************
*** 1,3 ****
! <xml version="1.0"?>
  <!--
    Converted from a file generated by Aero-Matic v 0.7
--- 1,3 ----
! <?xml version="1.0"?>
  <!--
    Converted from a file generated by Aero-Matic v 0.7

Update of /cvsroot/jsbsim/JSBSim/src/models
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27441

Modified Files:
      Tag: JSB_New_XML
	FGPropulsion.cpp 
Log Message:
Fixed multi-engine

Index: FGPropulsion.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/Attic/FGPropulsion.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** FGPropulsion.cpp	12 Mar 2005 20:50:07 -0000	1.1.2.3
--- FGPropulsion.cpp	15 Mar 2005 13:19:12 -0000	1.1.2.4
***************
*** 268,272 ****
    bool ThrottleAdded = false;
    Element* document;
!   FGXMLParse engine_file_parser;
    ifstream* engine_file;
  
--- 268,272 ----
    bool ThrottleAdded = false;
    Element* document;
!   FGXMLParse *engine_file_parser;
    ifstream* engine_file;
  
***************
*** 288,294 ****
      }
  
!     readXML(*engine_file, engine_file_parser);
      delete engine_file;
!     document = engine_file_parser.GetDocument(); // document holds the engine description
      document->SetParent(engine_element);
  
--- 288,295 ----
      }
  
!     engine_file_parser = new FGXMLParse();
!     readXML(*engine_file, *engine_file_parser);
      delete engine_file;
!     document = engine_file_parser->GetDocument(); // document holds the engine description
      document->SetParent(engine_element);
  
***************
*** 312,316 ****
      numEngines++;
  
!     engine_element = engine_element->FindNextElement("engine");
    }
  
--- 313,318 ----
      numEngines++;
  
!     engine_element = el->FindNextElement("engine");
!     delete engine_file_parser;
    }

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20906

Modified Files:
      Tag: JSB_New_XML
	FGPropeller.cpp 
Log Message:
Reinstalled David C.'s blade-angle changes

Index: FGPropeller.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/Attic/FGPropeller.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** FGPropeller.cpp	12 Mar 2005 22:20:28 -0000	1.1.2.3
--- FGPropeller.cpp	12 Mar 2005 23:56:54 -0000	1.1.2.4
***************
*** 116,119 ****
--- 116,121 ----
    snprintf(property_name, 80, "propulsion/engine[%d]/advance-ratio", EngineNum);
    PropertyManager->Tie( property_name, &J );
+   snprintf(property_name, 80, "propulsion/engine[%d]/blade-angle", EngineNum);
+   PropertyManager->Tie( property_name, &Pitch );
  
  //  char property_name[80];
***************
*** 134,137 ****
--- 136,141 ----
    snprintf(property_name, 80, "propulsion/engine[%d]/advance-ratio", EngineNum);
    PropertyManager->Untie( property_name );
+   snprintf(property_name, 80, "propulsion/engine[%d]/blade-angle", EngineNum);
+   PropertyManager->Untie( property_name );
  
  //  char property_name[80];

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29902

Modified Files:
      Tag: JSB_New_XML
	FGPropeller.cpp 
Log Message:
REmoved comment

Index: FGPropeller.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/Attic/FGPropeller.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** FGPropeller.cpp	11 Mar 2005 04:04:18 -0000	1.1.2.2
--- FGPropeller.cpp	12 Mar 2005 22:20:28 -0000	1.1.2.3
***************
*** 116,121 ****
    snprintf(property_name, 80, "propulsion/engine[%d]/advance-ratio", EngineNum);
    PropertyManager->Tie( property_name, &J );
-   snprintf(property_name, 80, "propulsion/engine[%d]/blade-angle", EngineNum);
-   PropertyManager->Tie( property_name, &Pitch );
  
  //  char property_name[80];
--- 116,119 ----
***************
*** 134,140 ****
  
    char property_name[80];
!   snprintf(property_name, 80, "propulsion/engine[%d]/advance-ratio", EngineNum); // TODO: what if there are multiple engines!?
!   PropertyManager->Untie( property_name );
!   snprintf(property_name, 80, "propulsion/engine[%d]/blade-angle", EngineNum);
    PropertyManager->Untie( property_name );
  
--- 132,136 ----
  
    char property_name[80];
!   snprintf(property_name, 80, "propulsion/engine[%d]/advance-ratio", EngineNum);
    PropertyManager->Untie( property_name );

Update of /cvsroot/jsbsim/JSBSim/src/models
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8620

Modified Files:
      Tag: JSB_New_XML
	FGPropulsion.cpp 
Log Message:
Removed extraneous and unneccesary comment

Index: FGPropulsion.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/Attic/FGPropulsion.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** FGPropulsion.cpp	11 Mar 2005 14:25:00 -0000	1.1.2.2
--- FGPropulsion.cpp	12 Mar 2005 20:50:07 -0000	1.1.2.3
***************
*** 133,137 ****
  // the advance ratio, "propulsion/engine[n]/advance-ratio". This pattern allows
  // property specification of advance-ratio in a generic sense, such as in a
! // propeler config file, where the engine-specific value cannot be provided.
  
  double FGPropulsion::GetAdvanceRatio(void) const
--- 133,137 ----
  // the advance ratio, "propulsion/engine[n]/advance-ratio". This pattern allows
  // property specification of advance-ratio in a generic sense, such as in a
! // propeller config file, where the engine-specific value cannot be provided.
  
  double FGPropulsion::GetAdvanceRatio(void) const

Update of /cvsroot/jsbsim/JSBSim/aircraft/f104
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2810/f104

Modified Files:
      Tag: JSB_New_XML
	f104.xml 
Log Message:
Restored version 1.14.2.1 of 27 Jan 05.

Index: f104.xml
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/aircraft/f104/f104.xml,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -C2 -r1.14.2.3 -r1.14.2.4
*** f104.xml	12 Mar 2005 13:40:48 -0000	1.14.2.3
--- f104.xml	12 Mar 2005 16:36:29 -0000	1.14.2.4
***************
*** 1,528 ****
! <FDM_CONFIG NAME="F-104" VERSION="1.65">
  
! <!--                                                                                   - -
!   File:      f104.xml
!   Author:    Erik Hofman
!   CVS Version: $Id$
! 
!   Function: Models an F-104G "Starfighter"
!   Status:   Early production
! 
[...1392 lines suppressed...]
!             </function>
!             <function name="aero/coefficient/CnDr">
!                 <description>Yaw_moment_due_to_rudder</description>
!                 <product>
!                     <property>aero/qbar-psf</property>
!                     <property>metrics/Sw-sqft</property>
!                     <property>metrics/bw-ft</property>
!                     <property>fcs/rudder-pos-rad</property>
!                       <table>
!                           <independentVar>velocities/mach-norm</independentVar>
!                           <tableData>
!                               0.2570	-0.1645	
!                               1.8000	-0.0435	
!                           </tableData>
!                       </table>
!                 </product>
!             </function>
!         </axis>
!     </aerodynamics>
! </fdm_config>