Skip to content

Commit

Permalink
VSPAERO Update 6.0.2
Browse files Browse the repository at this point in the history
1. Added time histories of blade loading for the last revolution, depending
on if it's a single rotor, all rotors at the same RPM, or if all are are different.
2. Renames P, Q, & R output files from .stab to .pstab, .qstab, and .rstab
3. Added logic  so view does not die, fix in in solver not viewer
4. -noise option for psuwopwop now creates multiple namelist files:
entire vehicle + rotors, just the vehicle w/o rotors, and a name list for
each rotor + the vehicle. The case.nam file has the full configuration set
to run, you can uncomment all or some of the other cases. The impact
of each rotor individually on the noise can be assessed. Note, these are
from the same vspaero run, so you get all the aero interactions, but
psuwopwop does not evaluate the sound for all of them.
5. Solver now splits components into separate groups per symmetry, including
wings. Any old .groups files for models with wings, htails... will be broken.
6. Added in the wake iter 0 logic to do no wake iterations
  • Loading branch information
Rob McDonald committed Apr 10, 2020
1 parent 61b57be commit cc07868
Show file tree
Hide file tree
Showing 9 changed files with 1,546 additions and 905 deletions.
36 changes: 31 additions & 5 deletions src/vsp_aero/solver/ComponentGroup.C
Expand Up @@ -31,6 +31,8 @@ COMPONENT_GROUP::COMPONENT_GROUP(void)

ComponentList_ = NULL;

SpanLoadData_ = NULL;

OVec_[0] = OVec_[1] = OVec_[2] = 0.;
RVec_[0] = RVec_[1] = RVec_[2] = 0.;
TVec_[0] = TVec_[1] = TVec_[2] = 0.;
Expand Down Expand Up @@ -73,7 +75,7 @@ COMPONENT_GROUP::COMPONENT_GROUP(void)

NumberOfTimeSamples_ = 0;

StartAverageTime_ = 0.;
StartAveragingTime_ = 0.;

Cx_[0] = Cx_[1] = 0.;
Cy_[0] = Cy_[1] = 0.;
Expand Down Expand Up @@ -104,6 +106,10 @@ COMPONENT_GROUP::COMPONENT_GROUP(void)
Cref_ = 0.;
Bref_ = 0.;

NumberOfSurfaces_ = 0;

SpanLoadData_ = NULL;

}

/*##############################################################################
Expand All @@ -117,8 +123,12 @@ COMPONENT_GROUP::~COMPONENT_GROUP(void)

if ( ComponentList_ != NULL ) delete [] ComponentList_;

if ( SpanLoadData_ != NULL ) delete [] SpanLoadData_;

NumberOfComponents_ = 0;

NumberOfSurfaces_ = 0;

GeometryIsFixed_ = 0;

GeometryIsDynamic_ = 0;
Expand Down Expand Up @@ -169,7 +179,7 @@ COMPONENT_GROUP::~COMPONENT_GROUP(void)

NumberOfTimeSamples_ = 0;

StartAverageTime_ = 0.;
StartAveragingTime_ = 0.;

Cx_[0] = Cx_[1] = 0.;
Cy_[0] = Cy_[1] = 0.;
Expand Down Expand Up @@ -233,6 +243,16 @@ COMPONENT_GROUP &COMPONENT_GROUP::operator=(const COMPONENT_GROUP &ComponentGrou

}

NumberOfSurfaces_ = ComponentGroup.NumberOfSurfaces_;

SizeSpanLoadingList(NumberOfSurfaces_);

for ( i = 1 ; i <= NumberOfSurfaces_ ; i++ ) {

SpanLoadData_[i] = ComponentGroup.SpanLoadData_[i];

}

GeometryIsFixed_ = ComponentGroup.GeometryIsFixed_;

GeometryIsARotor_ = ComponentGroup.GeometryIsARotor_;
Expand Down Expand Up @@ -297,7 +317,7 @@ COMPONENT_GROUP &COMPONENT_GROUP::operator=(const COMPONENT_GROUP &ComponentGrou

NumberOfTimeSamples_ = ComponentGroup.NumberOfTimeSamples_;

StartAverageTime_ = ComponentGroup.StartAverageTime_;
StartAveragingTime_ = ComponentGroup.StartAveragingTime_;

Cx_[0] = ComponentGroup.Cx_[0];
Cy_[0] = ComponentGroup.Cy_[0];
Expand Down Expand Up @@ -860,6 +880,8 @@ void COMPONENT_GROUP::LoadData(FILE *File)
void COMPONENT_GROUP::ZeroAverageForcesAndMoments(void)
{

int i;

NumberOfTimeSamples_ = 0;

Cx_[0] = Cx_[1] = 0.;
Expand All @@ -886,6 +908,12 @@ void COMPONENT_GROUP::ZeroAverageForcesAndMoments(void)
CDo_[0] = CDo_[1] = 0.;
CSo_[0] = CSo_[1] = 0.;

for ( i = 1 ; i <= NumberOfSurfaces_ ; i++ ) {

SpanLoadData_[i].ZeroForcesAndMoments();

}

}

/*##############################################################################
Expand Down Expand Up @@ -966,5 +994,3 @@ void COMPONENT_GROUP::CalculateAverageForcesAndMoments(void)





5 changes: 3 additions & 2 deletions src/vsp_aero/solver/ComponentGroup.H
Expand Up @@ -64,7 +64,8 @@ private:

int NumberOfTimeSamples_;

double StartAverageTime_;
int StartAveragingTimeStep_;
double StartAveragingTime_;

double Cxo_[2];
double Cyo_[2];
Expand Down Expand Up @@ -200,7 +201,7 @@ public:
double &CDAvg(void) { return CD_[1]; };
double &CSAvg(void) { return CS_[1]; };

double &StartAverageTime(void) { return StartAverageTime_; };
double &StartAveragingTime(void) { return StartAveragingTime_; };

void ZeroAverageForcesAndMoments(void);
void UpdateAverageForcesAndMoments(void);
Expand Down

0 comments on commit cc07868

Please sign in to comment.