[Jsbsim-cvslogs] CVS: JSBSim/src/models FGExternalForce.cpp, 1.17, 1.18 FGExternalForce.h, 1.14, 1.15

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

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

Modified Files:
	FGExternalForce.cpp FGExternalForce.h 
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: FGExternalForce.cpp
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGExternalForce.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** FGExternalForce.cpp	26 May 2017 10:49:39 -0000	1.17
--- FGExternalForce.cpp	26 May 2017 12:25:40 -0000	1.18
***************
*** 142,156 ****
    Debug(0);
  }
- 
- //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- // Copy constructor
- 
- FGExternalForce::FGExternalForce(const FGExternalForce& extForce) : FGForce(extForce)
- {
-   magnitude = extForce.magnitude;
-   Frame = extForce.Frame;
-   vDirection = extForce.vDirection;
-   Name = extForce.Name;
- }
    
  //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--- 142,145 ----
***************
*** 208,213 ****
      if (from == 0) { // Constructor
        cout << "    " << Name << endl;
!       cout << "    Frame: " << Frame << endl;
!       cout << "    Location: (" << vXYZn(eX) << ", " << vXYZn(eY) << ", " << vXYZn(eZ) << ")" << endl;
      }
    }
--- 197,215 ----
      if (from == 0) { // Constructor
        cout << "    " << Name << endl;
!       cout << "    Frame: ";
!       switch(ttype) {
!       case tNone:
!         cout << "BODY";
!         break;
!       case tLocalBody:
!         cout << "LOCAL";
!         break;
!       case tWindBody:
!         cout << "WIND";
!         break;
!       default:
!         cout << "ERROR/UNKNOWN";
!       }
!       cout << endl << "    Location: (" << vXYZn(eX) << ", " << vXYZn(eY) << ", " << vXYZn(eZ) << ")" << endl;
      }
    }

Index: FGExternalForce.h
===================================================================
RCS file: /cvsroot/jsbsim/JSBSim/src/models/FGExternalForce.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** FGExternalForce.h	26 May 2017 10:49:39 -0000	1.14
--- FGExternalForce.h	26 May 2017 12:25:40 -0000	1.15
***************
*** 143,151 ****
    /** Constructor.
        @param FDMExec pointer to the main executive class.
-   */
-   FGExternalForce(FGFDMExec *FDMExec);
- 
-   /** Constructor.
-       @param FDMExec pointer to the main executive class.
        @param el pointer to the XML element defining an individual force.
        @param index the position of this force object in the whole list.
--- 143,146 ----
***************
*** 176,180 ****
  private:
  
-   std::string Frame;
    std::string Name;
    FGFunction* Magnitude_Function;
--- 171,174 ----