hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] Revert patch 6289aef0... which introduced simulation anomalies

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-07-28 10:47:00 -04:00
parent 4a91ecd63a
commit 7e5ab5de32
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java
View File

@ -77,7 +77,7 @@ public class FinSetCalc extends RocketComponentCalc {
} }
/* /*
* Calculates the non-axial forces produced by *one* *instance* of the fins. * Calculates the non-axial forces produced by each set of fins.
* (normal and side forces, pitch, yaw and roll moments, CP position, CNa). * (normal and side forces, pitch, yaw and roll moments, CP position, CNa).
*/ */
@Override @Override
@ -124,7 +124,7 @@ public class FinSetCalc extends RocketComponentCalc {
cna = cna1 * mul; cna = cna1 * mul;
} else { } else {
// Basic CNa assuming full efficiency // Basic CNa assuming full efficiency
cna = cna1 / 2.0; cna = cna1 * finCount / 2.0;
} }
// logger.debug("Component cna = {}", cna); // logger.debug("Component cna = {}", cna);

4
core/test/net/sf/openrocket/aerodynamics/FinSetCalcTest.java
View File

@ -63,7 +63,7 @@ public class FinSetCalcTest {
double exp_cna_fins = 24.146933; double exp_cna_fins = 24.146933;
double exp_cpx_fins = 0.0193484; double exp_cpx_fins = 0.0193484;
assertEquals(" FinSetCalc produces bad CNa: ", exp_cna_fins, forces.getCNa()*fins.getInstanceCount(), EPSILON); assertEquals(" FinSetCalc produces bad CNa: ", exp_cna_fins, forces.getCNa(), EPSILON);
assertEquals(" FinSetCalc produces bad C_p.x: ", exp_cpx_fins, forces.getCP().x, EPSILON); assertEquals(" FinSetCalc produces bad C_p.x: ", exp_cpx_fins, forces.getCP().x, EPSILON);
assertEquals(" FinSetCalc produces bad CN: ", 0.0, forces.getCN(), EPSILON); assertEquals(" FinSetCalc produces bad CN: ", 0.0, forces.getCN(), EPSILON);
assertEquals(" FinSetCalc produces bad C_m: ", 0.0, forces.getCm(), EPSILON); assertEquals(" FinSetCalc produces bad C_m: ", 0.0, forces.getCm(), EPSILON);
@ -97,7 +97,7 @@ public class FinSetCalcTest {
double exp_cna_fins = 32.195911; double exp_cna_fins = 32.195911;
double exp_cpx_fins = 0.0193484; double exp_cpx_fins = 0.0193484;
assertEquals(" FinSetCalc produces bad CNa: ", exp_cna_fins, forces.getCNa()*fins.getFinCount(), EPSILON); assertEquals(" FinSetCalc produces bad CNa: ", exp_cna_fins, forces.getCNa(), EPSILON);
assertEquals(" FinSetCalc produces bad C_p.x: ", exp_cpx_fins, forces.getCP().x, EPSILON); assertEquals(" FinSetCalc produces bad C_p.x: ", exp_cpx_fins, forces.getCP().x, EPSILON);
assertEquals(" FinSetCalc produces bad CN: ", 0.0, forces.getCN(), EPSILON); assertEquals(" FinSetCalc produces bad CN: ", 0.0, forces.getCN(), EPSILON);
assertEquals(" FinSetCalc produces bad C_m: ", 0.0, forces.getCm(), EPSILON); assertEquals(" FinSetCalc produces bad C_m: ", 0.0, forces.getCm(), EPSILON);