[Jsbsim-cvslogs] CVS: JSBSim/utils/aeromatic++/Systems Propulsion.cpp, 1.17, 1.18 Thruster.cpp, 1.8, 1.9

[Erik H. <eh...@us...>]

Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7274/Systems

Modified Files:
	Propulsion.cpp Thruster.cpp 
Log Message:
slightly more accurate computation of tsfc
Get rid of snprintf
Proper getenv for Windows
Fix Windows(MingW) build



Index: Propulsion.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Propulsion.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** Propulsion.cpp	24 Oct 2015 22:04:59 -0000	1.17
--- Propulsion.cpp	25 Oct 2015 10:07:50 -0000	1.18
***************
*** 42,46 ****
      _inputs.push_back(new Param(_description[0].c_str(), _supported, _enabled));
  
!     snprintf(_engine_name, PARAM_MAX_STRING, "my_engine");
      _inputs.push_back(new Param("Engine name", 0, _engine_name));
  
--- 42,46 ----
      _inputs.push_back(new Param(_description[0].c_str(), _supported, _enabled));
  
!     strCopy(_engine_name, "my_engine");
      _inputs.push_back(new Param("Engine name", 0, _engine_name));
  
***************
*** 483,486 ****
--- 483,488 ----
      _inputs.push_back(new Param("Engine Thrust", 0, _power, _aircraft->_metric, THRUST));
      _inputs.push_back(new Param("Bypass ratio", 0, _bypass_ratio));
+     _inputs.push_back(new Param("Augmented?", 0, _augmented));
+     _inputs.push_back(new Param("water injection?", 0, _injected));   
      _thruster = new Direct(this);
  }
***************
*** 497,503 ****
  
      // Figure 3.10
!     float tsfc = 1.4f - 0.109f * (4.6 + logf(_bypass_ratio));
  
!     file.precision(1);
      file.flags(std::ios::right);
      file << std::fixed << std::showpoint;
--- 499,505 ----
  
      // Figure 3.10
!     float tsfc = 1.4f - 0.109f * (5.6f + logf(_bypass_ratio));
  
!     file.precision(2);
      file.flags(std::ios::right);
      file << std::fixed << std::showpoint;

Index: Thruster.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Thruster.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Thruster.cpp	23 Oct 2015 12:33:29 -0000	1.8
--- Thruster.cpp	25 Oct 2015 10:07:50 -0000	1.9
***************
*** 50,54 ****
  Direct::Direct(Engine *p) : Thruster(p)
  {
!     snprintf(_thruster_name, PARAM_MAX_STRING, "direct");
  }
  
--- 50,54 ----
  Direct::Direct(Engine *p) : Thruster(p)
  {
!     strCopy(_thruster_name, "direct");
  }
  
***************
*** 73,77 ****
      _diameter(3.25f)
  {
!     snprintf(_thruster_name, PARAM_MAX_STRING, "my_nozzle");
  
      _inputs.push_back(new Param("Nozzle name", 0, _thruster_name));
--- 73,77 ----
      _diameter(3.25f)
  {
!     strCopy(_thruster_name, "my_nozzle");
  
      _inputs.push_back(new Param("Nozzle name", 0, _thruster_name));
***************
*** 106,110 ****
      _diameter(8)
  {
!     snprintf(_thruster_name, PARAM_MAX_STRING, "my_propeller");
      _inputs.push_back(new Param("Thruster name", 0, _thruster_name));
      _inputs.push_back(new Param("Propeller diameter", 0, _diameter, _engine->_aircraft->_metric, LENGTH));
--- 106,111 ----
      _diameter(8)
  {
!     strCopy(_thruster_name, "my_propeller");
! 
      _inputs.push_back(new Param("Thruster name", 0, _thruster_name));
      _inputs.push_back(new Param("Propeller diameter", 0, _diameter, _engine->_aircraft->_metric, LENGTH));