fly/flightgear
1
0
Fork 0
Code Activity

Fixes for Wake turbulence changes

Browse source 
- add missing <string> include
- fix tests
This commit is contained in:
James Turner 2022-04-20 10:23:31 +01:00
parent 83cad5797e
commit 06063ed82a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/AIWake/WakeMesh.hxx
View file

@ -23,6 +23,8 @@
#ifndef _FG_WAKEMESH_HXX #ifndef _FG_WAKEMESH_HXX
#define _FG_WAKEMESH_HXX #define _FG_WAKEMESH_HXX
#include <string>
#include "AeroElement.hxx" #include "AeroElement.hxx"
namespace FGTestApi { namespace PrivateAccessor { namespace FDM { class Accessor; } } } namespace FGTestApi { namespace PrivateAccessor { namespace FDM { class Accessor; } } }

6
test_suite/system_tests/FDM/testAeroMesh.cxx
View file

@ -59,7 +59,7 @@ void AeroMeshTests::testLiftComputation()
{ {
double b = 10.0; double b = 10.0;
double c = 2.0; double c = 2.0;
AircraftMesh_ptr mesh = new AircraftMesh(b, c); AircraftMesh_ptr mesh = new AircraftMesh(b, c, "test");
SGGeod geodPos = SGGeod::fromDeg(0.0, 0.0); SGGeod geodPos = SGGeod::fromDeg(0.0, 0.0);
SGVec3d pos; SGVec3d pos;
double vel = 100.; double vel = 100.;
@ -127,7 +127,7 @@ void AeroMeshTests::testFourierLiftingLine()
auto accessor = FGTestApi::PrivateAccessor::FDM::Accessor(); auto accessor = FGTestApi::PrivateAccessor::FDM::Accessor();
WakeMesh_ptr mesh = new WakeMesh(b, c); WakeMesh_ptr mesh = new WakeMesh(b, c, "testMesh");
int N = accessor.read_FDM_AIWake_WakeMesh_nelm(mesh); int N = accessor.read_FDM_AIWake_WakeMesh_nelm(mesh);
double **mtx = nr_matrix(1, N, 1, N); double **mtx = nr_matrix(1, N, 1, N);
double **coef = nr_matrix(1, N, 1, 1); double **coef = nr_matrix(1, N, 1, 1);
@ -192,7 +192,7 @@ void AeroMeshTests::testFrameTransformations()
CPPUNIT_ASSERT_DOUBLES_EQUAL(pos[1] * SG_METER_TO_FEET, loc(2), 1e-7); CPPUNIT_ASSERT_DOUBLES_EQUAL(pos[1] * SG_METER_TO_FEET, loc(2), 1e-7);
CPPUNIT_ASSERT_DOUBLES_EQUAL(pos[2] * SG_METER_TO_FEET, loc(3), 1e-7); CPPUNIT_ASSERT_DOUBLES_EQUAL(pos[2] * SG_METER_TO_FEET, loc(3), 1e-7);
AircraftMesh_ptr mesh = new AircraftMesh(b, c); AircraftMesh_ptr mesh = new AircraftMesh(b, c, "test");
mesh->setPosition(pos, orient); mesh->setPosition(pos, orient);
FGQuaternion qJ(roll, pitch, yaw); FGQuaternion qJ(roll, pitch, yaw);