Update horizontalAxisWindTurbinesALMAdvanced.C

Bart Doekemeijer · web-flow · commit 3e3c264d18fb · 2018-12-21T10:24:26.000+01:00
Bug fix for yaw actions in ALMAdvanced
diff --git a/src/turbineModels/turbineModelsStandard/horizontalAxisWindTurbinesALMAdvanced/horizontalAxisWindTurbinesALMAdvanced.C b/src/turbineModels/turbineModelsStandard/horizontalAxisWindTurbinesALMAdvanced/horizontalAxisWindTurbinesALMAdvanced.C
@@ -1696,13 +1696,17 @@ void horizontalAxisWindTurbinesALMAdvanced::controlNacYaw()
         }
 
       //Info << "nacYaw = " << nacYaw << endl;
-        if (((nacYawCommanded - nacYaw[i]) / degRad) <= 180.0)
+        if (((nacYawCommanded - nacYaw[i]) / degRad) <= -180.0)
+        {
+            deltaNacYaw[i] = nacYawCommanded - nacYaw[i] + (360.0*degRad);
+        }
+        else if (((nacYawCommanded - nacYaw[i]) / degRad) <= 180.0)
         {
             deltaNacYaw[i] = nacYawCommanded - nacYaw[i];
         }
         else
         {
-            deltaNacYaw[i] = nacYaw[i] - ((360.0*degRad) - nacYawCommanded);
+            deltaNacYaw[i] = nacYawCommanded - nacYaw[i] - (360.0*degRad);
         }
       //Info << "deltaNacYaw = " << deltaNacYaw / degRad << endl;
    

Original file line number	Diff line number	Diff line change
`@@ -1696,13 +1696,17 @@ void horizontalAxisWindTurbinesALMAdvanced::controlNacYaw()`
`1696`	`1696`	`}`
`1697`	`1697`
`1698`	`1698`	`//Info << "nacYaw = " << nacYaw << endl;`
`1699`		`- if (((nacYawCommanded - nacYaw[i]) / degRad) <= 180.0)`
	`1699`	`+ if (((nacYawCommanded - nacYaw[i]) / degRad) <= -180.0)`
	`1700`	`+ {`
	`1701`	`+ deltaNacYaw[i] = nacYawCommanded - nacYaw[i] + (360.0*degRad);`
	`1702`	`+ }`
	`1703`	`+ else if (((nacYawCommanded - nacYaw[i]) / degRad) <= 180.0)`
`1700`	`1704`	`{`
`1701`	`1705`	`deltaNacYaw[i] = nacYawCommanded - nacYaw[i];`
`1702`	`1706`	`}`
`1703`	`1707`	`else`
`1704`	`1708`	`{`
`1705`		`- deltaNacYaw[i] = nacYaw[i] - ((360.0*degRad) - nacYawCommanded);`
	`1709`	`+ deltaNacYaw[i] = nacYawCommanded - nacYaw[i] - (360.0*degRad);`
`1706`	`1710`	`}`
`1707`	`1711`	`//Info << "deltaNacYaw = " << deltaNacYaw / degRad << endl;`
`1708`	`1712`