Menu
▾
▴
jsbsim-cvslogs — CVS logs from changes to JSBSim code
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(64) |
May
(260) |
Jun
(65) |
Jul
(28) |
Aug
(13) |
Sep
(46) |
Oct
(55) |
Nov
(25) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(97) |
Feb
(13) |
Mar
(90) |
Apr
(25) |
May
(97) |
Jun
(124) |
Jul
(39) |
Aug
(16) |
Sep
(62) |
Oct
(13) |
Nov
(32) |
Dec
(258) |
| 2006 |
Jan
(87) |
Feb
(67) |
Mar
(27) |
Apr
(19) |
May
(42) |
Jun
(12) |
Jul
(31) |
Aug
(51) |
Sep
(7) |
Oct
(4) |
Nov
(27) |
Dec
(6) |
| 2007 |
Jan
(23) |
Feb
(41) |
Mar
(6) |
Apr
(14) |
May
(31) |
Jun
(6) |
Jul
(9) |
Aug
(13) |
Sep
(41) |
Oct
(26) |
Nov
(13) |
Dec
(11) |
| 2008 |
Jan
(75) |
Feb
(24) |
Mar
(32) |
Apr
(103) |
May
(49) |
Jun
(15) |
Jul
(45) |
Aug
(61) |
Sep
(6) |
Oct
(12) |
Nov
(18) |
Dec
(32) |
| 2009 |
Jan
(77) |
Feb
(33) |
Mar
(33) |
Apr
(19) |
May
(52) |
Jun
(43) |
Jul
(14) |
Aug
(80) |
Sep
(32) |
Oct
(81) |
Nov
(20) |
Dec
(12) |
| 2010 |
Jan
(15) |
Feb
(50) |
Mar
(28) |
Apr
(49) |
May
(12) |
Jun
(19) |
Jul
(78) |
Aug
(49) |
Sep
(52) |
Oct
(22) |
Nov
(108) |
Dec
(33) |
| 2011 |
Jan
(47) |
Feb
(3) |
Mar
(7) |
Apr
(3) |
May
(7) |
Jun
(43) |
Jul
(80) |
Aug
(55) |
Sep
(34) |
Oct
(33) |
Nov
(33) |
Dec
(20) |
| 2012 |
Jan
(16) |
Feb
(18) |
Mar
(29) |
Apr
(26) |
May
(4) |
Jun
(5) |
Jul
(13) |
Aug
(14) |
Sep
(47) |
Oct
(29) |
Nov
(19) |
Dec
(66) |
| 2013 |
Jan
(55) |
Feb
(46) |
Mar
|
Apr
(1) |
May
|
Jun
(32) |
Jul
|
Aug
(1) |
Sep
(40) |
Oct
(3) |
Nov
(43) |
Dec
(26) |
| 2014 |
Jan
(63) |
Feb
(30) |
Mar
(2) |
Apr
(3) |
May
(51) |
Jun
(18) |
Jul
(4) |
Aug
(6) |
Sep
(10) |
Oct
|
Nov
(17) |
Dec
(3) |
| 2015 |
Jan
(13) |
Feb
(36) |
Mar
(12) |
Apr
(37) |
May
(8) |
Jun
|
Jul
(29) |
Aug
(23) |
Sep
(55) |
Oct
(82) |
Nov
(57) |
Dec
(72) |
| 2016 |
Jan
(61) |
Feb
(6) |
Mar
(1) |
Apr
(18) |
May
(59) |
Jun
(42) |
Jul
(24) |
Aug
(20) |
Sep
(6) |
Oct
|
Nov
(8) |
Dec
(1) |
| 2017 |
Jan
(2) |
Feb
(20) |
Mar
(14) |
Apr
(4) |
May
(9) |
Jun
(7) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bertrand <bco...@us...> - 2016-06-04 18:55:30
|
Update of /cvsroot/jsbsim/JSBSim/tests In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19745/tests Modified Files: CheckTrim.py Log Message: Check that the aircraft is motionless after the ground trim succeeded. Index: CheckTrim.py =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/tests/CheckTrim.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** CheckTrim.py 30 Jan 2016 18:50:24 -0000 1.3 --- CheckTrim.py 4 Jun 2016 18:55:27 -0000 1.4 *************** *** 58,66 **** fdm = CreateFDM(self.sandbox) fdm.load_model('c172x') ! fdm['ic/theta-deg'] = 10.0 fdm.run_ic() fdm['ic/theta-deg'] = 0.0 # If the trim fails, it will raise an exception ! fdm['simulation/do_simple_trim'] = 2 RunTest(CheckTrim) --- 58,77 ---- fdm = CreateFDM(self.sandbox) fdm.load_model('c172x') ! fdm['ic/theta-deg'] = 90.0 fdm.run_ic() fdm['ic/theta-deg'] = 0.0 # If the trim fails, it will raise an exception ! fdm['simulation/do_simple_trim'] = 2 # Ground trim ! ! # Check that the aircraft has been trimmed successfully (velocities ! # should be zero i.e. the aircraft must be motionless once trimmed). ! while fdm['simulation/sim-time-sec'] <= 1.0: ! fdm.run() ! self.assertAlmostEqual(fdm['velocities/p-rad_sec'], 0., delta=1E-4) ! self.assertAlmostEqual(fdm['velocities/q-rad_sec'], 0., delta=1E-4) ! self.assertAlmostEqual(fdm['velocities/r-rad_sec'], 0., delta=1E-4) ! self.assertAlmostEqual(fdm['velocities/u-fps'], 0.0, delta=1E-4) ! self.assertAlmostEqual(fdm['velocities/v-fps'], 0.0, delta=1E-4) ! self.assertAlmostEqual(fdm['velocities/w-fps'], 0.0, delta=1E-4) RunTest(CheckTrim) |
|
From: Bertrand <bco...@us...> - 2016-06-04 11:06:54
|
Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv470/src/models/propulsion Modified Files: FGPropeller.cpp Log Message: Removed this condition since it gives an erratic behaviour to the induced velocity computations when the aero velocity has a very small magnitude and is oscillating around zero. Index: FGPropeller.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGPropeller.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** FGPropeller.cpp 2 Jan 2016 17:42:53 -0000 1.57 --- FGPropeller.cpp 4 Jun 2016 11:06:51 -0000 1.58 *************** *** 242,259 **** else Vinduced = 0.5 * (-Vel - sqrt(-Vel2sum)); - - // We need to drop the case where the downstream velocity is opposite in - // direction to the aircraft velocity. For example, in such a case, the - // direction of the airflow on the tail would be opposite to the airflow on - // the wing tips. When such complicated airflows occur, the momentum theory - // breaks down and the formulas above are no longer applicable - // (see H. Glauert, "The Elements of Airfoil and Airscrew Theory", - // 2nd edition, §16.3, pp. 219-221) - - if ((Vel+2.0*Vinduced)*Vel < 0.0) { - // The momentum theory is no longer applicable so let's assume the induced - // saturates to -0.5*Vel so that the total velocity Vel+2*Vinduced equals 0. - Vinduced = -0.5*Vel; - } // P-factor is simulated by a shift of the acting location of the thrust. --- 242,245 ---- |
|
From: Erik H. <eh...@us...> - 2016-06-04 08:30:47
|
Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25974/Systems Modified Files: Propulsion.cpp Log Message: Do not use the sea level pressure Index: Propulsion.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Propulsion.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** Propulsion.cpp 5 Jan 2016 10:28:52 -0000 1.36 --- Propulsion.cpp 4 Jun 2016 08:30:44 -0000 1.37 *************** *** 802,806 **** file << " <table>" << std::endl; file << " <description> Engine power, function of airspeed and pressure </description>" << std::endl; ! file << " <independentVar lookup=\"row\">atmosphere/P-sl-psf</independentVar>" << std::endl; file << " <independentVar lookup=\"column\">velocities/ve-kts</independentVar>" << std::endl; file << " <tableData>" << std::endl; --- 802,806 ---- file << " <table>" << std::endl; file << " <description> Engine power, function of airspeed and pressure </description>" << std::endl; ! file << " <independentVar lookup=\"row\">atmosphere/P-psf</independentVar>" << std::endl; file << " <independentVar lookup=\"column\">velocities/ve-kts</independentVar>" << std::endl; file << " <tableData>" << std::endl; |
|
From: Erik H. <eh...@us...> - 2016-06-02 22:08:09
|
Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++ In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4491 Modified Files: Aircraft.cpp Log Message: Proper indexing |
|
From: Erik H. <eh...@us...> - 2016-06-02 22:08:09
|
Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4491/Systems Modified Files: Controls.cpp Log Message: Proper indexing Index: Controls.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Controls.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** Controls.cpp 2 Jun 2016 22:05:52 -0000 1.37 --- Controls.cpp 2 Jun 2016 22:08:06 -0000 1.38 *************** *** 140,145 **** _aircraft->_CLalpha.at(0) = CLaw[0]+CLah[0]*Sh/Sw*(1.0f-deda); ! _aircraft->_CLalpha.at(0) = CLaw[1]; ! _aircraft->_CLalpha.at(0) = CLaw[2]; // *** Pitch moment *** --- 140,145 ---- _aircraft->_CLalpha.at(0) = CLaw[0]+CLah[0]*Sh/Sw*(1.0f-deda); ! _aircraft->_CLalpha.at(1) = CLaw[1]; ! _aircraft->_CLalpha.at(2) = CLaw[2]; // *** Pitch moment *** |
|
From: Erik H. <eh...@us...> - 2016-06-02 22:05:56
|
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) |
|
From: Erik H. <eh...@us...> - 2016-06-02 22:05:56
|
Update of /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4385/Systems Modified Files: Controls.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: Controls.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/utils/aeromatic++/Systems/Controls.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** Controls.cpp 2 Jan 2016 14:58:27 -0000 1.36 --- Controls.cpp 2 Jun 2016 22:05:52 -0000 1.37 *************** *** 139,145 **** float Sh = _aircraft->_htail.area; ! _aircraft->_CLalpha.push_back(CLaw[0]+CLah[0]*Sh/Sw*(1.0f-deda)); ! _aircraft->_CLalpha.push_back(CLaw[1]); ! _aircraft->_CLalpha.push_back(CLaw[2]); // *** Pitch moment *** --- 139,145 ---- float Sh = _aircraft->_htail.area; ! _aircraft->_CLalpha.at(0) = CLaw[0]+CLah[0]*Sh/Sw*(1.0f-deda); ! _aircraft->_CLalpha.at(0) = CLaw[1]; ! _aircraft->_CLalpha.at(0) = CLaw[2]; // *** Pitch moment *** *************** *** 208,212 **** _aircraft->_CL0 = CL = CL0; ! _aircraft->_CDalpha.push_back(CLalpha*(2.0f*CL)/(PI*AR*Ew)); Vt = sqrtf(W/(0.5f*rho*CL*Sw)); --- 208,212 ---- _aircraft->_CL0 = CL = CL0; ! _aircraft->_CDalpha.at(i) = CLalpha*(2.0f*CL)/(PI*AR*Ew); Vt = sqrtf(W/(0.5f*rho*CL*Sw)); *************** *** 221,236 **** CL = W/Q/Sw; } ! _aircraft->_Re.push_back((0.0765f * Vt * cbarw)/ 1.983e-5f); alpha = (CL-CL0)/CLalpha; ! _aircraft->_alpha.push_back(alpha); float CLmin = CL - (alpha-MIN_ALPHA)*CLalpha; float CLmax = CL + (alpha+MAX_ALPHA)*CLalpha; ! _aircraft->_CYp.push_back(-CL*CYp_const); ! _aircraft->_Cnp.push_back(-CL/8.0f); ! // _aircraft->_Clbeta.push_back(-((1.0f+2.0f*TR)/(6.0f+6.0f*TR))*(dihedral*CLaw[0] + (CL*tanf(sweep)/(1.0f-M2*powf(cosf(sweep), 2.0f))))); ! // _aircraft->_Clr.push_back((CL/4.0f)-Clr_const); #if 1 --- 221,236 ---- CL = W/Q/Sw; } ! _aircraft->_Re.at(i) = (0.0765f * Vt * cbarw)/ 1.983e-5f; alpha = (CL-CL0)/CLalpha; ! _aircraft->_alpha.at(i) = alpha; float CLmin = CL - (alpha-MIN_ALPHA)*CLalpha; float CLmax = CL + (alpha+MAX_ALPHA)*CLalpha; ! _aircraft->_CYp.at(i) = -CL*CYp_const; ! _aircraft->_Cnp.at(i) = -CL/8.0f; ! // _aircraft->_Clbeta.at(i) = -((1.0f+2.0f*TR)/(6.0f+6.0f*TR))*(dihedral*CLaw[0] + (CL*tanf(sweep)/(1.0f-M2*powf(cosf(sweep), 2.0f))))); ! // _aircraft->_Clr.at(i) = (CL/4.0f)-Clr_const; #if 1 *************** *** 240,250 **** Cmin = (-((1.0f+2.0f*TR)/(6.0f+6.0f*TR))*(dihedral*CLaw[0] + (CLmin*tanf(sweep)/(1.0f-M2*powf(cosf(sweep), 2.0f))))); Cmax = (-((1.0f+2.0f*TR)/(6.0f+6.0f*TR))*(dihedral*CLaw[0] + (CLmax*tanf(sweep)/(1.0f-M2*powf(cosf(sweep), 2.0f))))); ! _aircraft->_Clbeta.push_back(-Cmin - Clbwf - Clbvt); ! _aircraft->_Clbeta.push_back(-Cmax - Clbwf - Clbvt); Cmin = (CLmin/4.0f)-Clr_const; Cmax = (CLmax/4.0f)-Clr_const; ! _aircraft->_Clr.push_back(Cmin); ! _aircraft->_Clr.push_back(Cmax); #endif } --- 240,250 ---- Cmin = (-((1.0f+2.0f*TR)/(6.0f+6.0f*TR))*(dihedral*CLaw[0] + (CLmin*tanf(sweep)/(1.0f-M2*powf(cosf(sweep), 2.0f))))); Cmax = (-((1.0f+2.0f*TR)/(6.0f+6.0f*TR))*(dihedral*CLaw[0] + (CLmax*tanf(sweep)/(1.0f-M2*powf(cosf(sweep), 2.0f))))); ! _aircraft->_Clbeta.at(i) = -Cmin - Clbwf - Clbvt; ! _aircraft->_Clbeta.at(i) = -Cmax - Clbwf - Clbvt; Cmin = (CLmin/4.0f)-Clr_const; Cmax = (CLmax/4.0f)-Clr_const; ! _aircraft->_Clr.at(i) = Cmin; ! _aircraft->_Clr.at(i) = Cmax; #endif } *************** *** 693,697 **** file << " </function>" << std::endl; file << std::endl; ! file << " <function name=\"aero/moment/Yaw_rol_rate\">" << std::endl; file << " <description>Yaw_moment_due_to_roll_rate</description>" << std::endl; file << " <product>" << std::endl; --- 693,697 ---- file << " </function>" << std::endl; file << std::endl; ! file << " <function name=\"aero/moment/Yaw_roll_rate\">" << std::endl; file << " <description>Yaw_moment_due_to_roll_rate</description>" << std::endl; file << " <product>" << std::endl; |
|
From: Bertrand <bco...@us...> - 2016-05-30 19:06:01
|
Update of /cvsroot/jsbsim/JSBSim/src/models In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7198/src/models Modified Files: FGAerodynamics.cpp Log Message: Final fix for bug SF#115: make sure that the property aero/cl-squared is getting huge values when qbar is close to zero. Index: FGAerodynamics.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGAerodynamics.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** FGAerodynamics.cpp 23 May 2016 17:23:36 -0000 1.59 --- FGAerodynamics.cpp 30 May 2016 19:05:58 -0000 1.60 *************** *** 148,154 **** const double twovel=2*in.Vt; ! // Calculate lift coefficient squared ! // Make sure that aero/cl-squared is computed with the current qbar ! if ( in.Qbar > 0) { clsq = (vFw(eLift) + vFwAtCG(eLift))/ (in.Wingarea*in.Qbar); clsq *= clsq; --- 148,158 ---- const double twovel=2*in.Vt; ! // The lift coefficient squared (property aero/cl-squared) is computed before ! // the aero functions are called to make sure that they use the same value for ! // qbar. ! if ( in.Qbar > 1.0) { ! // Skip the computation if qbar is close to zero to avoid huge values for ! // aero/cl-squared when a non-null lift coincides with a very small aero ! // velocity (i.e. when qbar is close to zero). clsq = (vFw(eLift) + vFwAtCG(eLift))/ (in.Wingarea*in.Qbar); clsq *= clsq; |
|
From: Bertrand <bco...@us...> - 2016-05-23 17:23:39
|
Update of /cvsroot/jsbsim/JSBSim/src/models In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32182/src/models Modified Files: FGAerodynamics.cpp Log Message: Bug fix for the SF bug #115 Index: FGAerodynamics.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGAerodynamics.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -r1.58 -r1.59 *** FGAerodynamics.cpp 22 May 2016 17:02:13 -0000 1.58 --- FGAerodynamics.cpp 23 May 2016 17:23:36 -0000 1.59 *************** *** 148,151 **** --- 148,158 ---- const double twovel=2*in.Vt; + // Calculate lift coefficient squared + // Make sure that aero/cl-squared is computed with the current qbar + if ( in.Qbar > 0) { + clsq = (vFw(eLift) + vFwAtCG(eLift))/ (in.Wingarea*in.Qbar); + clsq *= clsq; + } + RunPreFunctions(); *************** *** 249,258 **** } - // Calculate lift coefficient squared - if ( in.Qbar > 0) { - clsq = (vFw(eLift) + vFwAtCG(eLift))/ (in.Wingarea*in.Qbar); - clsq *= clsq; - } - // Calculate lift Lift over Drag if ( fabs(vFw(eDrag) + vFwAtCG(eDrag)) > 0.0) --- 256,259 ---- |
|
From: Bertrand <bco...@us...> - 2016-05-23 17:18:01
|
Update of /cvsroot/jsbsim/JSBSim/aircraft/p51d In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31952/aircraft/p51d Added Files: reset01.xml Log Message: New script that triggers SF bug #115: P51D crash when advance ratio goes through zero --- NEW FILE --- <?xml version="1.0"?> <initialize name="reset01"> <ubody unit="FT/SEC"> 0.0 </ubody> <vbody unit="FT/SEC"> 0.0 </vbody> <wbody unit="FT/SEC"> 0.0 </wbody> <phi unit="DEG"> 0.0 </phi> <theta unit="DEG"> 11.6 </theta> <psi unit="DEG"> 90.0 </psi> <longitude unit="DEG"> 122.0 </longitude> <latitude unit="DEG"> 47.0 </latitude> <altitude unit="FT"> 5.9 </altitude> <hwind unit="KTS"> 3.0 </hwind> </initialize> |
|
From: Bertrand <bco...@us...> - 2016-05-23 17:18:01
|
Update of /cvsroot/jsbsim/JSBSim/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31952/scripts Added Files: p51d_tail_wind.xml Log Message: New script that triggers SF bug #115: P51D crash when advance ratio goes through zero --- NEW FILE --- <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet type="text/xsl" href="http://jsbsim.sf.net/JSBSimScript.xsl"?> <runscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://jsbsim.sf.net/JSBSimScript.xsd" name="p51d-tail-wind"> <use aircraft="p51d" initialize="reset01"/> <run start="0.0" end="30" dt="0.008333"> <property> simulation/notify-time-trigger </property> <!-- Initialize with brakes on --> <property value="1"> fcs/left-brake-cmd-norm </property> <property value="1"> fcs/right-brake-cmd-norm </property> <property value="1"> fcs/center-brake-cmd-norm </property> <!-- Prepare a tail wind cosine gust --> <property value="5"> atmosphere/cosine-gust/startup-duration-sec </property> <property value="1"> atmosphere/cosine-gust/steady-duration-sec </property> <property value="5"> atmosphere/cosine-gust/end-duration-sec </property> <property value="25"> atmosphere/cosine-gust/magnitude-ft_sec </property> <property value="3"> atmosphere/cosine-gust/frame </property> <property value="0"> atmosphere/cosine-gust/X-velocity-ft_sec </property> <property value="1"> atmosphere/cosine-gust/Y-velocity-ft_sec </property> <property value="0"> atmosphere/cosine-gust/Z-velocity-ft_sec </property> <event name="Engine start"> <description>Start the engine</description> <condition> simulation/sim-time-sec >= 4.0 </condition> <set name="fcs/throttle-cmd-norm" value="0.5" action="FG_RAMP" tc ="0.5"/> <set name="propulsion/magneto_cmd" value="3"/> <set name="propulsion/starter_cmd" value="1"/> <notify> <property caption="Throttle pos: "> fcs/throttle-pos-norm[0] </property> <property caption="Mixture pos: "> fcs/mixture-pos-norm[0] </property> <property caption="Weight (lbs): "> inertia/weight-lbs </property> <property caption="Propeller RPM: "> propulsion/engine/propeller-rpm </property> </notify> </event> <event name="Throttling back to idle"> <condition> simulation/sim-time-sec >= 8.0 </condition> <set name="fcs/throttle-cmd-norm" value="0.0" action="FG_RAMP" tc ="0.5"/> <notify> <property caption="Throttle pos: "> fcs/throttle-pos-norm[0] </property> <property caption="Mixture pos: "> fcs/mixture-pos-norm[0] </property> <property caption="Weight (lbs): "> inertia/weight-lbs </property> <property caption="Propeller RPM: "> propulsion/engine/propeller-rpm </property> </notify> </event> <event name="Tailwind gust"> <condition> simulation/sim-time-sec >= 15 </condition> <set name="atmosphere/cosine-gust/start" value="1"/> <set name="fcs/elevator-cmd-norm" value="-1.0"/> <notify> <property caption="Cal. airspeed (kts): "> velocities/vc-kts</property> <property caption="Altitude (AGL, ft): "> position/h-agl-ft</property> <property caption="Throttle pos: "> fcs/throttle-pos-norm[0] </property> <property caption="Propeller RPM: "> propulsion/engine/propeller-rpm </property> </notify> </event> <event name="Time Notify" persistent="true"> <description>Output message at 1 second intervals</description> <condition> simulation/sim-time-sec >= simulation/notify-time-trigger </condition> <set name="simulation/notify-time-trigger" value="1" type="FG_DELTA"/> <notify> <property caption="Cal. airspeed (kts): "> velocities/vc-kts</property> <property caption="Altitude (AGL, ft): "> position/h-agl-ft</property> <property caption="Latitude (geod, deg): "> position/lat-geod-deg</property> <property caption="Altitude (geod, ft): "> position/geod-alt-ft</property> <property caption="Throttle pos: "> fcs/throttle-pos-norm[0] </property> <property caption="Mixture pos: "> fcs/mixture-pos-norm[0] </property> <property caption="Weight (lbs): "> inertia/weight-lbs </property> <property caption="Propeller RPM: "> propulsion/engine/propeller-rpm </property> <property caption="Elevator position (rad)"> fcs/elevator-pos-rad </property> </notify> </event> </run> <output name="p51d.csv" type="CSV" rate="120"> <rates> ON </rates> <velocities> ON </velocities> <position> ON </position> <atmosphere> OFF </atmosphere> <fcs> OFF </fcs> <ground_reactions> OFF </ground_reactions> <propulsion> ON </propulsion> <simulation> ON </simulation> <massprops> OFF </massprops> <forces> ON </forces> <moments> ON </moments> <aerosurfaces> OFF </aerosurfaces> <coefficients> ON </coefficients> <property> propulsion/engine/advance-ratio </property> <property> propulsion/engine/prop-induced-velocity_fps </property> <property> aero/cl-squared </property> </output> </runscript> |
|
From: Erik H. <eh...@us...> - 2016-05-23 09:19:55
|
Update of /cvsroot/jsbsim/JSBSim/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8815/scripts Added Files: p51_start_test.xml Log Message: Initial p51d startup script --- NEW FILE --- <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet type="text/xsl" href="http://jsbsim.sf.net/JSBSimScript.xsl"?> <runscript xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://jsbsim.sf.net/JSBSimScript.xsd" name="Paraglider rotate test"> <description>For testing P51d engine start</description> <use aircraft="p51d" initialize="reset00"/> <run start="0.0" end="100" dt="0.00833333"> <event name="Trim"> <condition>simulation/sim-time-sec gt 0.1</condition> <set name="fcs/aileron-cmd-norm" value="0.0"/> <!-- <set name="simulation/do_simple_trim" value="1"/> --> </event> <event name="Start engine: Starter"> <description>The starter for the engine is turned on.</description> <condition>simulation/sim-time-sec ge 1.0</condition> <set name="fcs/throttle-cmd-norm" action="FG_RAMP" value="1.0" tc ="1.0"/> <set name="fcs/mixture-cmd-norm" action="FG_RAMP" value="1.0" tc="1.0"/> <set name="propulsion/magneto_cmd" value="3"/> <set name="propulsion/starter_cmd" value="1"/> <notify> <property>velocities/u-aero-fps</property> <property>velocities/v-aero-fps</property> <property>velocities/w-aero-fps</property> </notify> </event> <event name="Running engine"> <condition>simulation/sim-time-sec ge 3.0</condition> <set name="fcs/throttle-cmd-norm" value="1.0"/> <notify> <property>velocities/u-aero-fps</property> <property>velocities/v-aero-fps</property> <property>velocities/w-aero-fps</property> </notify> </event> </run> </runscript> |
|
From: Erik H. <eh...@us...> - 2016-05-23 09:18:18
|
Update of /cvsroot/jsbsim/JSBSim/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8683/scripts Modified Files: paraglider_rotate_test.xml Log Message: Display hight-above-ground instead of geod Index: paraglider_rotate_test.xml =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/scripts/paraglider_rotate_test.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** paraglider_rotate_test.xml 19 May 2016 12:59:56 -0000 1.4 --- paraglider_rotate_test.xml 23 May 2016 09:18:15 -0000 1.5 *************** *** 6,20 **** <description>For testing Paraglider rotate</description> <use aircraft="paraglider" initialize="reset00"/> ! <run start="0.0" end="1000" dt="0.00833333"> ! <event name="Trim"> ! <condition>simulation/sim-time-sec gt 0.1</condition> ! <set name="fcs/aileron-cmd-norm" value="0.0"/> ! <!-- <set name="simulation/do_simple_trim" value="1"/> --> ! </event> <event name="Start engine: Starter"> <description>The starter for the engine is turned on.</description> ! <condition>simulation/sim-time-sec ge 1.0</condition> <set name="fcs/throttle-cmd-norm" action="FG_RAMP" value="1.0" tc ="1.0"/> <set name="fcs/mixture-cmd-norm" action="FG_RAMP" value="1.0" tc="1.0"/> --- 6,16 ---- <description>For testing Paraglider rotate</description> <use aircraft="paraglider" initialize="reset00"/> ! <run start="0.0" end="30" dt="0.00833333"> ! <property value="0"> simulation/run_id </property> <event name="Start engine: Starter"> <description>The starter for the engine is turned on.</description> ! <condition>simulation/sim-time-sec gt 0.1</condition> <set name="fcs/throttle-cmd-norm" action="FG_RAMP" value="1.0" tc ="1.0"/> <set name="fcs/mixture-cmd-norm" action="FG_RAMP" value="1.0" tc="1.0"/> *************** *** 22,26 **** <set name="propulsion/starter_cmd" value="1"/> <notify> ! <property>position/geod-alt-ft</property> <property>accelerations/a-pilot-x-ft_sec2</property> <property>accelerations/a-pilot-y-ft_sec2</property> --- 18,22 ---- <set name="propulsion/starter_cmd" value="1"/> <notify> ! <property>position/h-agl-ft</property> <property>accelerations/a-pilot-x-ft_sec2</property> <property>accelerations/a-pilot-y-ft_sec2</property> *************** *** 34,38 **** <set name="fcs/aileron-cmd-norm" value="1.0" action="FG_RAMP" tc="0.5"/> <notify> ! <property>position/geod-alt-ft</property> <property>accelerations/a-pilot-x-ft_sec2</property> <property>accelerations/a-pilot-y-ft_sec2</property> --- 30,34 ---- <set name="fcs/aileron-cmd-norm" value="1.0" action="FG_RAMP" tc="0.5"/> <notify> ! <property>position/h-agl-ft</property> <property>accelerations/a-pilot-x-ft_sec2</property> <property>accelerations/a-pilot-y-ft_sec2</property> *************** *** 52,56 **** <set name="fcs/aileron-cmd-norm" value="1.0" action="FG_RAMP" tc="0.5"/> <notify> ! <property>position/geod-alt-ft</property> <property>accelerations/a-pilot-x-ft_sec2</property> <property>accelerations/a-pilot-y-ft_sec2</property> --- 48,52 ---- <set name="fcs/aileron-cmd-norm" value="1.0" action="FG_RAMP" tc="0.5"/> <notify> ! <property>position/h-agl-ft</property> <property>accelerations/a-pilot-x-ft_sec2</property> <property>accelerations/a-pilot-y-ft_sec2</property> *************** *** 70,73 **** --- 66,70 ---- <set name="fcs/aileron-cmd-norm" value="1.0" action="FG_RAMP" tc="0.5"/> <notify> + <property>position/h-agl-ft</property> <property>accelerations/a-pilot-x-ft_sec2</property> <property>accelerations/a-pilot-y-ft_sec2</property> |
|
From: Erik H. <eh...@us...> - 2016-05-23 09:16:58
|
Update of /cvsroot/jsbsim/JSBSim/aircraft/paraglider In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8566 Modified Files: paraglider.xml Log Message: Model after a real paraglider model Index: paraglider.xml =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/aircraft/paraglider/paraglider.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** paraglider.xml 22 May 2016 12:19:30 -0000 1.14 --- paraglider.xml 23 May 2016 09:16:55 -0000 1.15 *************** *** 1,3 **** ! <?xml version="1.0"?> <?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?> <fdm_config name="paraglider" version="2.0" release="BETA" --- 1,3 ---- ! <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet type="text/xsl" href="http://jsbsim.sourceforge.net/JSBSim.xsl"?> <fdm_config name="paraglider" version="2.0" release="BETA" *************** *** 16,25 **** http://www.cobaltcfd.com/pdfs/2016/AIAA-2016-1536.pdf --> </fileheader> <metrics> ! <wingarea unit="FT2"> 300 </wingarea> ! <wingspan unit="FT"> 32 </wingspan> <chord unit="FT"> 7 </chord> <htailarea unit="FT2"> 1 </htailarea> --- 16,38 ---- http://www.cobaltcfd.com/pdfs/2016/AIAA-2016-1536.pdf + + + http://www.ojovolador.com/eng/read/tests/discus/ + Cells 44 + Wing area (m²) 24 (258.33 ft²) + Wing area projected (m²) 20.5 (220.66 ft²) + Wing span (m) 11.2 ( 36.75 ft) + Projected wing span (m) 8.8 ( 28.87 ft) + Aspect ratio 5.2 + Projected aspect ratio 3.7 + Glider weight (kg) 4.9 ( 10.8 lbs) + Max speed (km/h) 47 ±2 ( 25.4 kts ±2) + Trim speed (km/h) 38 ±1 ( 20.5 kts ±½) --> </fileheader> <metrics> ! <wingarea unit="FT2"> 220 </wingarea> ! <wingspan unit="FT"> 29 </wingspan> <chord unit="FT"> 7 </chord> <htailarea unit="FT2"> 1 </htailarea> *************** *** 160,175 **** <aerodynamics> ! <!-- ! Drag of a spehere: 0.5 ! Re CD(rough) CD(clean) ! 10^2 1.2 1.2 ! 10^3 0.5 0.5 ! 10^4 0.5 0.5 ! 10^5 0.2 0.5 ! 50^5 0.1 ! 10^6 0.4 0.35 ! 10^7 0.5 0.48 ! --> ! <!-- pilot area (area of a circle with a diameter of 1.25 meter) --> <property type="float" value="13.2">metrics/Sp-sqft</property> --- 173,177 ---- <aerodynamics> ! <!-- pilot area (area of a circle with a diameter of 4.1 foot) --> <property type="float" value="13.2">metrics/Sp-sqft</property> *************** *** 364,367 **** --- 366,370 ---- <property>metrics/Sw-sqft</property> <property>metrics/bw-ft</property> + <value>2.5</value> <table> <independentVar lookup="row">aero/alpha-deg</independentVar> *************** *** 523,540 **** <property>aero/ci2vel</property> <property>velocities/q-aero-rad_sec</property> ! <value>-30</value> ! <!-- ! <table> ! <independentVar>aero/alpha-deg</independentVar> ! <tableData> ! 0.0 -1.9 ! 2.0 0.5 ! 4.0 0.0 ! 6.0 2.9 ! 8.0 -0.5 ! 10.0 0.5 ! </tableData> ! </table> ! --> </product> </function> --- 526,543 ---- <property>aero/ci2vel</property> <property>velocities/q-aero-rad_sec</property> ! <sum> ! <value>-20</value> ! <table> ! <independentVar>aero/alpha-deg</independentVar> ! <tableData> ! 0.0 -1.9 ! 2.0 0.5 ! 4.0 0.0 ! 6.0 2.9 ! 8.0 -0.5 ! 10.0 0.5 ! </tableData> ! </table> ! </sum> </product> </function> *************** *** 548,551 **** --- 551,555 ---- <property>metrics/Sw-sqft</property> <property>metrics/bw-ft</property> + <value>2.5</value> <table> <independentVar lookup="row">aero/alpha-deg</independentVar> |
|
From: Bertrand <bco...@us...> - 2016-05-22 17:02:16
|
Update of /cvsroot/jsbsim/JSBSim/src/models In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26873/src/models Modified Files: FGAerodynamics.cpp Log Message: Fixed the aero functions such that they now cache their result when they are executed. This is to make sure that their output to CSV is the same than the result that has been actually used for computations. The issue arose in particular for induced drag which is computed from aero/cl-squared which is modified between the moment where the induced drag is computed and the output to CSV is run. In some cases these 2 values can be very different. Index: FGAerodynamics.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGAerodynamics.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -r1.57 -r1.58 *** FGAerodynamics.cpp 31 Jan 2015 14:56:21 -0000 1.57 --- FGAerodynamics.cpp 22 May 2016 17:02:13 -0000 1.58 *************** *** 145,149 **** if (Holding) return false; // if paused don't execute ! unsigned int axis_ctr, ctr; const double twovel=2*in.Vt; --- 145,149 ---- if (Holding) return false; // if paused don't execute ! unsigned int axis_ctr; const double twovel=2*in.Vt; *************** *** 180,192 **** vFnativeAtCG.InitMatrix(); ! for (axis_ctr = 0; axis_ctr < 3; axis_ctr++) { ! for (ctr=0; ctr < AeroFunctions[axis_ctr].size(); ctr++) { ! vFnative(axis_ctr+1) += AeroFunctions[axis_ctr][ctr]->GetValue(); ! } ! } ! for (axis_ctr = 0; axis_ctr < 3; axis_ctr++) { ! for (ctr=0; ctr < AeroFunctionsAtCG[axis_ctr].size(); ctr++) { ! vFnativeAtCG(axis_ctr+1) += AeroFunctionsAtCG[axis_ctr][ctr]->GetValue(); } } --- 180,200 ---- vFnativeAtCG.InitMatrix(); ! for (axis_ctr = 0; axis_ctr < 3; ++axis_ctr) { ! AeroFunctionArray::iterator f; ! AeroFunctionArray* array = &AeroFunctions[axis_ctr]; ! for (f=array->begin(); f != array->end(); ++f) { ! // Tell the Functions to cache values, so when the function values are ! // being requested for output, the functions do not get calculated again ! // in a context that might have changed, but instead use the values that ! // have already been calculated for this frame. ! (*f)->cacheValue(true); ! vFnative(axis_ctr+1) += (*f)->GetValue(); ! } ! ! array = &AeroFunctionsAtCG[axis_ctr]; ! for (f=array->begin(); f != array->end(); ++f) { ! (*f)->cacheValue(true); // Same as above ! vFnativeAtCG(axis_ctr+1) += (*f)->GetValue(); } } *************** *** 265,270 **** for (axis_ctr = 0; axis_ctr < 3; axis_ctr++) { ! for (ctr = 0; ctr < AeroFunctions[axis_ctr+3].size(); ctr++) { ! vMomentsMRC(axis_ctr+1) += AeroFunctions[axis_ctr+3][ctr]->GetValue(); } } --- 273,284 ---- for (axis_ctr = 0; axis_ctr < 3; axis_ctr++) { ! AeroFunctionArray* array = &AeroFunctions[axis_ctr+3]; ! for (AeroFunctionArray::iterator f=array->begin(); f != array->end(); ++f) { ! // Tell the Functions to cache values, so when the function values are ! // being requested for output, the functions do not get calculated again ! // in a context that might have changed, but instead use the values that ! // have already been calculated for this frame. ! (*f)->cacheValue(true); ! vMomentsMRC(axis_ctr+1) += (*f)->GetValue(); } } *************** *** 284,288 **** bool FGAerodynamics::Load(Element *document) { ! string parameter, axis, scratch; string scratch_unit=""; Element *temp_element, *axis_element, *function_element; --- 298,302 ---- bool FGAerodynamics::Load(Element *document) { ! string axis; string scratch_unit=""; Element *temp_element, *axis_element, *function_element; *************** *** 334,338 **** try { ca.push_back( new FGFunction(PropertyManager, function_element) ); ! } catch (string const str) { cerr << endl << fgred << "Error loading aerodynamic function in " << current_func_name << ":" << str << " Aborting." << reset << endl; --- 348,352 ---- try { ca.push_back( new FGFunction(PropertyManager, function_element) ); ! } catch (const string& str) { cerr << endl << fgred << "Error loading aerodynamic function in " << current_func_name << ":" << str << " Aborting." << reset << endl; *************** *** 342,346 **** try { ca_atCG.push_back( new FGFunction(PropertyManager, function_element) ); ! } catch (string const str) { cerr << endl << fgred << "Error loading aerodynamic function in " << current_func_name << ":" << str << " Aborting." << reset << endl; --- 356,360 ---- try { ca_atCG.push_back( new FGFunction(PropertyManager, function_element) ); ! } catch (const string& str) { cerr << endl << fgred << "Error loading aerodynamic function in " << current_func_name << ":" << str << " Aborting." << reset << endl; |
|
From: Bertrand <bco...@us...> - 2016-05-22 16:49:37
|
Update of /cvsroot/jsbsim/JSBSim/tests In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26154/tests Modified Files: CMakeLists.txt Added Files: TestAeroFuncOutput.py Log Message: Added a new test case that checks that the aerodynamics forces are consistent with the aerodynamics functions output --- NEW FILE --- # TestAeroFuncOutput.py # # Check that the aerodynamics forces are consistent with the aerodynamics # functions output # # Copyright (c) 2016 Bertrand Coconnier # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free Software # Foundation; either version 3 of the License, or (at your option) any later # version. # # This program is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more # details. # # You should have received a copy of the GNU General Public License along with # this program; if not, see <http://www.gnu.org/licenses/> # import pandas as pd from JSBSim_utils import JSBSimTestCase, RunTest, CreateFDM class TestAeroFuncOutput(JSBSimTestCase): def testDragFunctions(self): fdm = CreateFDM(self.sandbox) self.script_path = self.sandbox.path_to_jsbsim_file('scripts', 'x153.xml') fdm.load_script(self.script_path) fdm.set_output_directive(self.sandbox.path_to_jsbsim_file('tests', 'output.xml')) fdm.run_ic() while fdm.run(): pass results = pd.read_csv('output.csv', index_col=0) Fdrag = results['F_{Drag} (lbs)'] CDmin = results['aero/coefficient/CDmin'] CDi = results['aero/coefficient/CDi'] self.assertAlmostEqual(abs(Fdrag/(CDmin+CDi)).max(), 1.0, delta=1E-5) RunTest(TestAeroFuncOutput) Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/tests/CMakeLists.txt,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** CMakeLists.txt 16 May 2016 17:29:46 -0000 1.27 --- CMakeLists.txt 22 May 2016 16:49:34 -0000 1.28 *************** *** 43,47 **** TestWaypoint TestSuspend ! TestLGearSteer) foreach(test ${PYTHON_TESTS}) --- 43,48 ---- TestWaypoint TestSuspend ! TestLGearSteer ! TestAeroFuncOutput) foreach(test ${PYTHON_TESTS}) |
|
From: Erik H. <eh...@us...> - 2016-05-22 12:19:34
|
Update of /cvsroot/jsbsim/JSBSim/aircraft/paraglider In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14087 Modified Files: paraglider.xml Log Message: Update CDpilot, CYpilot, Cmpilot and Clpilot to match a motorcyclist CD Index: paraglider.xml =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/aircraft/paraglider/paraglider.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** paraglider.xml 19 May 2016 14:37:22 -0000 1.13 --- paraglider.xml 22 May 2016 12:19:30 -0000 1.14 *************** *** 70,74 **** </location> </pointmass> - <!-- <pointmass name="DT Propeller"> <weight unit="LBS"> 2.425 </weight> --- 70,73 ---- *************** *** 79,83 **** </location> </pointmass> - --> </mass_balance> --- 78,81 ---- *************** *** 173,180 **** 10^7 0.5 0.48 --> ! <!-- Pilot area (area of a circle with a diameter of 1.25 meter) --> <property type="float" value="13.2">metrics/Sp-sqft</property> ! <!-- Pilot arm (-330 inches equals to 27.5 foot --> <property type="float" value="27.5">metrics/bp-ft</property> --- 171,178 ---- 10^7 0.5 0.48 --> ! <!-- pilot area (area of a circle with a diameter of 1.25 meter) --> <property type="float" value="13.2">metrics/Sp-sqft</property> ! <!-- pilot arm (-330 inches equals to 27.5 foot --> <property type="float" value="27.5">metrics/bp-ft</property> *************** *** 210,214 **** <property>aero/qbar-psf</property> <property>metrics/Sp-sqft</property> ! <value>0.5</value> </product> </function> --- 208,212 ---- <property>aero/qbar-psf</property> <property>metrics/Sp-sqft</property> ! <value>1.8</value> </product> </function> *************** *** 266,270 **** <property>metrics/Sp-sqft</property> <property>aero/beta-rad</property> ! <value>-0.5</value> </product> </function> --- 264,268 ---- <property>metrics/Sp-sqft</property> <property>aero/beta-rad</property> ! <value>-1.8</value> </product> </function> *************** *** 413,417 **** <property>metrics/bp-ft</property> <property>aero/beta-rad</property> ! <value>-0.5</value> </product> </function> --- 411,415 ---- <property>metrics/bp-ft</property> <property>aero/beta-rad</property> ! <value>-1.8</value> </product> </function> *************** *** 493,497 **** <property>metrics/Sp-sqft</property> <property>metrics/bp-ft</property> ! <value>2</value> </product> </function> --- 491,495 ---- <property>metrics/Sp-sqft</property> <property>metrics/bp-ft</property> ! <value>1.8</value> </product> </function> |
|
From: Bertrand <bco...@us...> - 2016-05-22 10:41:52
|
Update of /cvsroot/jsbsim/JSBSim/check_cases/orbit/logged_data In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10521/check_cases/orbit/logged_data Modified Files: BallOut.csv Log Message: Updated with the ground reactions which now include the friction. Also added the weight output. Index: BallOut.csv =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/check_cases/orbit/logged_data/BallOut.csv,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** BallOut.csv 9 Jun 2014 16:22:26 -0000 1.2 --- BallOut.csv 22 May 2016 10:41:49 -0000 1.3 *************** *** 1,12 **** ! Time,P (deg/s),Q (deg/s),R (deg/s),P dot (deg/s^2),Q dot (deg/s^2),R dot (deg/s^2),P_{inertial} (deg/s),Q_{inertial} (deg/s),R_{inertial} (deg/s),q bar (psf),Reynolds Number,V_{Total} (ft/s),V_{Inertial} (ft/s),UBody,VBody,WBody,UdotBody,VdotBody,WdotBody,UdotBody_i,VdotBody_i,WdotBody_i,BodyAccel_X,BodyAccel_Y,BodyAccel_Z,Aero V_{X Body} (ft/s),Aero V_{Y Body} (ft/s),Aero V_{Z Body} (ft/s),V_{X_{inertial}} (ft/s),V_{Y_{inertial}} (ft/s),V_{Z_{inertial}} (ft/s),V_{X_{ecef}} (ft/s),V_{Y_{ecef}} (ft/s),V_{Z_{ecef}} (ft/s),V_{North} (ft/s),V_{East} (ft/s),V_{Down} (ft/s),F_{Drag} (lbs),F_{Side} (lbs),F_{Lift} (lbs),L/D,F_{Aero x} (lbs),F_{Aero y} (lbs),F_{Aero z} (lbs),F_{Prop x} (lbs),F_{Prop y} (lbs),F_{Prop z} (lbs),F_{Gear x} (lbs),F_{Gear y} (lbs),F_{Gear z} (lbs),F_{Ext x} (lbs),F_{Ext y} (lbs),F_{Ext z} (lbs),F_{Buoyant x} (lbs),F_{Buoyant y} (lbs),F_{Buoyant z} (lbs),F_{Total x} (lbs),F_{Total y} (lbs),F_{Total z} (lbs),L_{Aero} (ft-lbs),M_{Aero} (ft-lbs),N_{Aero} (ft-lbs),L_{Aero MRC} (ft-lbs),M_{Aero MRC} (ft-lbs),N_{Aero MRC} (ft-lbs),L_{Prop} (ft-lbs),M_{Prop} (ft-lbs),N_{Prop} (ft-lbs),L_{Gear} (ft-lbs),M_{Gear} (ft-lbs),N_{Gear} (ft-lbs),L_{ext} (ft-lbs),M_{ext} (ft-lbs),N_{ext} (ft-lbs),L_{Buoyant} (ft-lbs),M_{Buoyant} (ft-lbs),N_{Buoyant} (ft-lbs),L_{Total} (ft-lbs),M_{Total} (ft-lbs),N_{Total} (ft-lbs),Altitude ASL (ft),Altitude AGL (ft),Phi (deg),Theta (deg),Psi (deg),Q(1)_{LOCAL},Q(2)_{LOCAL},Q(3)_{LOCAL},Q(4)_{LOCAL},Q(1)_{ECEF},Q(2)_{ECEF},Q(3)_{ECEF},Q(4)_{ECEF},Q(1)_{ECI},Q(2)_{ECI},Q(3)_{ECI},Q(4)_{ECI},Alpha (deg),Beta (deg),Latitude (deg),Latitude Geodetic (deg),Longitude (deg),X_{ECI} (ft),Y_{ECI} (ft),Z_{ECI} (ft),X_{ECEF} (ft),Y_{ECEF} (ft),Z_{ECEF} (ft),Earth Position Angle (deg),Distance AGL (ft),Terrain Elevation (ft) ! 0,15,5.004178074132244,0,-8.10263900353788e-20,0,1.310090756245748,15,5.000000000000003,9.277188200408133e-19,6.659305833e-12,2.129838032e-09,23889.142721,25473.4018355,23889.142721,0,1.177825671990125e-27,-1.026987915512112e-28,5.832687988979451e-15,2112.731095014901,-29.86766496972439,0,0,0,0,0,23889.142721,0,1.177825671990125e-27,0,25473.40183554582,5.304455257482132e-12,-1.177825671990125e-27,23889.142721,5.304455257482132e-12,5.304455257482132e-12,23889.142721,1.177825671990125e-27,0,0,0,0,0,0,-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,800000,800000,1.272221872585407e-14,1.412450015376051e-30,89.99999999999999,0.7071067811865476,7.850462293418875e-17,7.850462293418875e-17,0.7071067811865475,0.5000000000000001,-0.4999999999999999,-0.5,0.5,0.5000000000000001,-0.4999999999999999,-0.5,0.5,2.8249000307521e-30,0,0,0,0,21725646.32546,0,0,21725646.32546,0,0,0,800000,0 ! 1000,15.00135105585869,-2.49519446021413,-4.328390222299518,-3.856740366484797e-05,1.133067759827666,-0.6531815072749935,15,-2.496773423131514,-4.332014836434392,6.66017581e-12,2.130115992e-09,23889.1459035,25473.4048318,8368.641285664105,-21487.36670900797,6241.010089831074,1871.957053491823,2260.482018324725,5272.555026283051,-11.58402855187972,-27.52976776711234,-5.74552867558984e-15,0,0,0,8368.641285664105,-21487.36670900797,6241.010089831074,-23479.46540554903,9879.729651862537,2.048685791125645e-12,-21285.66096052649,10844.90338686323,9.094947017729282e-13,9.094947017729282e-13,23889.14590346123,0.004510667011345504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799997.44631867,799997.44631867,-27.4039937886603,61.5270164038673,132.7097012602469,0.2238392910312795,-0.5368537286754067,0.01285491210495305,0.8133380582714059,-0.04055100250935441,0.7360822672403167,0.6260583285119148,-0.2541446071643247,-0.03125984618681382,0.7127716678001114,0.6524742787468524,-0.2554538846281248,36.714156648326,-64.087372205417,1.0988707476147e-14,-8.5211856759158e-13,63.001447853518,8426183.257463761,20025060.12499995,4.16674223071787e-09,9862746.704788167,19357939.57877273,4.16674223071787e-09,4.1780741322491,799997.44631867,0 ! 2000,15.00001574961106,-2.509293939317621,4.329503155882978,7.663332146067477e-05,-1.133460086430241,-0.6569309281320342,15,-2.506486452504465,4.326408955954371,6.661723879e-12,2.130610604e-09,23889.1515618,25473.4101588,-16093.56479375384,-13115.51291287747,-11818.29326103653,-1528.061671439662,-1864.873210008201,4150.407084759553,20.88207389173337,-21.35456785128186,-4.438075497172693e-15,0,0,0,-16093.56479375384,-13115.51291287747,-11818.29326103653,-18212.78084155637,-17809.80738629781,-3.721971531023441e-12,-19326.01175203879,-14042.67895034736,-7.275957614183426e-12,-9.094947017729282e-12,23889.15156179594,0.003513550947900512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799992.90302316,799992.90302316,47.54440313811053,47.6477182812128,269.6794023499165,-0.4748595251892236,-0.5221337359151274,0.000823273302295977,0.7084377992297186,0.269547324166559,0.6947195587099934,0.6226194252434831,0.2388598461230244,-0.251428481379484,-0.647511395860035,-0.6715796350218806,-0.257863345216945,-143.70833793886,-33.29949381875,8.4881123496532e-15,-6.5820995236189e-13,126.00292055847,-15189540.50573712,15533230.80079537,3.218555855362643e-09,-12770906.24730399,17575760.39631795,3.218555855362643e-09,8.3561482644836,799992.90302316,0 ! 3000,15.00131993505773,4.996281893058801,0.009901573025637503,-0.0001138626736071703,-0.002591967400319293,1.307908354300589,15,5.0000221741512,0.0112147265763317,6.662059565e-12,2.130717857e-09,23889.1527886,25473.4113138,-20590.70414407232,-9776.805383152432,7150.426582207821,-614.800551143762,1871.06828073767,787.9102128524506,27.78203324664033,10.9652801536148,2.317390271963599e-15,0,0,0,-20590.70414407232,-9776.805383152432,7150.426582207821,9352.014440902738,-23694.6092995466,-4.92368266750772e-12,3738.902240117272,-23594.75007274172,-1.818989403545856e-12,-1.364242052659392e-12,23889.15278858369,-0.001773815101842047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799991.91798809,799991.91798809,-11.07490128916223,-23.36464512237748,249.8707502106081,-0.5421547098650872,0.2193365553897161,0.03794356603512889,0.8102592374280067,0.6978008845701283,0.3761258862364684,0.4487550898070083,0.4125798256922913,0.6485919162561872,0.3248902909223838,0.4871325402693129,0.4862887138750622,160.84968594926,-24.158175503257,-4.4321614644086e-15,3.4369156932736e-13,-170.99558737869,-20208541.74074396,-7976101.666715597,-1.680604355689172e-09,-21457897.77603328,-3400291.181425548,-1.680604355689172e-09,12.534222396661,799991.91798809,0 ! 4000,15.00006187607028,-2.487465710102357,-4.341777148250529,0.0001497245514849976,1.136669914998695,-0.6512143141983068,15,-2.487059461535899,-4.3376193318875,6.660772848e-12,2.130306747e-09,23889.1480858,25473.4068864,-2167.236766118066,-23680.98416090326,2281.549963958084,1919.714044697596,430.7469731372756,6294.399503644783,0.6681373509280064,29.86020280446455,6.228115089428322e-15,0,0,0,-2167.236766118066,-23680.98416090326,2281.549963958084,25467.03236688967,-569.8428059153562,-8.12724948501115e-14,22720.68784058633,-7379.819802544997,0,0,23889.14808584389,-0.004895248030656774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799995.6939979,799995.6939979,-75.18656924632209,-84.7258572169812,260.7284900614862,-0.06596539049608514,0.6987443822847341,0.002330287192488559,0.7123197493007092,0.7807348197598848,0.03342517318575409,0.0361531864125741,0.6229196144963012,-0.6819201052270777,-0.02781633434228385,-0.040626920065866,-0.7297675486049044,133.52808793245,-82.430696853566,-1.1911684306176e-14,9.23690668073e-13,-107.99410508874,-486000.7355161212,-21720205.4420006,-4.516719927436794e-09,-6711466.707457749,-20663004.03601376,-4.516719927436794e-09,16.71229652893,799995.6939979,0 ! 5000,15.00125934050147,-2.512670464571232,4.318930505006557,-0.0001839099081360169,-1.130598392726253,-0.6577602843566599,15,-2.51619288291031,4.320791401027397,6.659435174e-12,2.129879357e-09,23889.1431959,25473.4022828,21534.42992576911,-9655.982515728207,-3704.253239491249,-882.1484356819116,-2583.789680918291,1606.926953092991,-27.26374118446574,12.19696231951632,2.493449932666828e-15,0,0,0,21534.42992576911,-9655.982515728207,-3704.253239491249,10402.49289091349,23252.57761010067,4.860902382574014e-12,16890.00942873485,16894.34059475061,3.183231456205249e-12,3.410605131648481e-12,23889.1431958994,-0.002039298394265643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799999.62032295,799999.62032295,21.91526733126884,-18.10476928085179,108.4886631526093,0.5422610922235611,0.2350418164749964,0.06207346297852719,0.8042730491335006,0.6760040873908303,-0.5017958172726383,-0.1596970116333679,0.5154767657944903,0.5713486500677523,-0.4645282269375091,-0.2480235959243339,0.6294907007325956,-9.7602373935786,-23.840980707127,-4.7688905533041e-15,3.6980332789262e-13,-44.992649769116,19831559.24634885,-8872031.876637418,-1.808287252495051e-09,15364322.21798656,-15360380.67703401,-1.808287252495051e-09,20.890370661267,799999.62032295,0 ! 6000,15.00013623481858,5.003354808826074,0.02491886079566794,0.0002159235035670495,-0.00652368916925202,1.309863337156999,15,5.000002059356175,0.02242952061786925,6.659679646e-12,2.129957466e-09,23889.1440897,25473.4031242,18964.70673187772,-9148.789552757802,11284.09294668475,-1005.313100465647,2933.927384685193,4068.324556071126,-21.81634978408954,-20.39912922992639,-4.302072640131325e-15,0,0,0,18964.70673187772,-9148.789552757802,11284.09294668475,-17397.92053896141,18606.62859432258,3.836025691070078e-12,-7385.641838405948,22718.79178061604,5.456968210637569e-12,6.366462912410498e-12,23889.1440896527,0.003306751234958938,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799998.90269347,799998.90269347,-35.1643285170731,37.38888650464747,92.35204145292188,0.5554182227446348,-0.4185774185473342,0.005136354806549084,0.7185242935244032,-0.3582922253291089,0.7332440552734875,0.5101552452881802,-0.271516965178537,-0.290827539538186,0.6050530492745154,0.6571271006833939,-0.3428033304348321,30.752851810909,-22.517679702592,8.228002472765e-15,-6.3803993021456e-13,18.008794315044,15869142.36892688,14838260.71526975,3.119927229872948e-09,20661285.7537417,6716764.96401489,3.119927229872948e-09,25.068444793603,799998.90269347,0 ! 7000,15.00117207884775,-2.47836050397331,-4.339325628587841,-0.0002455011701498103,1.135943945726548,-0.648782584790529,15,-2.477332919566093,-4.343202045092192,6.661207843e-12,2.130445729e-09,23889.1496758,25473.4083832,-10407.25615143544,-21355.53253206165,-2514.303462650765,1486.148035840486,-1436.65166753167,6050.875808730314,10.34102725899938,-28.02037623347151,-5.816544836167225e-15,0,0,0,-10407.25615143544,-21355.53253206165,-2514.303462650765,-23897.88664334028,-8819.611592417867,-1.897805487368745e-12,-23595.70392694686,3732.857943144512,-9.094947017729282e-13,-1.364242052659392e-12,23889.14967577982,0.004615068027078451,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799994.41737654,799994.41737654,46.3092744881594,58.79130599685092,237.2209010310623,-0.2141559284600733,-0.5602426207899837,0.08465116213508916,0.7956755776728059,0.1777568626465331,0.866240796153524,0.4620896041197747,-0.06710125651431818,-0.1889392720182197,-0.7215203017578731,-0.6658140681207397,0.02005074395038628,-166.41808399244,-63.37295265555,1.1124527512282e-14,-8.626506027097e-13,81.010256617718,-7522025.164500506,20381918.53362731,4.218242429365265e-09,3394797.669701398,21458770.10614982,4.218242429365265e-09,29.246518925895,799994.41737654,0 ! 8000,15.000235390097,-2.529977834709281,4.315966748367971,0.000272201227115067,-1.129899724405942,-0.6623362710905002,15,-2.525886723223252,4.315152069433904,6.662153892e-12,2.130747995e-09,23889.1531333,25473.4116383,-23508.91251946399,-2088.627131278651,-3695.985157553594,-324.9605789113635,808.0650377145726,1610.32119935801,29.8377945659109,-1.335964496562509,-1.908513919065336e-16,0,0,0,-23508.91251946399,-2088.627131278651,-3695.985157553594,-1139.410756299762,-25447.91629236607,-5.301966794030258e-12,-14037.72982789547,-19329.60886063642,-5.115907697472721e-12,-5.115907697472721e-12,23889.15313329839,0.0002881185237129102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799991.64120242,799991.64120242,10.70937224460476,9.703036543323027,266.7233573452032,-0.6754177968871818,-0.1250644263952168,0.009789305750451779,0.7266869053391736,0.5500029730749617,0.6468718831520338,0.4231445605174733,0.316231208612494,0.4358339201672498,0.4978665119647808,0.5912896824503256,0.4610360525202591,-171.06530121257,-5.0157703204907,3.6501584270048e-16,-2.8305120924908e-14,144.01174434728,-21703893.61048088,971775.2844206267,1.384081361314969e-10,-17579027.52441171,12766406.55605402,1.384081361314969e-10,33.424593057913,799991.64120242,0 ! 9000,15.00106217477299,4.997780272936517,0.03023974561674327,-0.0002958211201067146,-0.007916123176947407,1.308323124375385,15,4.999956790356745,0.03364428084575364,6.661362318e-12,2.130495085e-09,23889.1502404,25473.4089148,-6881.194145447088,-20188.41076657932,10759.5881454514,-924.93731595929,2817.527026056169,4695.042123447895,12.8038097964306,26.98408527823689,5.669124200823154e-15,0,0,0,-6881.194145447088,-20188.41076657932,10759.5881454514,23014.05886420005,-10920.05752431324,-2.19763944678976e-12,10850.35936281092,-21282.8851640249,-1.818989403545856e-12,-3.637978807091713e-12,23889.15024037462,-0.004390640276596969,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799993.9640418,799993.9640418,-18.23433353310485,-67.40655664629169,228.5688303200521,-0.257674460923019,0.5536162102502876,0.1051682060680402,0.7848901912806475,0.8951040345105022,0.211277638413358,0.2189360343842061,0.3259103247177264,-0.7423059592402229,-0.1294438379322627,-0.2753461829529766,-0.5970013695386676,122.60056861684,-57.681260457499,-1.0842575321811e-14,8.40786624941e-13,-152.98676633577,-9313443.533515317,-19628123.07727984,-4.111330594598171e-09,-19355408.60257846,-9867705.093691016,-4.111330594598171e-09,37.602667189932,799993.9640418,0 ! 10000,15.00035477520698,-2.465458347854025,-4.35233647343426,0.0003159881145573492,1.139412096720541,-0.6454402067825785,15,-2.46759384606589,-4.348762947809036,6.659799945e-12,2.129995902e-09,23889.1445294,25473.4035382,13126.03250556144,-17680.58551727685,-9262.58024406086,966.3250082130227,-1416.427704684984,4073.085873127067,-19.90599910080971,22.26721466921495,4.569901288109688e-15,0,0,0,13126.03250556144,-17680.58551727685,-9262.58024406086,18991.16464177141,16977.33646276895,3.604422462586099e-12,23889.14374427128,6.124867833860208,5.456968210637569e-12,5.456968210637569e-12,23889.14452943948,-0.003708172345341154,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799998.54957217,799998.54957217,51.81814976281711,-56.22184963803007,98.78505786849907,0.3600903854473875,0.5726064331728489,0.0167374319666268,0.7363264529871126,0.8428205637585373,-0.2535249637002919,-0.08984898751092198,0.4661606477704541,0.6211932370870663,-0.2048209113306981,-0.1743448939821138,0.7360510949800427,-35.209275935009,-47.740753769274,-8.7402424404201e-15,6.7776153502168e-13,-89.985301208966,14479558.7453519,-16197099.23955259,-3.314160397082904e-09,5573.546835625544,-21725644.16010691,-3.314160397082904e-09,41.780741321951,799998.54957217,0 --- 1,12 ---- ! Time,P (deg/s),Q (deg/s),R (deg/s),P dot (deg/s^2),Q dot (deg/s^2),R dot (deg/s^2),P_{inertial} (deg/s),Q_{inertial} (deg/s),R_{inertial} (deg/s),q bar (psf),Reynolds Number,V_{Total} (ft/s),V_{Inertial} (ft/s),UBody,VBody,WBody,UdotBody,VdotBody,WdotBody,UdotBody_i,VdotBody_i,WdotBody_i,BodyAccel_X,BodyAccel_Y,BodyAccel_Z,Aero V_{X Body} (ft/s),Aero V_{Y Body} (ft/s),Aero V_{Z Body} (ft/s),V_{X_{inertial}} (ft/s),V_{Y_{inertial}} (ft/s),V_{Z_{inertial}} (ft/s),V_{X_{ecef}} (ft/s),V_{Y_{ecef}} (ft/s),V_{Z_{ecef}} (ft/s),V_{North} (ft/s),V_{East} (ft/s),V_{Down} (ft/s),F_{Drag} (lbs),F_{Side} (lbs),F_{Lift} (lbs),L/D,F_{Aero x} (lbs),F_{Aero y} (lbs),F_{Aero z} (lbs),F_{Prop x} (lbs),F_{Prop y} (lbs),F_{Prop z} (lbs),F_{Gear x} (lbs),F_{Gear y} (lbs),F_{Gear z} (lbs),F_{Ext x} (lbs),F_{Ext y} (lbs),F_{Ext z} (lbs),F_{Buoyant x} (lbs),F_{Buoyant y} (lbs),F_{Buoyant z} (lbs),F_{Weight x} (lbs),F_{Weight y} (lbs),F_{Weight z} (lbs),F_{Total x} (lbs),F_{Total y} (lbs),F_{Total z} (lbs),L_{Aero} (ft-lbs),M_{Aero} (ft-lbs),N_{Aero} (ft-lbs),L_{Aero MRC} (ft-lbs),M_{Aero MRC} (ft-lbs),N_{Aero MRC} (ft-lbs),L_{Prop} (ft-lbs),M_{Prop} (ft-lbs),N_{Prop} (ft-lbs),L_{Gear} (ft-lbs),M_{Gear} (ft-lbs),N_{Gear} (ft-lbs),L_{ext} (ft-lbs),M_{ext} (ft-lbs),N_{ext} (ft-lbs),L_{Buoyant} (ft-lbs),M_{Buoyant} (ft-lbs),N_{Buoyant} (ft-lbs),L_{Total} (ft-lbs),M_{Total} (ft-lbs),N_{Total} (ft-lbs),Altitude ASL (ft),Altitude AGL (ft),Phi (deg),Theta (deg),Psi (deg),Q(1)_{LOCAL},Q(2)_{LOCAL},Q(3)_{LOCAL},Q(4)_{LOCAL},Q(1)_{ECEF},Q(2)_{ECEF},Q(3)_{ECEF},Q(4)_{ECEF},Q(1)_{ECI},Q(2)_{ECI},Q(3)_{ECI},Q(4)_{ECI},Alpha (deg),Beta (deg),Latitude (deg),Latitude Geodetic (deg),Longitude (deg),X_{ECI} (ft),Y_{ECI} (ft),Z_{ECI} (ft),X_{ECEF} (ft),Y_{ECEF} (ft),Z_{ECEF} (ft),Earth Position Angle (deg),Distance AGL (ft),Terrain Elevation (ft) ! 0,15,5.004178074132244,0,-8.10263900353788e-20,0,1.310090756245748,15,5.000000000000003,9.277188200408133e-19,6.659305833e-12,2.129838032e-09,23889.142721,25473.4018355,23889.142721,0,1.177825671990125e-27,-1.026987915512112e-28,5.832687988979451e-15,2112.731095014901,-29.86766496972439,0,0,0,0,0,23889.142721,0,1.177825671990125e-27,0,25473.40183554582,5.304455257482132e-12,-1.177825671990125e-27,23889.142721,5.304455257482132e-12,5.304455257482132e-12,23889.142721,1.177825671990125e-27,0,0,0,0,0,0,-0,0,0,0,0,0,0,0,0,0,0,0,0,-0,1.030637124384881e-14,46.4157696933395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,800000,800000,1.272221872585407e-14,1.412450015376051e-30,89.99999999999999,0.7071067811865476,7.850462293418875e-17,7.850462293418875e-17,0.7071067811865475,0.5000000000000001,-0.4999999999999999,-0.5,0.5,0.5000000000000001,-0.4999999999999999,-0.5,0.5,2.8249000307521e-30,0,0,0,0,21725646.32546,0,0,21725646.32546,0,0,0,800000,0 ! 1000,15.00135105585869,-2.49519446021413,-4.328390222299518,-3.856740366484797e-05,1.133067759827666,-0.6531815072749935,15,-2.496773423131514,-4.332014836434392,6.66017581e-12,2.130115992e-09,23889.1459035,25473.4048318,8368.641285664105,-21487.36670900797,6241.010089831074,1871.957053491823,2260.482018324725,5272.555026283051,-11.58402855187972,-27.52976776711234,-5.74552867558984e-15,0,0,0,8368.641285664105,-21487.36670900797,6241.010089831074,-23479.46540554903,9879.729651862537,2.048685791125645e-12,-21285.66096052649,10844.90338686323,9.094947017729282e-13,9.094947017729282e-13,23889.14590346123,0.004510667011345504,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-40.80142096953121,-10.18488187783229,19.64527726182815,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799997.44631867,799997.44631867,-27.4039937886603,61.5270164038673,132.7097012602469,0.2238392910312795,-0.5368537286754067,0.01285491210495305,0.8133380582714059,-0.04055100250935441,0.7360822672403167,0.6260583285119148,-0.2541446071643247,-0.03125984618681382,0.7127716678001114,0.6524742787468524,-0.2554538846281248,36.714156648326,-64.087372205417,1.0988707476147e-14,1.1060021106221e-14,63.001447853518,8426183.257463761,20025060.12499995,4.16674223071787e-09,9862746.704788167,19357939.57877273,4.16674223071787e-09,4.1780741322491,799997.44631867,0 ! 2000,15.00001574961106,-2.509293939317621,4.329503155882978,7.663332146067477e-05,-1.133460086430241,-0.6569309281320342,15,-2.506486452504465,4.326408955954371,6.661723879e-12,2.130610604e-09,23889.1515618,25473.4101588,-16093.56479375384,-13115.51291287747,-11818.29326103653,-1528.061671439662,-1864.873210008201,4150.407084759553,20.88207389173337,-21.35456785128186,-4.438075497172693e-15,0,0,0,-16093.56479375384,-13115.51291287747,-11818.29326103653,-18212.78084155637,-17809.80738629781,-3.721971531023441e-12,-19326.01175203879,-14042.67895034736,-7.275957614183426e-12,-9.094947017729282e-12,23889.15156179594,0.003513550947900512,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-34.30205005467011,23.07082636230805,21.10764857950889,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799992.90302316,799992.90302316,47.54440313811053,47.6477182812128,269.6794023499165,-0.4748595251892236,-0.5221337359151274,0.000823273302295977,0.7084377992297186,0.269547324166559,0.6947195587099934,0.6226194252434831,0.2388598461230244,-0.251428481379484,-0.647511395860035,-0.6715796350218806,-0.257863345216945,-143.70833793886,-33.29949381875,8.4881123496532e-15,8.5431978301656e-15,126.00292055847,-15189540.50573712,15533230.80079537,3.218555855362643e-09,-12770906.24730399,17575760.39631795,3.218555855362643e-09,8.3561482644836,799992.90302316,0 ! 3000,15.00131993505773,4.996281893058801,0.009901573025637503,-0.0001138626736071703,-0.002591967400319293,1.307908354300589,15,5.0000221741512,0.0112147265763317,6.662059565e-12,2.130717857e-09,23889.1527886,25473.4113138,-20590.70414407232,-9776.805383152432,7150.426582207821,-614.800551143762,1871.06828073767,787.9102128524506,27.78203324664033,10.9652801536148,2.317390271963599e-15,0,0,0,-20590.70414407232,-9776.805383152432,7150.426582207821,9352.014440902738,-23694.6092995466,-4.92368266750772e-12,3738.902240117272,-23594.75007274172,-1.818989403545856e-12,-1.364242052659392e-12,23889.15278858369,-0.001773815101842047,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18.40764957662257,-8.184983504457279,41.81616157608662,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799991.91798809,799991.91798809,-11.07490128916223,-23.36464512237748,249.8707502106081,-0.5421547098650872,0.2193365553897161,0.03794356603512889,0.8102592374280067,0.6978008845701283,0.3761258862364684,0.4487550898070083,0.4125798256922913,0.6485919162561872,0.3248902909223838,0.4871325402693129,0.4862887138750622,160.84968594926,-24.158175503257,-4.4321614644086e-15,-4.4609249568153e-15,-170.99558737869,-20208541.74074396,-7976101.666715597,-1.680604355689172e-09,-21457897.77603328,-3400291.181425548,-1.680604355689172e-09,12.534222396661,799991.91798809,0 ! 4000,15.00006187607028,-2.487465710102357,-4.341777148250529,0.0001497245514849976,1.136669914998695,-0.6512143141983068,15,-2.487059461535899,-4.3376193318875,6.660772848e-12,2.130306747e-09,23889.1480858,25473.4068864,-2167.236766118066,-23680.98416090326,2281.549963958084,1919.714044697596,430.7469731372756,6294.399503644783,0.6681373509280064,29.86020280446455,6.228115089428322e-15,0,0,0,-2167.236766118066,-23680.98416090326,2281.549963958084,25467.03236688967,-569.8428059153562,-8.12724948501115e-14,22720.68784058633,-7379.819802544997,0,0,23889.14808584389,-0.004895248030656774,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46.21927681067139,-4.124788810387773,1.090850669120694,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799995.6939979,799995.6939979,-75.18656924632209,-84.7258572169812,260.7284900614862,-0.06596539049608514,0.6987443822847341,0.002330287192488559,0.7123197493007092,0.7807348197598848,0.03342517318575409,0.0361531864125741,0.6229196144963012,-0.6819201052270777,-0.02781633434228385,-0.040626920065866,-0.7297675486049044,133.52808793245,-82.430696853566,-1.1911684306176e-14,-1.1988987803331e-14,-107.99410508874,-486000.7355161212,-21720205.4420006,-4.516719927436794e-09,-6711466.707457749,-20663004.03601376,-4.516719927436794e-09,16.71229652893,799995.6939979,0 ! 5000,15.00125934050147,-2.512670464571232,4.318930505006557,-0.0001839099081360169,-1.130598392726253,-0.6577602843566599,15,-2.51619288291031,4.320791401027397,6.659435174e-12,2.129879357e-09,23889.1431959,25473.4022828,21534.42992576911,-9655.982515728207,-3704.253239491249,-882.1484356819116,-2583.789680918291,1606.926953092991,-27.26374118446574,12.19696231951632,2.493449932666828e-15,0,0,0,21534.42992576911,-9655.982515728207,-3704.253239491249,10402.49289091349,23252.57761010067,4.860902382574014e-12,16890.00942873485,16894.34059475061,3.183231456205249e-12,3.410605131648481e-12,23889.1431958994,-0.002039298394265643,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,14.42395850539936,16.46627758984268,40.9296341349779,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799999.62032295,799999.62032295,21.91526733126884,-18.10476928085179,108.4886631526093,0.5422610922235611,0.2350418164749964,0.06207346297852719,0.8042730491335006,0.6760040873908303,-0.5017958172726383,-0.1596970116333679,0.5154767657944903,0.5713486500677523,-0.4645282269375091,-0.2480235959243339,0.6294907007325956,-9.7602373935786,-23.840980707127,-4.7688905533041e-15,-4.7998393125887e-15,-44.992649769116,19831559.24634885,-8872031.876637418,-1.808287252495051e-09,15364322.21798656,-15360380.67703401,-1.808287252495051e-09,20.890370661267,799999.62032295,0 ! 6000,15.00013623481858,5.003354808826074,0.02491886079566794,0.0002159235035670495,-0.00652368916925202,1.309863337156999,15,5.000002059356175,0.02242952061786925,6.659679646e-12,2.129957466e-09,23889.1440897,25473.4031242,18964.70673187772,-9148.789552757802,11284.09294668475,-1005.313100465647,2933.927384685193,4068.324556071126,-21.81634978408954,-20.39912922992639,-4.302072640131325e-15,0,0,0,18964.70673187772,-9148.789552757802,11284.09294668475,-17397.92053896141,18606.62859432258,3.836025691070078e-12,-7385.641838405948,22718.79178061604,5.456968210637569e-12,6.366462912410498e-12,23889.1440896527,0.003306751234958938,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-28.18466719561724,-21.2393877213775,30.14858299208833,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799998.90269347,799998.90269347,-35.1643285170731,37.38888650464747,92.35204145292188,0.5554182227446348,-0.4185774185473342,0.005136354806549084,0.7185242935244032,-0.3582922253291089,0.7332440552734875,0.5101552452881802,-0.271516965178537,-0.290827539538186,0.6050530492745154,0.6571271006833939,-0.3428033304348321,30.752851810909,-22.517679702592,8.228002472765e-15,8.2813998979192e-15,18.008794315044,15869142.36892688,14838260.71526975,3.119927229872948e-09,20661285.7537417,6716764.96401489,3.119927229872948e-09,25.068444793603,799998.90269347,0 ! 7000,15.00117207884775,-2.47836050397331,-4.339325628587841,-0.0002455011701498103,1.135943945726548,-0.648782584790529,15,-2.477332919566093,-4.343202045092192,6.661207843e-12,2.130445729e-09,23889.1496758,25473.4083832,-10407.25615143544,-21355.53253206165,-2514.303462650765,1486.148035840486,-1436.65166753167,6050.875808730314,10.34102725899938,-28.02037623347151,-5.816544836167225e-15,0,0,0,-10407.25615143544,-21355.53253206165,-2514.303462650765,-23897.88664334028,-8819.611592417867,-1.897805487368745e-12,-23595.70392694686,3732.857943144512,-9.094947017729282e-13,-1.364242052659392e-12,23889.14967577982,0.004615068027078451,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-39.69876197267538,17.39052563491842,16.61336239113385,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799994.41737654,799994.41737654,46.3092744881594,58.79130599685092,237.2209010310623,-0.2141559284600733,-0.5602426207899837,0.08465116213508916,0.7956755776728059,0.1777568626465331,0.866240796153524,0.4620896041197747,-0.06710125651431818,-0.1889392720182197,-0.7215203017578731,-0.6658140681207397,0.02005074395038628,-166.41808399244,-63.37295265555,1.1124527512282e-14,1.1196722586434e-14,81.010256617718,-7522025.164500506,20381918.53362731,4.218242429365265e-09,3394797.669701398,21458770.10614982,4.218242429365265e-09,29.246518925895,799994.41737654,0 ! 8000,15.000235390097,-2.529977834709281,4.315966748367971,0.000272201227115067,-1.129899724405942,-0.6623362710905002,15,-2.525886723223252,4.315152069433904,6.662153892e-12,2.130747995e-09,23889.1531333,25473.4116383,-23508.91251946399,-2088.627131278651,-3695.985157553594,-324.9605789113635,808.0650377145726,1610.32119935801,29.8377945659109,-1.335964496562509,-1.908513919065336e-16,0,0,0,-23508.91251946399,-2088.627131278651,-3695.985157553594,-1139.410756299762,-25447.91629236607,-5.301966794030258e-12,-14037.72982789547,-19329.60886063642,-5.115907697472721e-12,-5.115907697472721e-12,23889.15313329839,0.0002881185237129102,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-7.822995015042221,8.501936638066667,44.95491985548905,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799991.64120242,799991.64120242,10.70937224460476,9.703036543323027,266.7233573452032,-0.6754177968871818,-0.1250644263952168,0.009789305750451779,0.7266869053391736,0.5500029730749617,0.6468718831520338,0.4231445605174733,0.316231208612494,0.4358339201672498,0.4978665119647808,0.5912896824503256,0.4610360525202591,-171.06530121257,-5.0157703204907,3.6501584270048e-16,3.6738469379916e-16,144.01174434728,-21703893.61048088,971775.2844206267,1.384081361314969e-10,-17579027.52441171,12766406.55605402,1.384081361314969e-10,33.424593057913,799991.64120242,0 ! 9000,15.00106217477299,4.997780272936517,0.03023974561674327,-0.0002958211201067146,-0.007916123176947407,1.308323124375385,15,4.999956790356745,0.03364428084575364,6.661362318e-12,2.130495085e-09,23889.1502404,25473.4089148,-6881.194145447088,-20188.41076657932,10759.5881454514,-924.93731595929,2817.527026056169,4695.042123447895,12.8038097964306,26.98408527823689,5.669124200823154e-15,0,0,0,-6881.194145447088,-20188.41076657932,10759.5881454514,23014.05886420005,-10920.05752431324,-2.19763944678976e-12,10850.35936281092,-21282.8851640249,-1.818989403545856e-12,-3.637978807091713e-12,23889.15024037462,-0.004390640276596969,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42.85357760282639,-5.579853057981528,16.9370068353708,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799993.9640418,799993.9640418,-18.23433353310485,-67.40655664629169,228.5688303200521,-0.257674460923019,0.5536162102502876,0.1051682060680402,0.7848901912806475,0.8951040345105022,0.211277638413358,0.2189360343842061,0.3259103247177264,-0.7423059592402229,-0.1294438379322627,-0.2753461829529766,-0.5970013695386676,122.60056861684,-57.681260457499,-1.0842575321811e-14,-1.0912940606533e-14,-152.98676633577,-9313443.533515317,-19628123.07727984,-4.111330594598171e-09,-19355408.60257846,-9867705.093691016,-4.111330594598171e-09,37.602667189932,799993.9640418,0 ! 10000,15.00035477520698,-2.465458347854025,-4.35233647343426,0.0003159881145573492,1.139412096720541,-0.6454402067825785,15,-2.46759384606589,-4.348762947809036,6.659799945e-12,2.129995902e-09,23889.1445294,25473.4035382,13126.03250556144,-17680.58551727685,-9262.58024406086,966.3250082130227,-1416.427704684984,4073.085873127067,-19.90599910080971,22.26721466921495,4.569901288109688e-15,0,0,0,13126.03250556144,-17680.58551727685,-9262.58024406086,18991.16464177141,16977.33646276895,3.604422462586099e-12,23889.14374427128,6.124867833860208,5.456968210637569e-12,5.456968210637569e-12,23889.14452943948,-0.003708172345341154,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38.58063284649973,20.28502018037545,15.95233455838741,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,799998.54957217,799998.54957217,51.81814976281711,-56.22184963803007,98.78505786849907,0.3600903854473875,0.5726064331728489,0.0167374319666268,0.7363264529871126,0.8428205637585373,-0.2535249637002919,-0.08984898751092198,0.4661606477704541,0.6211932370870663,-0.2048209113306981,-0.1743448939821138,0.7360510949800427,-35.209275935009,-47.740753769274,-8.7402424404201e-15,-8.796964160026e-15,-89.985301208966,14479558.7453519,-16197099.23955259,-3.314160397082904e-09,5573.546835625544,-21725644.16010691,-3.314160397082904e-09,41.780741321951,799998.54957217,0 |
|
From: Bertrand <bco...@us...> - 2016-05-22 10:28:26
|
Update of /cvsroot/jsbsim/JSBSim/src/models In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10030/src/models Modified Files: FGAccelerations.cpp FGAccelerations.h Log Message: Fixed the forces and moments output to include the friction with the ground. Also added the output of the weight components in the body frame. Index: FGAccelerations.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGAccelerations.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -r1.28 -r1.29 *** FGAccelerations.cpp 16 Apr 2016 12:24:39 -0000 1.28 --- FGAccelerations.cpp 22 May 2016 10:28:23 -0000 1.29 *************** *** 368,371 **** --- 368,374 ---- PropertyManager->Tie("simulation/gravity-model", &gravType); PropertyManager->Tie("simulation/gravitational-torque", &gravTorque); + PropertyManager->Tie("forces/fbx-weight-lbs", this, eX, (PMF)&FGAccelerations::GetWeight); + PropertyManager->Tie("forces/fby-weight-lbs", this, eY, (PMF)&FGAccelerations::GetWeight); + PropertyManager->Tie("forces/fbz-weight-lbs", this, eZ, (PMF)&FGAccelerations::GetWeight); PropertyManager->Tie("forces/fbx-total-lbs", this, eX, (PMF)&FGAccelerations::GetForces); Index: FGAccelerations.h =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGAccelerations.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -r1.19 -r1.20 *** FGAccelerations.h 16 Apr 2016 12:24:39 -0000 1.19 --- FGAccelerations.h 22 May 2016 10:28:23 -0000 1.20 *************** *** 267,270 **** --- 267,271 ---- */ double GetMoments(int idx) const { return in.Moment(idx) + vFrictionMoments(idx); } + FGColumnVector3 GetMoments(void) const { return in.Moment + vFrictionMoments; } /** Retrieves the total forces applied on the body. *************** *** 280,283 **** --- 281,285 ---- */ double GetForces(int idx) const { return in.Force(idx) + vFrictionForces(idx); } + FGColumnVector3 GetForces(void) const { return in.Force + vFrictionForces; } /** Retrieves the ground moments applied on the body. *************** *** 293,309 **** */ double GetGroundMoments(int idx) const { return in.GroundMoment(idx) + vFrictionMoments(idx); } /** Retrieves the ground forces applied on the body. Retrieves the ground forces applied on the body. This does include the ground normal reaction and friction forces. ! The vector for the total moments in the body frame is organized (Fx, Fy , Fz). The vector is 1-based. In other words, GetGroundForces(1) returns Fx. Various convenience enumerators are defined in FGJSBBase. The relevant enumerators for the forces returned by this call are, eX=1, eY=2, eZ=3. ! units lbs @param idx the index of the forces component desired (1-based). @return The ground forces applied on the body. */ double GetGroundForces(int idx) const { return in.GroundForce(idx) + vFrictionForces(idx); } /** Initializes the FGAccelerations class prior to a new execution. --- 295,327 ---- */ double GetGroundMoments(int idx) const { return in.GroundMoment(idx) + vFrictionMoments(idx); } + FGColumnVector3 GetGroundMoments(void) const { return in.GroundMoment + vFrictionMoments; } /** Retrieves the ground forces applied on the body. Retrieves the ground forces applied on the body. This does include the ground normal reaction and friction forces. ! The vector for the ground forces in the body frame is organized (Fx, Fy , Fz). The vector is 1-based. In other words, GetGroundForces(1) returns Fx. Various convenience enumerators are defined in FGJSBBase. The relevant enumerators for the forces returned by this call are, eX=1, eY=2, eZ=3. ! units lbs. @param idx the index of the forces component desired (1-based). @return The ground forces applied on the body. */ double GetGroundForces(int idx) const { return in.GroundForce(idx) + vFrictionForces(idx); } + FGColumnVector3 GetGroundForces(void) const { return in.GroundForce + vFrictionForces; } + + /** Retrieves the weight applied on the body. + Retrieves the weight applied on the body i.e. the force that results from + the gravity applied to the body mass. + The vector for the weight forces in the body frame is organized (Fx, Fy , + Fz). The vector is 1-based. In other words, GetWeight(1) returns + Fx. Various convenience enumerators are defined in FGJSBBase. The relevant + enumerators for the forces returned by this call are, eX=1, eY=2, eZ=3. + units lbs. + @param idx the index of the forces component desired (1-based). + @return The ground forces applied on the body. + */ + double GetWeight(int idx) const { return in.Mass * (in.Ti2b * vGravAccel)(idx); } + FGColumnVector3 GetWeight(void) const { return in.Mass * in.Ti2b * vGravAccel; } /** Initializes the FGAccelerations class prior to a new execution. |
|
From: Bertrand <bco...@us...> - 2016-05-22 10:28:26
|
Update of /cvsroot/jsbsim/JSBSim/src/input_output In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10030/src/input_output Modified Files: FGOutputTextFile.cpp Log Message: Fixed the forces and moments output to include the friction with the ground. Also added the output of the weight components in the body frame. Index: FGOutputTextFile.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/input_output/FGOutputTextFile.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** FGOutputTextFile.cpp 17 Feb 2014 05:02:38 -0000 1.11 --- FGOutputTextFile.cpp 22 May 2016 10:28:23 -0000 1.12 *************** *** 159,162 **** --- 159,163 ---- outstream << "F_{Ext x} (lbs)" + delimeter + "F_{Ext y} (lbs)" + delimeter + "F_{Ext z} (lbs)" + delimeter; outstream << "F_{Buoyant x} (lbs)" + delimeter + "F_{Buoyant y} (lbs)" + delimeter + "F_{Buoyant z} (lbs)" + delimeter; + outstream << "F_{Weight x} (lbs)" + delimeter + "F_{Weight y} (lbs)" + delimeter + "F_{Weight z} (lbs)" + delimeter; outstream << "F_{Total x} (lbs)" + delimeter + "F_{Total y} (lbs)" + delimeter + "F_{Total z} (lbs)"; } *************** *** 316,323 **** outstream << Aerodynamics->GetForces().Dump(delimeter) << delimeter; outstream << Propulsion->GetForces().Dump(delimeter) << delimeter; ! outstream << GroundReactions->GetForces().Dump(delimeter) << delimeter; outstream << ExternalReactions->GetForces().Dump(delimeter) << delimeter; outstream << BuoyantForces->GetForces().Dump(delimeter) << delimeter; ! outstream << Aircraft->GetForces().Dump(delimeter); } if (SubSystems & ssMoments) { --- 317,325 ---- outstream << Aerodynamics->GetForces().Dump(delimeter) << delimeter; outstream << Propulsion->GetForces().Dump(delimeter) << delimeter; ! outstream << Accelerations->GetGroundForces().Dump(delimeter) << delimeter; outstream << ExternalReactions->GetForces().Dump(delimeter) << delimeter; outstream << BuoyantForces->GetForces().Dump(delimeter) << delimeter; ! outstream << Accelerations->GetWeight().Dump(delimeter) << delimeter; ! outstream << Accelerations->GetForces().Dump(delimeter); } if (SubSystems & ssMoments) { *************** *** 326,333 **** outstream << Aerodynamics->GetMomentsMRC().Dump(delimeter) << delimeter; outstream << Propulsion->GetMoments().Dump(delimeter) << delimeter; ! outstream << GroundReactions->GetMoments().Dump(delimeter) << delimeter; outstream << ExternalReactions->GetMoments().Dump(delimeter) << delimeter; outstream << BuoyantForces->GetMoments().Dump(delimeter) << delimeter; ! outstream << Aircraft->GetMoments().Dump(delimeter); } if (SubSystems & ssAtmosphere) { --- 328,335 ---- outstream << Aerodynamics->GetMomentsMRC().Dump(delimeter) << delimeter; outstream << Propulsion->GetMoments().Dump(delimeter) << delimeter; ! outstream << Accelerations->GetGroundMoments().Dump(delimeter) << delimeter; outstream << ExternalReactions->GetMoments().Dump(delimeter) << delimeter; outstream << BuoyantForces->GetMoments().Dump(delimeter) << delimeter; ! outstream << Accelerations->GetMoments().Dump(delimeter); } if (SubSystems & ssAtmosphere) { |
|
From: Bertrand <bco...@us...> - 2016-05-22 09:08:08
|
Update of /cvsroot/jsbsim/JSBSim/src/math In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6623/src/math Modified Files: FGTable.cpp Log Message: Now display information about where the error was found. Index: FGTable.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/math/FGTable.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** FGTable.cpp 13 Jan 2014 10:46:03 -0000 1.31 --- FGTable.cpp 22 May 2016 09:08:05 -0000 1.32 *************** *** 179,182 **** --- 179,183 ---- if (node == 0) { + cerr << axisElement->ReadFrom(); throw("IndependentVar property, " + property_string + " in Table definition is not defined."); } |
|
From: Bertrand <bco...@us...> - 2016-05-21 11:45:25
|
Update of /cvsroot/jsbsim/JSBSim/src/models In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17703/src/models Modified Files: FGAuxiliary.cpp Log Message: Fixed a divide-by-zero error when computing Vtdot Index: FGAuxiliary.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGAuxiliary.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -r1.71 -r1.72 *** FGAuxiliary.cpp 10 Jan 2016 12:12:59 -0000 1.71 --- FGAuxiliary.cpp 21 May 2016 11:45:22 -0000 1.72 *************** *** 161,165 **** double AeroW2 = vAeroUVW(eW)*vAeroUVW(eW); double mUW = AeroU2 + AeroW2; - double Vtdot = (vAeroUVW(eU)*in.vUVWdot(eU) + vAeroUVW(eV)*in.vUVWdot(eV) + vAeroUVW(eW)*in.vUVWdot(eW))/Vt; double Vt2 = Vt*Vt; --- 161,164 ---- *************** *** 175,178 **** --- 174,178 ---- if ( mUW >= 0.001 ) { + double Vtdot = (vAeroUVW(eU)*in.vUVWdot(eU) + vAeroUVW(eV)*in.vUVWdot(eV) + vAeroUVW(eW)*in.vUVWdot(eW))/Vt; adot = (vAeroUVW(eU)*in.vUVWdot(eW) - vAeroUVW(eW)*in.vUVWdot(eU))/mUW; // bdot = (signU*mUW*in.vUVWdot(eV) |
|
From: Erik H. <eh...@us...> - 2016-05-20 14:14:08
|
Update of /cvsroot/jsbsim/JSBSim/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4576/src Modified Files: JSBSim.cpp Log Message: only detect fp exceptions for devide-by-zero and invalid, skip overflow and underflow Index: JSBSim.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/JSBSim.cpp,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -r1.88 -r1.89 *** JSBSim.cpp 20 May 2016 12:34:58 -0000 1.88 --- JSBSim.cpp 20 May 2016 14:14:05 -0000 1.89 *************** *** 289,293 **** _MCW_EM); #elif defined(__GNUC__) && !defined(sgi) ! feenableexcept(FE_ALL_EXCEPT & ~FE_INEXACT); #endif --- 289,293 ---- _MCW_EM); #elif defined(__GNUC__) && !defined(sgi) ! feenableexcept(FE_DIVBYZERO | FE_INVALID); #endif |
|
From: Erik H. <eh...@us...> - 2016-05-20 12:35:01
|
Update of /cvsroot/jsbsim/JSBSim/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32386 Modified Files: JSBSim.cpp Log Message: Detect floating point exceptions in standalone mode for easier debugging Index: JSBSim.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/JSBSim.cpp,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -r1.87 -r1.88 *** JSBSim.cpp 24 Nov 2015 13:06:24 -0000 1.87 --- JSBSim.cpp 20 May 2016 12:34:58 -0000 1.88 *************** *** 50,53 **** --- 50,59 ---- #endif + #if defined(_MSC_VER) + # include <float.h> + #elif defined(__GNUC__) && !defined(sgi) + # include <fenv.h> + #endif + #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) # define WIN32_LEAN_AND_MEAN *************** *** 278,281 **** --- 284,295 ---- int main(int argc, char* argv[]) { + #if defined(_MSC_VER) + _clearfp(); + _controlfp(_controlfp(0, 0) & ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW), + _MCW_EM); + #elif defined(__GNUC__) && !defined(sgi) + feenableexcept(FE_ALL_EXCEPT & ~FE_INEXACT); + #endif + try { real_main(argc, argv); |
|
From: Erik H. <eh...@us...> - 2016-05-19 14:37:25
|
Update of /cvsroot/jsbsim/JSBSim/aircraft/paraglider In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6740 Modified Files: paraglider.xml Log Message: Fix the problem where the paraglider spins out of control with full aileron and the engine on Index: paraglider.xml =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/aircraft/paraglider/paraglider.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** paraglider.xml 18 May 2016 13:22:47 -0000 1.12 --- paraglider.xml 19 May 2016 14:37:22 -0000 1.13 *************** *** 150,154 **** <x> 8.00 </x> <y> 0.00 </y> ! <z> -250.00 </z> </location> <capacity unit="LBS"> 3.5 </capacity> --- 150,154 ---- <x> 8.00 </x> <y> 0.00 </y> ! <z> -330.00 </z> </location> <capacity unit="LBS"> 3.5 </capacity> *************** *** 493,497 **** <property>metrics/Sp-sqft</property> <property>metrics/bp-ft</property> ! <value>-0.5</value> </product> </function> --- 493,497 ---- <property>metrics/Sp-sqft</property> <property>metrics/bp-ft</property> ! <value>2</value> </product> </function> |
