jsbsim-devel

[Jon S. B. <jb...@us...>]

Update of /cvsroot/jsbsim/JSBSim
In directory usw-pr-cvs1:/tmp/cvs-serv26801

Modified Files:
	FGAerodynamics.cpp FGForce.cpp FGState.cpp FGState.h 
Log Message:
Cleanup of stability axis transform access function (moved needed parameter access to inside function itself inside FGState

Index: FGAerodynamics.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGAerodynamics.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** FGAerodynamics.cpp	2001/11/14 23:53:25	1.22
--- FGAerodynamics.cpp	2001/11/17 13:19:33	1.23
***************
*** 89,100 ****
  bool FGAerodynamics::Run(void)
  {
-   double alpha, beta;
    unsigned int axis_ctr,ctr;
  
    if (!FGModel::Run()) {
  
-     alpha = Translation->Getalpha();
-     beta = Translation->Getbeta();
- 
      vLastFs = vFs;
      vFs.InitMatrix();
--- 89,96 ----
***************
*** 106,110 ****
      }
  
!     vForces = State->GetTs2b(alpha, beta)*vFs;
  
      vDXYZcg(eX) = -(Aircraft->GetXYZrp(eX) 
--- 102,106 ----
      }
  
!     vForces = State->GetTs2b()*vFs;
  
      vDXYZcg(eX) = -(Aircraft->GetXYZrp(eX) 

Index: FGForce.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGForce.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** FGForce.cpp	2001/11/14 23:53:27	1.23
--- FGForce.cpp	2001/11/17 13:19:33	1.24
***************
*** 103,107 ****
    switch(ttype) {
    case tWindBody:
!     return fdmex->GetState()->GetTs2b(fdmex->GetTranslation()->Getalpha(),fdmex->GetTranslation()->Getbeta());
    case tLocalBody:
      return fdmex->GetState()->GetTl2b();
--- 103,107 ----
    switch(ttype) {
    case tWindBody:
!     return fdmex->GetState()->GetTs2b();
    case tLocalBody:
      return fdmex->GetState()->GetTl2b();

Index: FGState.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGState.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** FGState.cpp	2001/11/14 23:53:27	1.83
--- FGState.cpp	2001/11/17 13:19:33	1.84
***************
*** 665,671 ****
  //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
! FGMatrix33& FGState::GetTs2b(double alpha, double beta)
  {
    double ca, cb, sa, sb;
  
    ca = cos(alpha);
--- 665,674 ----
  //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
! FGMatrix33& FGState::GetTs2b(void)
  {
    double ca, cb, sa, sb;
+ 
+   double alpha = Translation->Getalpha();
+   double beta  = Translation->Getbeta();
  
    ca = cos(alpha);

Index: FGState.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/FGState.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** FGState.h	2001/11/14 23:53:27	1.50
--- FGState.h	2001/11/17 13:19:33	1.51
***************
*** 266,274 ****
  
    /** Calculates and returns the stability-to-body axis transformation matrix.
-       @param alpha angle of attack in radians.
-       @param beta angle of sideslip in radians.
        @return a reference to the stability-to-body transformation matrix.
        */
!   FGMatrix33& GetTs2b(double alpha, double beta);
  
    /** Retrieves the local-to-body transformation matrix.
--- 266,272 ----
  
    /** Calculates and returns the stability-to-body axis transformation matrix.
        @return a reference to the stability-to-body transformation matrix.
        */
!   FGMatrix33& GetTs2b(void);
  
    /** Retrieves the local-to-body transformation matrix.