[Jsbsim-cvslogs] CVS: JSBSim/utils/aeromatic++/Systems Propulsion.cpp, 1.21, 1.22 Thruster.cpp, 1.9, 1.10

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

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

Modified Files:
	Propulsion.cpp Thruster.cpp 
Log Message:

Try to explain why certain information is asked and how important it is for the configuration
Set 'create subdirectory' to true by default now that System files also can write to it's own files
Test for _overwrite when generating System files too



Index: Propulsion.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Propulsion.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** Propulsion.cpp	26 Oct 2015 18:05:13 -0000	1.21
--- Propulsion.cpp	27 Oct 2015 10:03:05 -0000	1.22
***************
*** 43,49 ****
  
      strCopy(_engine_name, "my_engine");
!     _inputs.push_back(new Param("Engine name", 0, _engine_name));
  
!     _inputs.push_back(new Param("Number of engines", 0, _aircraft->_no_engines));
      Param *layout = new Param("Engine layout", 0, _layout);
      _inputs.push_back(layout);
--- 43,49 ----
  
      strCopy(_engine_name, "my_engine");
!     _inputs.push_back(new Param("Engine name", "The engine name is used for the engine configuration file name", _engine_name));
  
!     _inputs.push_back(new Param("Number of engines", "Engines are distributed evenly across the wing span", _aircraft->_no_engines));
      Param *layout = new Param("Engine layout", 0, _layout);
      _inputs.push_back(layout);
***************
*** 415,420 ****
  {
      _description.push_back("Piston Engine");
!     _inputs.push_back(new Param("Engine power", 0, _power, _aircraft->_metric, POWER));
!     _inputs.push_back(new Param("Maximum engine rpm", 0, _max_rpm));
      _thruster = new Propeller(this);
  }
--- 415,420 ----
  {
      _description.push_back("Piston Engine");
!     _inputs.push_back(new Param("Engine power", "Providing fairly acurate engine power is critical for a good configuration", _power, _aircraft->_metric, POWER));
!    _inputs.push_back(new Param("Maximum engine rpm", "The maximum rpm is used to calculate the propeller power and thrust tables", _max_rpm));
      _thruster = new Propeller(this);
  }
***************
*** 484,492 ****
  {
      _description.push_back("Turbine Engine");
!     _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("Overall pressure ratio", Aeromatic::_estimate, _oapr));
!     _inputs.push_back(new Param("Augmented?", 0, _augmented));
!     _inputs.push_back(new Param("Water injection?", 0, _injected));
      _thruster = new Direct(this);
  }
--- 484,492 ----
  {
      _description.push_back("Turbine Engine");
!     _inputs.push_back(new Param("Engine thrust", "Providing fairly acurate engine thrust is critical for a good configuration", _power, _aircraft->_metric, THRUST));
!     _inputs.push_back(new Param("Bypass ratio", "The bypass ratio is mainly used for calculating fuel consumption", _bypass_ratio));
!     _inputs.push_back(new Param("Overall pressure ratio", "Overall pressure ratio is used to finetune the estimated fuel consumption", _oapr));
!     _inputs.push_back(new Param("Augmented?", "Does the engine have afterburner capability?", _augmented));
!     _inputs.push_back(new Param("Water injection?", "Does the engine have ater injection boost?", _injected));
      _thruster = new Direct(this);
  }
***************
*** 639,646 ****
  {
      _description.push_back("Turboprop Engine");
!     _inputs.push_back(new Param("Engine power", 0, _power, _aircraft->_metric, POWER));
!     _inputs.push_back(new Param("Maximum engine rpm", 0, _max_rpm));
!     _inputs.push_back(new Param("Overall pressure ratio", Aeromatic::_estimate, _oapr));
!     _inputs.push_back(new Param("Turbine inlet temperature", "in degrees Celcius", _itt));
      _thruster = new Propeller(this);
  }
