aerodynamic_analysis (schueltke): corrected wave drag calibration and neutral point estimation

Description

• corrected wave drag calibration (the calibration is only applied, when the uncalibrated polar shows wave drag)
• corrected function call of neutral point estimation with correct trimmed polar

Related Issue(s)

N.A

Other Changes

N.A

Screenshots/Logs

N.A

Testing Instructions

1. download this branch and build aerodynamic_analysis
2. run module on already converged aircraft design
3. the output of drag polars for a delta stabilizer angle of 0 deg should be 0 in wave drag for the whole Ma=0.2 and Ma=0.5 polar. First wave drag occurrences from Ma=0.6 on (before also for Ma=0.2 and Ma=0.5 wave drag was calculated)
4. the neutral point should be equivalent to the design mass CG now for a trimmed polar (static_margin of 0)

Developer Checklist

• Code has been tested locally and/or in pipeline.
• Merge conflicts resolved with the target branch.

Additional Notes

N.A

aerodynamic_analysis/src/bwb/bwbDefaultStrategy.cpp

@@ -227,7 +227,26 @@ void bwbDefaultStrategy::calculateWaveDragMason(waveDragMason *myWaveDragMason)
                                             = myWaveDragMason->calculateWaveDrag(currentPolarSet.cleanPolars.at(polarID).Points.at(pointID),
                                                                                 currentPolarSet.cleanPolars.at(polarID).MachNumber,
                                                                                 0, 0, currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).yStations,
-                                                                                currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).Cl_distr, true);
+                                                                                currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).Cl_distr);
+        }
+        //calibration of wing wave drag if calibration is active
+        if (myWaveDragMason->doWaveDragMasonCalibration && currentPolarSet.cleanPolars.at(polarID).PointsWing.back().CD_wave > 0) { // check if polar has wave drag
+            for (size_t pointID(0); pointID < currentPolarSet.cleanPolars.at(polarID).Points.size(); ++pointID) {
+                currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).CD_wave += myWaveDragMason->calculateWaveDragCorrectionByCalibration(
+                    currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).CD_wave, currentPolarSet.cleanPolars.at(polarID).Points.at(pointID),
+                    currentPolarSet.cleanPolars.at(polarID).MachNumber);
+            }
+        }
+        //correction of wing wave drag and summation to total drag
+        for (size_t pointID(0); pointID < currentPolarSet.cleanPolars.at(polarID).Points.size(); ++pointID) {
+            //wing
+            currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).CD_wave +=
+                myWaveDragMason->calculateWaveDragCorrectionByDragCounts(myWaveDragMason->waveDragCtCorrForCalibrationWing);
+            //check negative wave drag due to correction
+            if (currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).CD_wave < 0.) { // Check if wing wave drag is negative due to calibration; if so, set to zero
+                currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).CD_wave = 0.;
+            }
+            //calculate total wave drag
             currentPolarSet.cleanPolars.at(polarID).Points.at(pointID).CD_wave = currentPolarSet.cleanPolars.at(polarID).PointsWing.at(pointID).CD_wave;
         }
     }