[Jsbsim-cvslogs] CVS: JSBSim/utils/aeromatic++/Systems Controls.cpp, 1.41, 1.42

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

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

Modified Files:
	Controls.cpp 
Log Message:
Split Drag_basif into Drag_parasite and Drag_alpha

Index: Controls.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Controls.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** Controls.cpp	6 Jul 2016 08:00:40 -0000	1.41
--- Controls.cpp	13 Aug 2016 09:39:39 -0000	1.42
***************
*** 394,409 ****
  
      file << std::setprecision(4) << std::fixed << std::showpoint;
!     file << "    <function name=\"aero/force/Drag_basic\">" << std::endl;
      file << "       <description>Drag at zero lift</description>" << std::endl;
      file << "       <product>" << std::endl;
      file << "          <property>aero/qbar-psf</property>" << std::endl;
      file << "          <property>metrics/Sw-sqft</property>" << std::endl;
      file << "          <table>" << std::endl;
      file << "            <independentVar lookup=\"row\">aero/alpha-rad</independentVar>" << std::endl;
      file << "            <tableData>" << std::endl;
      file << "             -1.57    " << (CDmax) << std::endl;
!     file << "             " << std::setprecision(2) << (-alpha) << "    " << std::setprecision(4) << (CD0 + alpha * CDalpha) << std::endl;
!     file << "              0.00    " << (CD0) << std::endl;
!     file << "              " << std::setprecision(2) << (alpha) << "    " << std::setprecision(4) << (CD0 + alpha * CDalpha) << std::endl;
      file << "              1.57    " << (CDmax) << std::endl;
      file << "            </tableData>" << std::endl;
--- 394,420 ----
  
      file << std::setprecision(4) << std::fixed << std::showpoint;
!     file << "    <function name=\"aero/force/Drag_zero_lift\">" << std::endl;
      file << "       <description>Drag at zero lift</description>" << std::endl;
      file << "       <product>" << std::endl;
      file << "          <property>aero/qbar-psf</property>" << std::endl;
      file << "          <property>metrics/Sw-sqft</property>" << std::endl;
+     file << "          <value> " << (CD0) << " </value>" << std::endl;
+     file << "       </product>" << std::endl;
+     file << "    </function>" << std::endl;
+     file << std::endl;
+ 
+     file << std::setprecision(4) << std::fixed << std::showpoint;
+     file << "    <function name=\"aero/force/Drag_alpha\">" << std::endl;
+     file << "       <description>Drag due to alpha</description>" << std::endl;
+     file << "       <product>" << std::endl;
+     file << "          <property>aero/qbar-psf</property>" << std::endl;
+     file << "          <property>metrics/Sw-sqft</property>" << std::endl;
      file << "          <table>" << std::endl;
      file << "            <independentVar lookup=\"row\">aero/alpha-rad</independentVar>" << std::endl;
      file << "            <tableData>" << std::endl;
      file << "             -1.57    " << (CDmax) << std::endl;
!     file << "             " << std::setprecision(2) << (-alpha) << "    " << std::setprecision(4) << (alpha * CDalpha) << std::endl;
!     file << "              0.00    " << 0.0f << std::endl;
!     file << "              " << std::setprecision(2) << (alpha) << "    " << std::setprecision(4) << (alpha * CDalpha) << std::endl;
      file << "              1.57    " << (CDmax) << std::endl;
      file << "            </tableData>" << std::endl;