fixed bug with NEAR if the vessel has wings

neuoy · Sep 24, 2014 · 6534dbf · 6534dbf
1 parent 40cfb94
commit 6534dbf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/Plugin/Properties/AssemblyInfo.cs b/Plugin/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.1.0")]
-[assembly: AssemblyFileVersion("0.2.1.0")]
+[assembly: AssemblyVersion("0.2.3.0")]
+[assembly: AssemblyFileVersion("0.2.3.0")]
diff --git a/Plugin/VesselAerodynamicModel.cs b/Plugin/VesselAerodynamicModel.cs
@@ -280,28 +280,39 @@ public Vector3d computeForces_FAR(double rho, double machNumber, Vector3d airVel
                 {
                     if (FARBasicDragModelType.IsInstanceOfType(module))
                     {
-                        // make sure we don't trigger aerodynamic failures during prediction
-                        double YmaxForce = (double)FARBasicDragModel_YmaxForce.GetValue(module);
-                        double XZmaxForce = (double)FARBasicDragModel_XZmaxForce.GetValue(module);
-                        FARBasicDragModel_YmaxForce.SetValue(module, Double.MaxValue);
-                        FARBasicDragModel_XZmaxForce.SetValue(module, Double.MaxValue);
+                        double YmaxForce = 0, XZmaxForce = 0;
+                        if (!useNEAR)
+                        {
+                            // make sure we don't trigger aerodynamic failures during prediction
+                            YmaxForce = (double)FARBasicDragModel_YmaxForce.GetValue(module);
+                            XZmaxForce = (double)FARBasicDragModel_XZmaxForce.GetValue(module);
+                            FARBasicDragModel_YmaxForce.SetValue(module, Double.MaxValue);
+                            FARBasicDragModel_XZmaxForce.SetValue(module, Double.MaxValue);
+                        }
 
                         if(useNEAR)
                             totalForce += (Vector3d)FARBasicDragModel_RunDragCalculation.Invoke(module, new object[] { airVelocityForFixedAoA, rho });
                         else
                             totalForce += (Vector3d)FARBasicDragModel_RunDragCalculation.Invoke(module, new object[] { airVelocityForFixedAoA, machNumber, rho });
 
-                        FARBasicDragModel_YmaxForce.SetValue(module, YmaxForce);
-                        FARBasicDragModel_XZmaxForce.SetValue(module, XZmaxForce);
+                        if (!useNEAR)
+                        {
+                            FARBasicDragModel_YmaxForce.SetValue(module, YmaxForce);
+                            FARBasicDragModel_XZmaxForce.SetValue(module, XZmaxForce);
+                        }
                     }
 
                     if (FARWingAerodynamicModelType.IsInstanceOfType(module))
                     {
-                        // make sure we don't trigger aerodynamic failures during prediction
-                        double YmaxForce = (double)FARWingAerodynamicModel_YmaxForce.GetValue(module);
-                        double XZmaxForce = (double)FARWingAerodynamicModel_XZmaxForce.GetValue(module);
-                        FARWingAerodynamicModel_YmaxForce.SetValue(module, Double.MaxValue);
-                        FARWingAerodynamicModel_XZmaxForce.SetValue(module, Double.MaxValue);
+                        double YmaxForce = 0, XZmaxForce = 0;
+                        if (!useNEAR)
+                        {
+                            // make sure we don't trigger aerodynamic failures during prediction
+                            YmaxForce = (double)FARWingAerodynamicModel_YmaxForce.GetValue(module);
+                            XZmaxForce = (double)FARWingAerodynamicModel_XZmaxForce.GetValue(module);
+                            FARWingAerodynamicModel_YmaxForce.SetValue(module, Double.MaxValue);
+                            FARWingAerodynamicModel_XZmaxForce.SetValue(module, Double.MaxValue);
+                        }
 
                         double rhoBackup = (double)FARWingAerodynamicModel_rho.GetValue(module);
                         FARWingAerodynamicModel_rho.SetValue(module, rho);
@@ -322,8 +333,11 @@ public Vector3d computeForces_FAR(double rho, double machNumber, Vector3d airVel
                         FARWingAerodynamicModel_rho.SetValue(module, rhoBackup);
                         FARWingAerodynamicModel_stall.SetValue(module, stallBackup);
 
-                        FARWingAerodynamicModel_YmaxForce.SetValue(module, YmaxForce);
-                        FARWingAerodynamicModel_XZmaxForce.SetValue(module, XZmaxForce);
+                        if (!useNEAR)
+                        {
+                            FARWingAerodynamicModel_YmaxForce.SetValue(module, YmaxForce);
+                            FARWingAerodynamicModel_XZmaxForce.SetValue(module, XZmaxForce);
+                        }
                     }
                 }
             }