[Jsbsim-cvslogs] CVS: JSBSim/utils/aeromatic++ Aircraft.cpp, 1.65, 1.66 aeromatic.cpp, 1.7, 1.8

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

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

Modified Files:
	Aircraft.cpp aeromatic.cpp 
Log Message:
Fix a devide by zero and do not use push_back() but at(i) = when the vectors are already of the proper size

Index: Aircraft.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Aircraft.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** Aircraft.cpp	3 May 2016 11:51:19 -0000	1.65
--- Aircraft.cpp	2 Jun 2016 22:05:52 -0000	1.66
***************
*** 164,169 ****
      _CDalpha.resize(4, 0.0f);
      _CYp.resize(4, 0.0f);
!     _Clbeta.resize(1, 0.0f);
!     _Clr.resize(1, 0.0f);
      _Cnp.resize(4, 0.0f);
  
--- 164,169 ----
      _CDalpha.resize(4, 0.0f);
      _CYp.resize(4, 0.0f);
!     _Clbeta.resize(4, 0.0f);
!     _Clr.resize(4, 0.0f);
      _Cnp.resize(4, 0.0f);
  
***************
*** 383,387 ****
--- 383,396 ----
      _payload -= _empty_weight;
  
+ //***** COEFFICIENTS **********************************
+     aircraft->set_lift();
+     aircraft->set_drag();
+     aircraft->set_side();
+     aircraft->set_roll();
+     aircraft->set_pitch();
+     aircraft->set_yaw();
+ 
  //***** SYSTEMS ***************************************
+     // Systems may make use of coefficients
      for (unsigned i=0; i<systems.size(); ++i)
      {
***************
*** 391,401 ****
      }
  
- //***** COEFFICIENTS **********************************
-     aircraft->set_lift();
-     aircraft->set_drag();
-     aircraft->set_side();
-     aircraft->set_roll();
-     aircraft->set_pitch();
-     aircraft->set_yaw();
  
  //************************************************
--- 400,403 ----

Index: aeromatic.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/aeromatic.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** aeromatic.cpp	19 Nov 2015 14:07:07 -0000	1.7
--- aeromatic.cpp	2 Jun 2016 22:05:52 -0000	1.8
***************
*** 27,30 ****
--- 27,36 ----
  #endif
  
+ #if defined(_MSC_VER)
+ #  include <float.h>
+ #elif defined(__GNUC__) && !defined(sgi)
+ #  include <fenv.h>
+ #endif
+ 
  #include <string.h>
  #include <iostream>
***************
*** 103,106 ****
--- 109,121 ----
      ifstream in;
  
+ #if defined(_MSC_VER)
+   _clearfp();
+   _controlfp(_controlfp(0, 0) & ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW),
+            _MCW_EM);
+ #elif defined(__GNUC__) && !defined(sgi)
+   feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW|FE_UNDERFLOW);
+ #endif
+ 
+ 
      char *file = getCommandLineOption(argc, argv, (char*)"-l");
      if (file)