Menu
▾
▴
[Jsbsim-cvslogs] CVS: JSBSim FGAircraft.cpp,1.132,1.133 FGAuxiliary.cpp,1.53,1.54 FGAuxiliary.h,1.42,1.43 FGInertial.cpp,1.36,1.37 FGJSBBase.h,1.51,1.52 FGModel.cpp,1.29,1.30 FGOutput.cpp,1.85,1.86 FGPropagate.cpp,1.8,1.9 FGPropagate.h,1.8,1.9 FGPropulsion.cpp,1.98,1.99 FGState.cpp,1.135,1.136 JSBSim.cbx,1.4,1.5 JSBSim.cxx,1.169,1.170 Makefile.am,1.27,1.28 Makefile.solo,1.62,1.63 makemake.pl,1.22,1.23 FGTurbine.cpp,1.6,NONE FGTurbine.h,1.7,NONE
|
From: Jon S. B. <jb...@us...> - 2004-04-24 17:13:16
|
Update of /cvsroot/jsbsim/JSBSim In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9733 Modified Files: FGAircraft.cpp FGAuxiliary.cpp FGAuxiliary.h FGInertial.cpp FGJSBBase.h FGModel.cpp FGOutput.cpp FGPropagate.cpp FGPropagate.h FGPropulsion.cpp FGState.cpp JSBSim.cbx JSBSim.cxx Makefile.am Makefile.solo makemake.pl Removed Files: FGTurbine.cpp FGTurbine.h Log Message: Changes to the Propagate mode - removed VRP items to FGAuxiliary, etc.; removed FGTurbine Index: FGAircraft.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGAircraft.cpp,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -r1.132 -r1.133 *** FGAircraft.cpp 17 Apr 2004 21:21:26 -0000 1.132 --- FGAircraft.cpp 24 Apr 2004 17:12:57 -0000 1.133 *************** *** 230,234 **** *AC_cfg >> vXYZvrp(eX) >> vXYZvrp(eY) >> vXYZvrp(eZ); if (debug_lvl > 0) cout << " Visual Ref Pt (x, y, z): " << vXYZvrp << endl; ! Propagate->SetVRP(vXYZvrp); } else if (parameter == "AC_POINTMASS") { *AC_cfg >> pmWt >> pmX >> pmY >> pmZ; --- 230,234 ---- *AC_cfg >> vXYZvrp(eX) >> vXYZvrp(eY) >> vXYZvrp(eZ); if (debug_lvl > 0) cout << " Visual Ref Pt (x, y, z): " << vXYZvrp << endl; ! Auxiliary->SetVRP(vXYZvrp); } else if (parameter == "AC_POINTMASS") { *AC_cfg >> pmWt >> pmX >> pmY >> pmZ; Index: FGAuxiliary.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGAuxiliary.cpp,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -r1.53 -r1.54 *** FGAuxiliary.cpp 17 Apr 2004 21:21:26 -0000 1.53 --- FGAuxiliary.cpp 24 Apr 2004 17:12:57 -0000 1.54 *************** *** 83,86 **** --- 83,88 ---- vAeroPQR.InitMatrix(); vEulerRates.InitMatrix(); + LongitudeVRP = LatitudeVRP = 0.0; + vVRPoffset.InitMatrix(); bind(); *************** *** 102,109 **** { double A,B,D, hdot_Vt; ! FGColumnVector3& vPQR = Propagate->GetPQR(); ! FGColumnVector3& vUVW = Propagate->GetUVW(); ! FGColumnVector3& vUVWdot = Propagate->GetUVWdot(); ! FGColumnVector3& vVel = Propagate->GetVel(); if (!FGModel::Run()) --- 104,111 ---- { double A,B,D, hdot_Vt; ! const FGColumnVector3& vPQR = Propagate->GetPQR(); ! const FGColumnVector3& vUVW = Propagate->GetUVW(); ! const FGColumnVector3& vUVWdot = Propagate->GetUVWdot(); ! const FGColumnVector3& vVel = Propagate->GetVel(); if (!FGModel::Run()) *************** *** 218,221 **** --- 220,237 ---- earthPosAngle += State->Getdt()*Inertial->omega(); + const FGColumnVector3& vLocation = Propagate->GetLocation(); + vVRPoffset = Propagate->GetTb2l() * MassBalance->StructuralToBody(Aircraft->GetXYZvrp()); + + // vVRP - the vector to the Visual Reference Point - now contains the + // offset from the CG to the VRP, in units of feet, in the Local coordinate + // frame, where X points north, Y points East, and Z points down. This needs + // to be converted to Lat/Lon/Alt, now. + + if (cos(vLocation(eLat)) != 0) + vLocationVRP(eLong) = vVRPoffset(eEast) / (vLocation(eRad) * cos(vLocation(eLat))) + vLocation(eLong); + + vLocationVRP(eLat) = vVRPoffset(eNorth) / vLocation(eRad) + vLocation(eLat); + vLocationVRP(eRad) = Propagate->Geth() - vVRPoffset(eDown); // this is really a height, not a radius + return false; } else { Index: FGAuxiliary.h =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGAuxiliary.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -r1.42 -r1.43 *** FGAuxiliary.h 6 Apr 2004 13:44:01 -0000 1.42 --- FGAuxiliary.h 24 Apr 2004 17:12:57 -0000 1.43 *************** *** 111,114 **** --- 111,115 ---- @param Executive a pointer to the parent executive object */ FGAuxiliary(FGFDMExec* Executive); + /// Destructor ~FGAuxiliary(); *************** *** 118,185 **** bool Run(void); ! // Use FGInitialCondition to set these speeds ! inline double GetVcalibratedFPS(void) const { return vcas; } ! inline double GetVcalibratedKTS(void) const { return vcas*fpstokts; } ! inline double GetVequivalentFPS(void) const { return veas; } ! inline double GetVequivalentKTS(void) const { return veas*fpstokts; } ! inline double GetTotalTemperature(void) const { return tat; } ! inline double GetTAT_C(void) const { return tatc; } // total pressure above is freestream total pressure for subsonic only // for supersonic it is the 1D total pressure behind a normal shock ! inline double GetTotalPressure(void) const { return pt; } ! ! inline FGColumnVector3& GetPilotAccel(void) { return vPilotAccel; } ! inline double GetPilotAccel(int idx) const { return vPilotAccel(idx); } ! FGColumnVector3 GetNpilot(void) const { return vPilotAccelN; } ! double GetNpilot(int idx) const { return vPilotAccelN(idx); } ! inline FGColumnVector3& GetAeroPQR(void) {return vAeroPQR;} ! inline double GetAeroPQR(int axis) const {return vAeroPQR(axis);} ! FGColumnVector3& GetEulerRates(void) { return vEulerRates; } double GetEulerRates(int axis) const { return vEulerRates(axis); } ! inline FGColumnVector3& GetAeroUVW (void) { return vAeroUVW; } ! inline double GetAeroUVW (int idx) const { return vAeroUVW(idx); } ! double Getalpha(void) const { return alpha; } ! double Getbeta (void) const { return beta; } ! inline double GetMagBeta(void) const { return fabs(beta); } ! double Getqbar (void) const { return qbar; } ! double GetqbarUW (void) const { return qbarUW; } ! double GetqbarUV (void) const { return qbarUV; } ! inline double GetVt (void) const { return Vt; } ! inline double GetVground(void) const { return Vground; } ! double GetMach (void) const { return Mach; } ! inline double GetMachU(void) const { return MachU; } ! double Getadot (void) const { return adot; } ! double Getbdot (void) const { return bdot; } void SetAeroUVW(FGColumnVector3 tt) { vAeroUVW = tt; } ! inline void Setalpha(double tt) { alpha = tt; } ! inline void Setbeta (double tt) { beta = tt; } ! inline void Setqbar (double tt) { qbar = tt; } ! inline void SetqbarUW (double tt) { qbarUW = tt; } ! inline void SetqbarUV (double tt) { qbarUV = tt; } ! inline void SetVt (double tt) { Vt = tt; } ! inline void SetMach (double tt) { Mach=tt; } ! inline void Setadot (double tt) { adot = tt; } ! inline void Setbdot (double tt) { bdot = tt; } ! ! inline void SetAB(double t1, double t2) { alpha=t1; beta=t2; } ! inline double GetEarthPositionAngle(void) const { return earthPosAngle; } ! ! inline double GetGamma(void) const { return gamma; } ! inline void SetGamma(double tt) { gamma = tt; } ! inline double GetGroundTrack(void) const { return psigt; } ! ! inline void SetDayOfYear(int doy) { day_of_year = doy; } ! inline int GetDayOfYear(void) const { return day_of_year; } ! inline void SetSecondsInDay(double sid) { seconds_in_day = sid; } ! inline double GetSecondsInDay(void) const { return seconds_in_day; } ! double GetHeadWind(void); ! double GetCrossWind(void); void bind(void); --- 119,195 ---- bool Run(void); ! // GET functions ! // Atmospheric parameters GET functions ! double GetVcalibratedFPS(void) const { return vcas; } ! double GetVcalibratedKTS(void) const { return vcas*fpstokts; } ! double GetVequivalentFPS(void) const { return veas; } ! double GetVequivalentKTS(void) const { return veas*fpstokts; } // total pressure above is freestream total pressure for subsonic only // for supersonic it is the 1D total pressure behind a normal shock ! double GetTotalPressure(void) const { return pt; } ! double GetTotalTemperature(void) const { return tat; } ! double GetTAT_C(void) const { return tatc; } ! ! double GetPilotAccel(int idx) const { return vPilotAccel(idx); } ! double GetNpilot(int idx) const { return vPilotAccelN(idx); } ! double GetAeroPQR(int axis) const { return vAeroPQR(axis); } double GetEulerRates(int axis) const { return vEulerRates(axis); } + double GetLocationVRP(int i) const { return vLocationVRP(i); } ! const FGColumnVector3& GetPilotAccel (void) const { return vPilotAccel; } ! const FGColumnVector3& GetNpilot (void) const { return vPilotAccelN; } ! const FGColumnVector3& GetAeroPQR (void) const { return vAeroPQR; } ! const FGColumnVector3& GetEulerRates (void) const { return vEulerRates; } ! const FGColumnVector3& GetAeroUVW (void) const { return vAeroUVW; } ! const FGColumnVector3& GetLocationVRP(void) const { return vLocationVRP; } ! ! double GetAeroUVW (int idx) const { return vAeroUVW(idx); } ! double Getalpha (void) const { return alpha; } ! double Getbeta (void) const { return beta; } ! double Getadot (void) const { return adot; } ! double Getbdot (void) const { return bdot; } ! double GetMagBeta (void) const { return fabs(beta); } ! double Getqbar (void) const { return qbar; } ! double GetqbarUW (void) const { return qbarUW; } ! double GetqbarUV (void) const { return qbarUV; } ! double GetVt (void) const { return Vt; } ! double GetVground (void) const { return Vground; } ! double GetMach (void) const { return Mach; } ! double GetMachU (void) const { return MachU; } ! ! double GetGamma(void) const { return gamma; } ! double GetGroundTrack(void) const { return psigt; } ! double GetEarthPositionAngle(void) const { return earthPosAngle; } ! double GetHeadWind(void); ! double GetCrossWind(void); ! ! // SET functions void SetAeroUVW(FGColumnVector3 tt) { vAeroUVW = tt; } ! void Setalpha (double tt) { alpha = tt; } ! void Setbeta (double tt) { beta = tt; } ! void Setqbar (double tt) { qbar = tt; } ! void SetqbarUW (double tt) { qbarUW = tt; } ! void SetqbarUV (double tt) { qbarUV = tt; } ! void SetVt (double tt) { Vt = tt; } ! void SetMach (double tt) { Mach=tt; } ! void Setadot (double tt) { adot = tt; } ! void Setbdot (double tt) { bdot = tt; } ! ! void SetVRP (FGColumnVector3& vrp) { vVRP = vrp; } ! void SetAB (double t1, double t2) { alpha=t1; beta=t2; } ! void SetGamma (double tt) { gamma = tt; } ! // Time routines, SET and GET functions ! ! void SetDayOfYear (int doy) { day_of_year = doy; } ! void SetSecondsInDay (double sid) { seconds_in_day = sid; } ! ! int GetDayOfYear (void) const { return day_of_year; } ! double GetSecondsInDay (void) const { return seconds_in_day; } void bind(void); *************** *** 188,194 **** private: double vcas, veas; ! double rhosl, rho, p, psl, pt, tat, sat, tatc; ! ! // Don't add a getter for pt! FGColumnVector3 vPilotAccel; --- 198,202 ---- private: double vcas, veas; ! double rhosl, rho, p, psl, pt, tat, sat, tatc; // Don't add a getter for pt! FGColumnVector3 vPilotAccel; *************** *** 200,204 **** --- 208,216 ---- FGColumnVector3 vEulerRates; FGColumnVector3 vMachUVW; + FGColumnVector3 vVRP; + FGColumnVector3 vVRPoffset; + FGColumnVector3 vLocationVRP; + double hVRP, LongitudeVRP, LatitudeVRP; double Vt, Vground, Mach, MachU; double qbar, qbarUW, qbarUV; *************** *** 206,213 **** double adot,bdot; double psigt, gamma; - int day_of_year; // GMT day, 1 .. 366 double seconds_in_day; // seconds since current GMT day began double earthPosAngle; void Debug(int from); --- 218,229 ---- double adot,bdot; double psigt, gamma; double seconds_in_day; // seconds since current GMT day began + int day_of_year; // GMT day, 1 .. 366 double earthPosAngle; + double seaLevelRadius; // radius of sea level, in ft. + double altitude; // altitude above sea level, in ft. + double groundRadius; // radius of runway, in ft. + double distanceAGL; // distance above runway, in ft. void Debug(int from); *************** *** 218,220 **** //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #endif - --- 234,235 ---- Index: FGInertial.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGInertial.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** FGInertial.cpp 17 Apr 2004 21:21:26 -0000 1.36 --- FGInertial.cpp 24 Apr 2004 17:12:57 -0000 1.37 *************** *** 94,100 **** // motion over the curved surface of the earth (second set). ! vOmegaLocal(eX) = omega() * cos(Propagate->GetLatitude()); vOmegaLocal(eY) = 0.0; ! vOmegaLocal(eZ) = omega() * -sin(Propagate->GetLatitude()); vOmegaLocal(eX) += Propagate->GetVe() / Propagate->GetRadius(); --- 94,100 ---- // motion over the curved surface of the earth (second set). ! vOmegaLocal(eX) = omega() * cos(Propagate->GetLocation(eLat)); vOmegaLocal(eY) = 0.0; ! vOmegaLocal(eZ) = omega() * -sin(Propagate->GetLocation(eLat)); vOmegaLocal(eX) += Propagate->GetVe() / Propagate->GetRadius(); *************** *** 106,113 **** // Centrifugal acceleration. ! vCoriolis(eEast) = 2.0*omega() * (Propagate->GetVd()*cos(Propagate->GetLatitude()) + ! Propagate->GetVn()*sin(Propagate->GetLatitude())); ! vRadius(eDown) = Propagate->GetRadius(); vCentrifugal(eDown) = -vOmegaLocal.Magnitude() * vOmegaLocal.Magnitude() * vRadius(eDown); --- 106,113 ---- // Centrifugal acceleration. ! vCoriolis(eEast) = 2.0*omega() * (Propagate->GetVd()*cos(Propagate->GetLocation(eLat)) + ! Propagate->GetVn()*sin(Propagate->GetLocation(eLat))); ! vRadius(eDown) = Propagate->GetLocation(eRad); vCentrifugal(eDown) = -vOmegaLocal.Magnitude() * vOmegaLocal.Magnitude() * vRadius(eDown); Index: FGJSBBase.h =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGJSBBase.h,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -r1.51 -r1.52 *** FGJSBBase.h 17 Apr 2004 21:21:26 -0000 1.51 --- FGJSBBase.h 24 Apr 2004 17:12:57 -0000 1.52 *************** *** 130,155 **** } Message; - ///@name JSBSim Enums. - //@{ - /// Moments L, M, N - enum {eL = 1, eM, eN }; - /// Rates P, Q, R - enum {eP = 1, eQ, eR }; - /// Velocities U, V, W - enum {eU = 1, eV, eW }; - /// Positions X, Y, Z - enum {eX = 1, eY, eZ }; - /// Euler angles Phi, Theta, Psi - enum {ePhi = 1, eTht, ePsi }; - /// Stability axis forces, Drag, Side force, Lift - enum {eDrag = 1, eSide, eLift }; - /// Local frame orientation Roll, Pitch, Yaw - enum {eRoll = 1, ePitch, eYaw }; - /// Local frame position North, East, Down - enum {eNorth = 1, eEast, eDown }; - /// Locations Radius, Latitude, Longitude - enum {eLat = 1, eLong, eRad }; - //@} - ///@name JSBSim console output highlighting terms. //@{ --- 130,133 ---- *************** *** 211,215 **** //@} string GetVersion(void) {return JSBSim_version;} ! void disableHighLighting(void); --- 189,193 ---- //@} string GetVersion(void) {return JSBSim_version;} ! void disableHighLighting(void); *************** *** 225,229 **** protected: static Message localMsg; ! static std::queue <Message*> Messages; --- 203,207 ---- protected: static Message localMsg; ! static std::queue <Message*> Messages; *************** *** 232,236 **** static unsigned int frame; static unsigned int messageId; ! static const double radtodeg; static const double degtorad; --- 210,214 ---- static unsigned int frame; static unsigned int messageId; ! static const double radtodeg; static const double degtorad; *************** *** 248,251 **** --- 226,249 ---- static const string JSBSim_version; }; + + /// Moments L, M, N + enum {eL = 1, eM, eN }; + /// Rates P, Q, R + enum {eP = 1, eQ, eR }; + /// Velocities U, V, W + enum {eU = 1, eV, eW }; + /// Positions X, Y, Z + enum {eX = 1, eY, eZ }; + /// Euler angles Phi, Theta, Psi + enum {ePhi = 1, eTht, ePsi }; + /// Stability axis forces, Drag, Side force, Lift + enum {eDrag = 1, eSide, eLift }; + /// Local frame orientation Roll, Pitch, Yaw + enum {eRoll = 1, ePitch, eYaw }; + /// Local frame position North, East, Down + enum {eNorth = 1, eEast, eDown }; + /// Locations Radius, Latitude, Longitude + enum {eLat = 1, eLong, eRad }; + } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Index: FGModel.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGModel.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** FGModel.cpp 18 Apr 2004 11:40:48 -0000 1.29 --- FGModel.cpp 24 Apr 2004 17:12:57 -0000 1.30 *************** *** 28,32 **** FUNCTIONAL DESCRIPTION -------------------------------------------------------------------------------- ! This base class for the FGAero, FGPropagation, etc. classes defines methods common to all models. --- 28,32 ---- FUNCTIONAL DESCRIPTION -------------------------------------------------------------------------------- ! This base class for the FGAerodynamics, FGPropagate, etc. classes defines methods common to all models. Index: FGOutput.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGOutput.cpp,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -r1.85 -r1.86 *** FGOutput.cpp 17 Apr 2004 21:21:26 -0000 1.85 --- FGOutput.cpp 24 Apr 2004 17:12:57 -0000 1.86 *************** *** 213,218 **** outstream << "Alpha, "; outstream << "Beta, "; ! outstream << "Latitude, "; ! outstream << "Longitude, "; outstream << "Distance AGL, "; outstream << "Runway Radius"; --- 213,218 ---- outstream << "Alpha, "; outstream << "Beta, "; ! outstream << "Latitude (Deg), "; ! outstream << "Longitude (Deg), "; outstream << "Distance AGL, "; outstream << "Runway Radius"; *************** *** 302,307 **** outstream << Auxiliary->Getalpha() << ", "; outstream << Auxiliary->Getbeta() << ", "; ! outstream << Propagate->GetLatitude() << ", "; ! outstream << Propagate->GetLongitude() << ", "; outstream << Propagate->GetDistanceAGL() << ", "; outstream << Propagate->GetRunwayRadius(); --- 302,307 ---- outstream << Auxiliary->Getalpha() << ", "; outstream << Auxiliary->Getbeta() << ", "; ! outstream << Propagate->GetLocation(eLat)*radtodeg << ", "; ! outstream << Propagate->GetLocation(eLong)*radtodeg << ", "; outstream << Propagate->GetDistanceAGL() << ", "; outstream << Propagate->GetRunwayRadius(); *************** *** 372,377 **** socket->Append("Fy"); socket->Append("Fz"); ! socket->Append("Latitude"); ! socket->Append("Longitude"); socket->Append("QBar"); socket->Append("Alpha"); --- 372,377 ---- socket->Append("Fy"); socket->Append("Fz"); ! socket->Append("Latitude (Deg)"); ! socket->Append("Longitude (Deg)"); socket->Append("QBar"); socket->Append("Alpha"); *************** *** 417,422 **** socket->Append(Aircraft->GetForces(eY)); socket->Append(Aircraft->GetForces(eZ)); ! socket->Append(Propagate->GetLatitude()); ! socket->Append(Propagate->GetLongitude()); socket->Append(Auxiliary->Getqbar()); socket->Append(Auxiliary->Getalpha()); --- 417,422 ---- socket->Append(Aircraft->GetForces(eY)); socket->Append(Aircraft->GetForces(eZ)); ! socket->Append(Propagate->GetLocation(eLat)*radtodeg); ! socket->Append(Propagate->GetLocation(eLong)*radtodeg); socket->Append(Auxiliary->Getqbar()); socket->Append(Auxiliary->Getalpha()); Index: FGPropagate.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGPropagate.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** FGPropagate.cpp 18 Apr 2004 02:45:51 -0000 1.8 --- FGPropagate.cpp 24 Apr 2004 17:12:58 -0000 1.9 *************** *** 98,103 **** Name = "FGPropagate"; - vVRPoffset.InitMatrix(); - vUVWdot.InitMatrix(); vUVWdot_prev[0].InitMatrix(); --- 98,101 ---- *************** *** 112,116 **** vPQRdot_prev[3].InitMatrix(); - LongitudeVRP = LatitudeVRP = 0.0; hoverbmac = hoverbcg = 0.0; bind(); --- 110,113 ---- *************** *** 132,141 **** FGModel::InitModel(); - h = 3.0; // Est. height of aircraft cg off runway SeaLevelRadius = Inertial->RefRadius(); // For initialization ONLY ! vLocation(eRad) = SeaLevelRadius + h; RunwayRadius = SeaLevelRadius; - DistanceAGL = vLocation(eRad) - RunwayRadius; // Geocentric - vRunwayNormal(3) = -1.0; // Initialized for standalone mode b = 1; return true; --- 129,135 ---- FGModel::InitModel(); SeaLevelRadius = Inertial->RefRadius(); // For initialization ONLY ! vLocation(eRad) = SeaLevelRadius + 4.0; RunwayRadius = SeaLevelRadius; b = 1; return true; *************** *** 144,156 **** //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% /* ! Purpose: Called on a schedule to perform Propagating algorithms ! Notes: [TP] Make sure that -Vt <= hdot <= Vt, which, of course, should always ! be the case ! [JB] Run in standalone mode, SeaLevelRadius will be reference radius. ! In FGFS, SeaLevelRadius is stuffed from FGJSBSim in JSBSim.cxx each pass. */ bool FGPropagate::Run(void) { if (!FGModel::Run()) { double dt = State->Getdt()*rate; --- 138,150 ---- //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% /* ! Purpose: Called on a schedule to perform EOM integration ! Notes: [JB] Run in standalone mode, SeaLevelRadius will be reference radius. ! In FGFS, SeaLevelRadius is stuffed from FGJSBSim in JSBSim.cxx each pass. */ bool FGPropagate::Run(void) { + double DistanceAGL; + if (!FGModel::Run()) { double dt = State->Getdt()*rate; *************** *** 176,195 **** vLocation += State->Integrate(FGState::TRAPZ, dt, vLocationDot, vLocationDot_prev); - // Update altitude parameter - h = vLocation(eRad) - SeaLevelRadius; // Geocentric - - vVRPoffset = vQtrn.GetTInv() * MassBalance->StructuralToBody(Aircraft->GetXYZvrp()); - - // vVRP - the vector to the Visual Reference Point - now contains the - // offset from the CG to the VRP, in units of feet, in the Local coordinate - // frame, where X points north, Y points East, and Z points down. This needs - // to be converted to Lat/Lon/Alt, now. - - if (cos(vLocation(eLat)) != 0) - LongitudeVRP = vVRPoffset(eEast) / (vLocation(eRad) * cos(vLocation(eLat))) + vLocation(eLong); - - LatitudeVRP = vVRPoffset(eNorth) / vLocation(eRad) + vLocation(eLat); - hVRP = h - vVRPoffset(eDown); - DistanceAGL = vLocation(eRad) - RunwayRadius; // Geocentric --- 170,173 ---- *************** *** 199,203 **** vMac = vQtrn.GetTInv()*MassBalance->StructuralToBody(Aircraft->GetXYZrp()); hoverbmac = (DistanceAGL + vMac(3)) / b; - return false; --- 177,180 ---- *************** *** 211,218 **** void FGPropagate::Seth(double tt) { ! h = tt; ! vLocation(eRad) = h + SeaLevelRadius; ! DistanceAGL = vLocation(eRad) - RunwayRadius; // Geocentric ! hoverbcg = DistanceAGL/b; } --- 188,193 ---- void FGPropagate::Seth(double tt) { ! vLocation(eRad) = tt + SeaLevelRadius; ! hoverbcg = (vLocation(eRad) - RunwayRadius)/b; } *************** *** 221,228 **** void FGPropagate::SetDistanceAGL(double tt) { ! DistanceAGL=tt; ! vLocation(eRad) = RunwayRadius + DistanceAGL; ! h = vLocation(eRad) - SeaLevelRadius; ! hoverbcg = DistanceAGL/b; } --- 196,201 ---- void FGPropagate::SetDistanceAGL(double tt) { ! vLocation(eRad) = RunwayRadius + tt; ! hoverbcg = tt/b; } *************** *** 231,236 **** FGColumnVector3& FGPropagate::toGlobe(FGColumnVector3& V) { - vLocation(eRad) = h + SeaLevelRadius; - if (cos(vLocation(eLat)) != 0) vLocationDot(eLong) = V(eEast) / (vLocation(eRad) * cos(vLocation(eLat))); vLocationDot(eLat) = V(eNorth) / vLocation(eRad); --- 204,207 ---- *************** *** 268,275 **** PropertyManager->Tie("position/h-sl-ft", this, &FGPropagate::Geth, &FGPropagate::Seth, true); ! PropertyManager->Tie("position/lat-gc-rad", this, &FGPropagate::GetLatitude, &FGPropagate::SetLatitude); ! PropertyManager->Tie("position/lat-dot-gc-rad", this, &FGPropagate::GetLatitudeDot); ! PropertyManager->Tie("position/long-gc-rad", this, &FGPropagate::GetLongitude, &FGPropagate::SetLongitude, true); ! PropertyManager->Tie("position/long-dot-gc-rad", this, &FGPropagate::GetLongitudeDot); PropertyManager->Tie("position/h-agl-ft", this, &FGPropagate::GetDistanceAGL, &FGPropagate::SetDistanceAGL); PropertyManager->Tie("position/radius-to-vehicle-ft", this, &FGPropagate::GetRadius); --- 239,246 ---- PropertyManager->Tie("position/h-sl-ft", this, &FGPropagate::Geth, &FGPropagate::Seth, true); ! PropertyManager->Tie("position/lat-gc-rad", this, eLat, (PMF)&FGPropagate::GetLocation, &FGPropagate::SetLocation); ! PropertyManager->Tie("position/lat-dot-gc-rad", this, eLat, (PMF)&FGPropagate::GetLocationDot); ! PropertyManager->Tie("position/long-gc-rad", this, eLong, (PMF)&FGPropagate::GetLocation, &FGPropagate::SetLocation, true); ! PropertyManager->Tie("position/long-dot-gc-rad", this, eLong, (PMF)&FGPropagate::GetLocationDot); PropertyManager->Tie("position/h-agl-ft", this, &FGPropagate::GetDistanceAGL, &FGPropagate::SetDistanceAGL); PropertyManager->Tie("position/radius-to-vehicle-ft", this, &FGPropagate::GetRadius); Index: FGPropagate.h =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGPropagate.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** FGPropagate.h 18 Apr 2004 02:45:51 -0000 1.8 --- FGPropagate.h 24 Apr 2004 17:12:58 -0000 1.9 *************** *** 83,117 **** bool Run(void); ! inline FGColumnVector3& GetVel(void) { return vVel; } ! inline double GetUVW (int idx) const { return vUVW(idx); } ! inline FGColumnVector3& GetUVW (void) { return vUVW; } ! inline FGColumnVector3& GetUVWdot(void) { return vUVWdot; } ! inline double GetUVWdot(int idx) const { return vUVWdot(idx); } ! inline double GetVn(void) const { return vVel(eX); } ! inline double GetVe(void) const { return vVel(eY); } ! inline double GetVd(void) const { return vVel(eZ); } ! inline double Geth(void) const { return h; } ! inline FGColumnVector3& GetPQR(void) {return vPQR;} ! inline double GetPQR(int axis) const {return vPQR(axis);} ! inline FGColumnVector3& GetPQRdot(void) {return vPQRdot;} ! inline double GetPQRdot(int idx) const {return vPQRdot(idx);} const FGColumnVector3& GetEuler(void) const { return vQtrn.GetEuler(); } ! inline double GetEuler(int axis) const { return vQtrn.GetEuler()(axis); } ! inline void SetPQR(FGColumnVector3 tt) {vPQR = tt;} ! inline void SetPQR(double p, double q, double r) {vPQR(eP)=p; ! vPQR(eQ)=q; ! vPQR(eR)=r;} ! inline double GethVRP(void) const { return hVRP; } ! inline double Gethdot(void) const { return vLocationDot(eRad); } ! inline double GetLatitude(void) const { return vLocation(eLat); } ! inline double GetLatitudeVRP(void) const { return LatitudeVRP; } ! inline double GetLatitudeDot(void) const { return vLocationDot(eLat); } ! inline double GetLongitude(void) const { return vLocation(eLong); } ! inline double GetLongitudeVRP(void) const { return LongitudeVRP; } ! inline double GetLongitudeDot(void) const { return vLocationDot(eLong); } ! inline double GetRunwayRadius(void) const { return RunwayRadius; } ! inline double GetDistanceAGL(void) const { return DistanceAGL; } ! inline double GetRadius(void) const { return vLocation(eRad); } ! inline FGColumnVector3& GetRunwayNormal(void) { return vRunwayNormal; } double Getphi(void) const { return vQtrn.GetEulerPhi(); } --- 83,120 ---- bool Run(void); ! const FGColumnVector3& GetVel(void) { return vVel; } ! const FGColumnVector3& GetUVW (void) { return vUVW; } ! const FGColumnVector3& GetUVWdot(void) { return vUVWdot; } ! const FGColumnVector3& GetPQR(void) {return vPQR;} ! const FGColumnVector3& GetPQRdot(void) {return vPQRdot;} const FGColumnVector3& GetEuler(void) const { return vQtrn.GetEuler(); } ! ! double GetUVW (int idx) const { return vUVW(idx); } ! double GetUVWdot(int idx) const { return vUVWdot(idx); } ! double GetVn(void) const { return vVel(eNorth); } ! double GetVe(void) const { return vVel(eEast); } ! double GetVd(void) const { return vVel(eDown); } ! double Geth(void) const { return vLocation(eRad) - SeaLevelRadius; } ! double GetPQR(int axis) const {return vPQR(axis);} ! double GetPQRdot(int idx) const {return vPQRdot(idx);} ! double GetEuler(int axis) const { return vQtrn.GetEuler()(axis); } ! double Gethdot(void) const { return vLocationDot(eRad); } ! // double GetLatitude(void) const { return vLocation(eLat); } ! // double GetLatitudeDot(void) const { return vLocationDot(eLat); } ! // double GetLongitude(void) const { return vLocation(eLong); } ! // double GetLongitudeDot(void) const { return vLocationDot(eLong); } ! ! /** Returns the "constant" RunwayRadius. ! The RunwayRadius parameter is set by the calling application or set to ! zero if JSBSim is running in standalone mode. ! @return distance of the runway from the center of the earth. ! @units feet */ ! double GetRunwayRadius(void) const { return RunwayRadius; } ! double GetDistanceAGL(void) const { return vLocation(eRad)-RunwayRadius; } ! double GetRadius(void) const { return vLocation(eRad); } ! double GetLocation (int idx) const { return vLocation(idx);} ! double GetLocationDot (int idx) const { return vLocationDot(idx);} ! const FGColumnVector3& GetLocation(void) const { return vLocation;} ! const FGColumnVector3& GetLocationDot(void) const { return vLocationDot;} double Getphi(void) const { return vQtrn.GetEulerPhi(); } *************** *** 135,155 **** const FGMatrix33& GetTb2l(void) { return vQtrn.GetTInv(); } ! inline double GetHOverBCG(void) const { return hoverbcg; } ! inline double GetHOverBMAC(void) const { return hoverbmac; } void SetvVel(const FGColumnVector3& v) { vVel = v; } ! void SetLatitude(double tt) { vLocation(eLat) = tt; } ! void SetLongitude(double tt) { vLocation(eLong) = tt; } void Seth(double tt); void SetRunwayRadius(double tt) { RunwayRadius = tt; } void SetSeaLevelRadius(double tt) { SeaLevelRadius = tt;} void SetDistanceAGL(double tt); ! inline void SetRunwayNormal(double fgx, double fgy, double fgz ) { ! vRunwayNormal << fgx << fgy << fgz; ! } ! void SetVRP(FGColumnVector3& vrp) {vVRP = vrp;} ! void SetEuler(FGColumnVector3 tt) { ! vQtrn = FGQuaternion(tt(ePhi), tt(eTht), tt(ePsi)); ! } void SetUVW(FGColumnVector3 tt) { vUVW = tt; } void bind(void); --- 138,158 ---- const FGMatrix33& GetTb2l(void) { return vQtrn.GetTInv(); } ! double GetHOverBCG(void) const { return hoverbcg; } ! double GetHOverBMAC(void) const { return hoverbmac; } ! ! // SET functions ! void SetvVel(const FGColumnVector3& v) { vVel = v; } ! // void SetLatitude(double tt) { vLocation(eLat) = tt; } ! // void SetLongitude(double tt) { vLocation(eLong) = tt; } ! void SetLocation(int idx, double val) { vLocation(idx) = val; } void Seth(double tt); void SetRunwayRadius(double tt) { RunwayRadius = tt; } void SetSeaLevelRadius(double tt) { SeaLevelRadius = tt;} void SetDistanceAGL(double tt); ! void SetEuler(FGColumnVector3 tt) {vQtrn = FGQuaternion(tt(ePhi), tt(eTht), tt(ePsi));} void SetUVW(FGColumnVector3 tt) { vUVW = tt; } + void SetPQR(FGColumnVector3 tt) {vPQR = tt;} + void SetPQR(double p, double q, double r) {vPQR(eP)=p; vPQR(eQ)=q; vPQR(eR)=r;} void bind(void); *************** *** 158,164 **** private: FGColumnVector3 vVel; - FGColumnVector3 vRunwayNormal; - FGColumnVector3 vVRP; - FGColumnVector3 vVRPoffset; FGColumnVector3 vMac; FGColumnVector3 vLocation; --- 161,164 ---- *************** *** 174,186 **** FGQuaternion vQtrndot_prev[4]; - double h, hVRP; - double LongitudeVRP, LatitudeVRP; double dt; ! double RunwayRadius; ! double DistanceAGL; ! double SeaLevelRadius; double hoverbcg,hoverbmac,b; FGColumnVector3& toGlobe(FGColumnVector3&); void Debug(int from); }; --- 174,183 ---- FGQuaternion vQtrndot_prev[4]; double dt; ! double RunwayRadius, SeaLevelRadius; double hoverbcg,hoverbmac,b; FGColumnVector3& toGlobe(FGColumnVector3&); + void Debug(int from); }; *************** *** 188,190 **** //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% #endif - --- 185,186 ---- Index: FGPropulsion.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGPropulsion.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -r1.98 -r1.99 *** FGPropulsion.cpp 8 Apr 2004 01:01:17 -0000 1.98 --- FGPropulsion.cpp 24 Apr 2004 17:12:58 -0000 1.99 *************** *** 56,60 **** #include "FGRocket.h" #include "FGSimTurbine.h" - #include "FGTurbine.h" #include "FGPropeller.h" #include "FGNozzle.h" --- 56,59 ---- *************** *** 239,243 **** Cfg_ptr = 0; FGConfigFile Local_cfg(localpath + engineFileName + ".xml"); ! FGConfigFile Eng_cfg(fullpath + engineFileName + ".xml"); if (Local_cfg.IsOpen()) { Cfg_ptr = &Local_cfg; --- 238,242 ---- Cfg_ptr = 0; FGConfigFile Local_cfg(localpath + engineFileName + ".xml"); ! FGConfigFile Eng_cfg(fullpath + engineFileName + ".xml"); if (Local_cfg.IsOpen()) { Cfg_ptr = &Local_cfg; *************** *** 245,249 **** + engineFileName + ".xml"<< endl; } else { ! if (Eng_cfg.IsOpen()) { Cfg_ptr = &Eng_cfg; if (debug_lvl > 0) cout << "\n Reading engine from file: " << fullpath --- 244,248 ---- + engineFileName + ".xml"<< endl; } else { ! if (Eng_cfg.IsOpen()) { Cfg_ptr = &Eng_cfg; if (debug_lvl > 0) cout << "\n Reading engine from file: " << fullpath *************** *** 263,268 **** } else if (engType == "FG_PISTON") { Engines.push_back(new FGPiston(FDMExec, Cfg_ptr)); - } else if (engType == "FG_TURBINE") { - Engines.push_back(new FGTurbine(FDMExec, Cfg_ptr)); } else if (engType == "FG_SIMTURBINE") { Engines.push_back(new FGSimTurbine(FDMExec, Cfg_ptr)); --- 262,265 ---- *************** *** 334,338 **** Cfg_ptr = 0; FGConfigFile Local_Thruster_cfg(localpath + thrusterFileName + ".xml"); ! FGConfigFile Thruster_cfg(fullpath + thrusterFileName + ".xml"); if (Local_Thruster_cfg.IsOpen()) { Cfg_ptr = &Local_Thruster_cfg; --- 331,335 ---- Cfg_ptr = 0; FGConfigFile Local_Thruster_cfg(localpath + thrusterFileName + ".xml"); ! FGConfigFile Thruster_cfg(fullpath + thrusterFileName + ".xml"); if (Local_Thruster_cfg.IsOpen()) { Cfg_ptr = &Local_Thruster_cfg; *************** *** 340,344 **** + thrusterFileName + ".xml"<< endl; } else { ! if (Thruster_cfg.IsOpen()) { Cfg_ptr = &Thruster_cfg; if (debug_lvl > 0) cout << "\n Reading thruster from file: " << fullpath --- 337,341 ---- + thrusterFileName + ".xml"<< endl; } else { ! if (Thruster_cfg.IsOpen()) { Cfg_ptr = &Thruster_cfg; if (debug_lvl > 0) cout << "\n Reading thruster from file: " << fullpath Index: FGState.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/FGState.cpp,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -r1.135 -r1.136 *** FGState.cpp 17 Apr 2004 21:21:26 -0000 1.135 --- FGState.cpp 24 Apr 2004 17:12:58 -0000 1.136 *************** *** 114,120 **** FGColumnVector3 vUVW; ! Propagate->SetLatitude(Latitude); ! Propagate->SetLongitude(Longitude); ! Propagate->Seth(H); Atmosphere->Run(); --- 114,120 ---- FGColumnVector3 vUVW; ! Propagate->SetLocation(eLat, Latitude); ! Propagate->SetLocation(eLong, Longitude); ! Propagate->Seth(H); // Set altitude above Sea Level Atmosphere->Run(); Index: JSBSim.cbx =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/JSBSim.cbx,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** JSBSim.cbx 18 Apr 2004 02:44:10 -0000 1.4 --- JSBSim.cbx 24 Apr 2004 17:12:59 -0000 1.5 *************** *** 46,51 **** <property category="cppFormatting" name="space-around-binaray-operator" value="0"/> <property category="cppFormatting" name="space-around-parent" value="0"/> - <property category="editor.general" name="line_ending.style" value="3"/> - <property category="generalFormatting" name="lineEndingStyle" value="3"/> <property category="generalFormatting" name="tabSize" value="2"/> <property category="makefiletarget" name="makefile.1.target.list.1" value="all"/> --- 46,49 ---- *************** *** 545,554 **** <property category="unique" name="id" value="247"/> </file> - <file path="FGTurbine.cpp"> - <property category="unique" name="id" value="83"/> - </file> - <file path="FGTurbine.h"> - <property category="unique" name="id" value="249"/> - </file> <file path="JSBSim.cpp"> <property category="unique" name="id" value="87"/> --- 543,546 ---- Index: JSBSim.cxx =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/JSBSim.cxx,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -r1.169 -r1.170 *** JSBSim.cxx 18 Apr 2004 11:50:51 -0000 1.169 --- JSBSim.cxx 24 Apr 2004 17:12:59 -0000 1.170 *************** *** 321,329 **** << Propagate->Getpsi()*RADTODEG << " deg" ); SG_LOG( SG_FLIGHT, SG_INFO, " Latitude: " ! << Propagate->GetLatitude() << " deg" ); SG_LOG( SG_FLIGHT, SG_INFO, " Longitude: " ! << Propagate->GetLongitude() << " deg" ); SG_LOG( SG_FLIGHT, SG_INFO, " Altitude: " ! << Propagate->Geth() << " feet" ); SG_LOG( SG_FLIGHT, SG_INFO, " loaded initial conditions" ); --- 321,329 ---- << Propagate->Getpsi()*RADTODEG << " deg" ); SG_LOG( SG_FLIGHT, SG_INFO, " Latitude: " ! << Propagate->GetLocation(eLat)*RADTODEG << " deg" ); SG_LOG( SG_FLIGHT, SG_INFO, " Longitude: " ! << Propagate->GetLocation(eLong)*RADTODEG << " deg" ); SG_LOG( SG_FLIGHT, SG_INFO, " Altitude: " ! << Propagate->Geth() << " feet" ); SG_LOG( SG_FLIGHT, SG_INFO, " loaded initial conditions" ); *************** *** 557,571 **** _set_V_ground_speed( Auxiliary->GetVground() ); ! _set_Omega_Body( Propagate->GetPQR(1), ! Propagate->GetPQR(2), ! Propagate->GetPQR(3) ); ! ! _set_Euler_Rates( Auxiliary->GetEulerRates(1), ! Auxiliary->GetEulerRates(2), ! Auxiliary->GetEulerRates(3) ); ! ! _set_Geocentric_Rates(Propagate->GetLatitudeDot(), ! Propagate->GetLongitudeDot(), ! Propagate->Gethdot() ); _set_Mach_number( Auxiliary->GetMach() ); --- 557,571 ---- _set_V_ground_speed( Auxiliary->GetVground() ); ! _set_Omega_Body( Propagate->GetPQR(eP), ! Propagate->GetPQR(eQ), ! Propagate->GetPQR(eR) ); ! ! _set_Euler_Rates( Auxiliary->GetEulerRates(ePhi), ! Auxiliary->GetEulerRates(eTht), ! Auxiliary->GetEulerRates(ePsi) ); ! ! _set_Geocentric_Rates(Propagate->GetLocationDot(eLat), ! Propagate->GetLocationDot(eLong), ! Propagate->GetLocationDot(eRad) ); _set_Mach_number( Auxiliary->GetMach() ); *************** *** 578,584 **** */ // Positions of Visual Reference Point ! _updateGeocentricPosition( Propagate->GetLatitudeVRP(), ! Propagate->GetLongitudeVRP(), ! Propagate->GethVRP() ); _set_Altitude_AGL( Propagate->GetDistanceAGL() ); --- 578,584 ---- */ // Positions of Visual Reference Point ! _updateGeocentricPosition( Auxiliary->GetLocationVRP(eLat), ! Auxiliary->GetLocationVRP(eLong), ! Auxiliary->GetLocationVRP(eRad) ); _set_Altitude_AGL( Propagate->GetDistanceAGL() ); Index: Makefile.am =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/Makefile.am,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** Makefile.am 18 Apr 2004 11:49:31 -0000 1.27 --- Makefile.am 24 Apr 2004 17:12:59 -0000 1.28 *************** *** 42,46 **** FGTrim.cpp FGTrim.h \ FGTrimAxis.cpp FGTrimAxis.h \ - FGTurbine.cpp FGTurbine.h \ FGEngine.cpp FGEngine.h \ FGTank.cpp FGTank.h \ --- 42,45 ---- Index: Makefile.solo =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/Makefile.solo,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -r1.62 -r1.63 *** Makefile.solo 23 Apr 2004 11:33:53 -0000 1.62 --- Makefile.solo 24 Apr 2004 17:12:59 -0000 1.63 *************** *** 6,10 **** FGTank.o FGAuxiliary.o FGfdmSocket.o FGTrim.o FGTrimAxis.o\ FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix33.o FGPropulsion.o FGRocket.o\ ! FGTurbine.o FGPiston.o FGForce.o FGThruster.o FGEngine.o\ FGTable.o FGPropeller.o FGNozzle.o FGAerodynamics.o FGMassBalance.o FGInertial.o\ FGFactorGroup.o FGColumnVector3.o FGQuaternion.o FGGroundReactions.o FGScript.o\ --- 6,10 ---- FGTank.o FGAuxiliary.o FGfdmSocket.o FGTrim.o FGTrimAxis.o\ FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix33.o FGPropulsion.o FGRocket.o\ ! FGPiston.o FGForce.o FGThruster.o FGEngine.o\ FGTable.o FGPropeller.o FGNozzle.o FGAerodynamics.o FGMassBalance.o FGInertial.o\ FGFactorGroup.o FGColumnVector3.o FGQuaternion.o FGGroundReactions.o FGScript.o\ *************** *** 23,29 **** cd simgear/props; make -fMakefile.solo; cd ../../ - DoxygenMain.o: DoxygenMain.cpp - $(CC) $(INCLUDES) $(CCOPTS) -oDoxygenMain.o -c DoxygenMain.cpp - FGAerodynamics.o: FGAerodynamics.cpp FGAerodynamics.h FGModel.h \ FGJSBBase.h FGPropertyManager.h simgear/props/props.hxx FGConfigFile.h \ --- 23,26 ---- *************** *** 267,272 **** FGPropagate.h FGAuxiliary.h FGMassBalance.h FGAerodynamics.h \ FGCoefficient.h FGTable.h FGOutput.h FGfdmSocket.h FGGroundReactions.h \ ! FGTank.h FGThruster.h FGForce.h FGRocket.h FGSimTurbine.h FGTurbine.h \ ! FGPropeller.h FGNozzle.h FGPiston.h FGElectric.h $(CC) $(INCLUDES) $(CCOPTS) -oFGPropulsion.o -c FGPropulsion.cpp --- 264,269 ---- FGPropagate.h FGAuxiliary.h FGMassBalance.h FGAerodynamics.h \ FGCoefficient.h FGTable.h FGOutput.h FGfdmSocket.h FGGroundReactions.h \ ! FGTank.h FGThruster.h FGForce.h FGRocket.h FGSimTurbine.h FGPropeller.h \ ! FGNozzle.h FGPiston.h FGElectric.h $(CC) $(INCLUDES) $(CCOPTS) -oFGPropulsion.o -c FGPropulsion.cpp *************** *** 354,367 **** $(CC) $(INCLUDES) $(CCOPTS) -oFGTrimAxis.o -c FGTrimAxis.cpp - FGTurbine.o: FGTurbine.cpp FGTurbine.h FGEngine.h FGJSBBase.h \ - FGPropertyManager.h simgear/props/props.hxx FGState.h \ - FGInitialCondition.h FGFDMExec.h FGModel.h FGTrim.h FGTrimAxis.h \ - FGColumnVector3.h FGMatrix33.h FGQuaternion.h FGAtmosphere.h FGFCS.h \ - filtersjb/FGFCSComponent.h FGLGear.h FGConfigFile.h FGAircraft.h \ - FGPropagate.h FGAuxiliary.h FGMassBalance.h FGAerodynamics.h \ - FGCoefficient.h FGTable.h FGOutput.h FGfdmSocket.h FGGroundReactions.h \ - FGPropulsion.h FGTank.h FGThruster.h FGForce.h - $(CC) $(INCLUDES) $(CCOPTS) -oFGTurbine.o -c FGTurbine.cpp - JSBSim.o: JSBSim.cpp FGFDMExec.h FGModel.h FGJSBBase.h \ FGPropertyManager.h simgear/props/props.hxx FGTrim.h FGTrimAxis.h \ --- 351,354 ---- Index: makemake.pl =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/makemake.pl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** makemake.pl 23 Apr 2004 11:33:53 -0000 1.22 --- makemake.pl 24 Apr 2004 17:12:59 -0000 1.23 *************** *** 13,17 **** print "FGTank.o FGAuxiliary.o FGfdmSocket.o FGTrim.o FGTrimAxis.o\\\n"; print "FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix33.o FGPropulsion.o FGRocket.o\\\n"; ! print "FGTurbine.o FGPiston.o FGForce.o FGThruster.o FGEngine.o\\\n"; print "FGTable.o FGPropeller.o FGNozzle.o FGAerodynamics.o FGMassBalance.o FGInertial.o\\\n"; print "FGFactorGroup.o FGColumnVector3.o FGQuaternion.o FGGroundReactions.o FGScript.o\\\n"; --- 13,17 ---- print "FGTank.o FGAuxiliary.o FGfdmSocket.o FGTrim.o FGTrimAxis.o\\\n"; print "FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix33.o FGPropulsion.o FGRocket.o\\\n"; ! print "FGPiston.o FGForce.o FGThruster.o FGEngine.o\\\n"; print "FGTable.o FGPropeller.o FGNozzle.o FGAerodynamics.o FGMassBalance.o FGInertial.o\\\n"; print "FGFactorGroup.o FGColumnVector3.o FGQuaternion.o FGGroundReactions.o FGScript.o\\\n"; --- FGTurbine.cpp DELETED --- --- FGTurbine.h DELETED --- |