--- 639,646 ----
  {
      _description.push_back("Turboprop Engine");
!     _inputs.push_back(new Param("Engine power", "Providing fairly acurate engine power is critical for a good configuration", _power, _aircraft->_metric, POWER));
!     _inputs.push_back(new Param("Maximum engine rpm", "The maximum rpm is used to calculate the propeller power and thrust tables", _max_rpm));
!     _inputs.push_back(new Param("Overall pressure ratio", "Overall pressure ratio is used to finetune the estimated fuel consumption", _oapr));
!     _inputs.push_back(new Param("Turbine inlet temperature", "Turbine inlet temperature is used to finetune the engine configuration", _itt));
      _thruster = new Propeller(this);
  }
***************
*** 787,791 ****
  {
      _description.push_back("Rocket Engine");
!     _inputs.push_back(new Param("Engine thrust", 0, _power, _aircraft->_metric, THRUST));
      _thruster = new Nozzle(this);
  }
--- 787,791 ----
  {
      _description.push_back("Rocket Engine");
!     _inputs.push_back(new Param("Engine thrust", "Providing fairly acurate engine thrust is critical for a good configuration", _power, _aircraft->_metric, THRUST));
      _thruster = new Nozzle(this);
  }
***************
*** 827,832 ****
  {
      _description.push_back("Electric Engine");
!     _inputs.push_back(new Param("Engine power", 0, _power, _aircraft->_metric, POWER));
!     _inputs.push_back(new Param("Maximum engine rpm", 0, _max_rpm));
      _thruster = new Propeller(this);
  }
--- 827,832 ----
  {
      _description.push_back("Electric Engine");
!     _inputs.push_back(new Param("Engine power", "Providing fairly acurate engine power is critical for a good configuration", _power, _aircraft->_metric, POWER));
!     _inputs.push_back(new Param("Maximum engine rpm", "The maximum rpm is used to calculate the propeller power and thrust tables", _max_rpm));
      _thruster = new Propeller(this);
  }

Index: Thruster.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Thruster.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Thruster.cpp	25 Oct 2015 10:07:50 -0000	1.9
--- Thruster.cpp	27 Oct 2015 10:03:05 -0000	1.10
***************
*** 75,80 ****
      strCopy(_thruster_name, "my_nozzle");
  
!     _inputs.push_back(new Param("Nozzle name", 0, _thruster_name));
!     _inputs.push_back(new Param("Nozzle diameter", 0, _diameter, _engine->_aircraft->_metric, LENGTH));
  }
  
--- 75,80 ----
      strCopy(_thruster_name, "my_nozzle");
  
!     _inputs.push_back(new Param("Nozzle name", "The name is used for the configuration file name", _thruster_name));
!     _inputs.push_back(new Param("Nozzle diameter", "Nozzle diameter influences the nozzle area and exit pressure", _diameter, _engine->_aircraft->_metric, LENGTH));
  }
  
***************
*** 108,114 ****
      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));
!     _inputs.push_back(new Param("Is the propeller fixed pitch?", "Fixed pitch propellers do not have any mechanics to alter the pitch setting", _fixed_pitch));
  }
  
--- 108,114 ----
      strCopy(_thruster_name, "my_propeller");
  
!     _inputs.push_back(new Param("Thruster name", "The name is used for the configuration file name", _thruster_name));
!     _inputs.push_back(new Param("Propeller diameter", "Propeller diameter is critical for a good thrust estimation", _diameter, _engine->_aircraft->_metric, LENGTH));
!     _inputs.push_back(new Param("Is the propeller fixed pitch?", "Fixed pitch propellers do not have any mechanics to alter the pitch angle", _fixed_pitch));
  }
  
***************
*** 164,168 ****
  std::string Propeller::thruster()
  {
!     PistonEngine *engine = (PistonEngine*)_engine;
      std::stringstream file;
  
--- 164,168 ----
  std::string Propeller::thruster()
  {
! //  PistonEngine *engine = (PistonEngine*)_engine;
      std::stringstream file;