[Jsbsim-cvslogs] CVS: JSBSim/src/models/propulsion FGForce.cpp, 1.19, 1.20 FGForce.h, 1.17, 1.18 FGPropeller.cpp, 1.61, 1.62

[Bertrand <bco...@us...>]

Update of /cvsroot/jsbsim/JSBSim/src/models/propulsion
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25766/src/models/propulsion

Modified Files:
	FGForce.cpp FGForce.h FGPropeller.cpp 
Log Message:
More code clean up: removed unused and outdated copy constructors (they did not copy all the members anyway). Moved data from members to local where applicable.

Index: FGForce.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGForce.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** FGForce.cpp	13 Jan 2014 10:46:10 -0000	1.19
--- FGForce.cpp	26 May 2017 12:25:40 -0000	1.20
***************
*** 65,69 ****
    vFn.InitMatrix();
    vMn.InitMatrix();
-   vH.InitMatrix();
    vOrient.InitMatrix();
    vXYZn.InitMatrix();
--- 65,68 ----
***************
*** 72,76 ****
    vFb.InitMatrix();
    vM.InitMatrix();
-   vDXYZ.InitMatrix();
  
    mT.InitMatrix(1., 0., 0.,
--- 71,74 ----
***************
*** 98,102 ****
    // CG and RP values are in inches
  
!   vDXYZ = fdmex->GetMassBalance()->StructuralToBody(vActingXYZn);
  
    vM = vMn + vDXYZ*vFb;
--- 96,100 ----
    // CG and RP values are in inches
  
!   FGColumnVector3 vDXYZ = fdmex->GetMassBalance()->StructuralToBody(vActingXYZn);
  
    vM = vMn + vDXYZ*vFb;

Index: FGForce.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGForce.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** FGForce.h	1 Apr 2012 17:05:51 -0000	1.17
--- FGForce.h	26 May 2017 12:25:40 -0000	1.18
***************
*** 228,237 ****
    /// Constructor
    FGForce(FGFDMExec *FDMExec);
!   FGForce(const FGForce& force) {
!     vFn = force.vFn;
!     vXYZn = force.vXYZn;
!     ttype = force.ttype;
!     fdmex = force.fdmex;
!   }
    /// Destructor
    ~FGForce();
--- 228,233 ----
    /// Constructor
    FGForce(FGFDMExec *FDMExec);
!   FGForce(const FGForce& force);
! 
    /// Destructor
    ~FGForce();
***************
*** 317,321 ****
    FGColumnVector3 vFn;
    FGColumnVector3 vMn;
-   FGColumnVector3 vH;
    FGColumnVector3 vOrient;
    TransformType ttype;
--- 313,316 ----
***************
*** 327,331 ****
    FGColumnVector3 vFb;
    FGColumnVector3 vM;
-   FGColumnVector3 vDXYZ;
  
    void Debug(int from);
--- 322,325 ----

Index: FGPropeller.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/propulsion/FGPropeller.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** FGPropeller.cpp	22 Mar 2017 21:27:47 -0000	1.61
--- FGPropeller.cpp	26 May 2017 12:25:40 -0000	1.62
***************
*** 147,151 ****
    RPM = 0;
    vTorque.InitMatrix();
-   vH.InitMatrix();
    D4 = Diameter*Diameter*Diameter*Diameter;
    D5 = D4*Diameter;
--- 147,150 ----
***************
*** 274,278 ****
    // FGForce::GetBodyForces() function.
  
!   vH(eX) = Ixx*omega*Sense*Sense_multiplier;
  
    if (omega > 0.0) ExcessTorque = PowerAvailable / omega;
--- 273,277 ----
    // FGForce::GetBodyForces() function.
  
!   FGColumnVector3 vH(Ixx*omega*Sense*Sense_multiplier, 0.0, 0.0);
  
    if (omega > 0.0) ExcessTorque = PowerAvailable / omega;