removed if for avoiding work until tuning check is complete. added print statements

Author: jaredthomas68

Circle_components.py

@@ -209,22 +209,24 @@ def execute(self):
                     print "kd: ", kd
                     print "rotorDiameter: ", rotorDiameter
 
-                    displacement = (wakeAngleInit*(15.0*(factor**4.0)+(wakeAngleInit**2.0))/
-                    ((30.0*kd*(factor**5.0))/rotorDiameter[turb]))- \
-                    (wakeAngleInit*rotorDiameter[turb]*(15.0+(wakeAngleInit**2.0))/(30.0*kd)) # yaw-induced wake center displacement
-                    print "displacement 1: ", displacement
-                
-                    # from fortran
-                    displacement = wakeAngleInit*(wakeAngleInit*wakeAngleInit + 
-                    15.0*factor**4)/((30.0*kd/rotorDiameter[turb])*
-                    (factor**5))                                                 
-                    displacement = displacement - wakeAngleInit*(wakeAngleInit*wakeAngleInit 
-                    + 15.0)/(30.0*kd/rotorDiameter[turb])
+                displacement = (wakeAngleInit*(15.0*(factor**4.0)+(wakeAngleInit**2.0))/
+                ((30.0*kd*(factor**5.0))/rotorDiameter[turb]))- \
+                (wakeAngleInit*rotorDiameter[turb]*(15.0+(wakeAngleInit**2.0))/(30.0*kd)) # yaw-induced wake center displacement
+                print "displacement 1: ", displacement
+            
+                # from fortran
+                displacement = wakeAngleInit*(wakeAngleInit*wakeAngleInit + 
+                15.0*factor**4)/((30.0*kd/rotorDiameter[turb])*
+                (factor**5))                                                 
+                displacement = displacement - wakeAngleInit*(wakeAngleInit*wakeAngleInit 
+                + 15.0)/(30.0*kd/rotorDiameter[turb])
 
+                if turbineXw[turbI] > turbineXw[turb]:
                     print "displacement 2: ", displacement
-                    wakeCentersYT_mat[turbI, turb] = wakeCentersYT_mat[turbI, turb] + displacement
 
+                wakeCentersYT_mat[turbI, turb] = wakeCentersYT_mat[turbI, turb] + displacement
 
+                if turbineXw[turbI] > turbineXw[turb]:
                     print "final wake center[%f][%f]: " % (turbI, turb), wakeCentersYT_mat[turbI, turb]
 
         # adjust k_e to C_T, adjusted to yaw

rotor_components.py

@@ -40,7 +40,7 @@ def execute(self):
 
         print "first speed, first CT", self.windSpeedToCPCT.wind_speed[0], self.windSpeedToCPCT.CT[0], self.windSpeedToCPCT.CT[1]
         print "last speed, last CT", self.windSpeedToCPCT.wind_speed[-1], self.windSpeedToCPCT.CP[-1]
-
+        print "pP: ", self.pP
         wind_speed_ax = np.cos(self.yaw*np.pi/180.0)**(self.pP/3.0)*self.wind_speed_hub
         # use interpolation on precalculated CP-CT curve
         wind_speed_ax = np.maximum(wind_speed_ax, self.windSpeedToCPCT.wind_speed[0])