a482f9a6ce01bccb75413cd1ff212ccf047dd614,trunk/SUAVE/Components/Energy/Networks/Propulsor_Surrogate.py,Propulsor_Surrogate,evaluate_thrust,#Propulsor_Surrogate#,72

Before Change

        cond = np.hstack([altitude,mach,throttle])
        
        // Run the surrogate for a range of altitudes
        data_len = len(altitude)
        sfc = np.zeros([data_len,1])  
        thr = np.zeros([data_len,1]) 
        for ii,_ in enumerate(altitude):            
            sfc[ii] = sfc_surrogate.predict([np.array([altitude[ii][0],mach[ii][0],throttle[ii][0]])])    
            thr[ii] = thr_surrogate.predict([np.array([altitude[ii][0],mach[ii][0],throttle[ii][0]])])   //This is the fix when sklearn is update.

        
        F    = thr
        mdot = thr*sfc*self.number_of_engines
        
        // Save the output
        results = Data()
        results.thrust_force_vector = self.number_of_engines * F * [np.cos(self.thrust_angle),0,-np.sin(self.thrust_angle)]     
        results.vehicle_mass_rate   = mdot
    
        return results          
    

After Change

        
        cond = np.hstack([altitude,mach,throttle])
           
        if self.use_extended_surrogate:
            lo_blender = Cubic_Spline_Blender(0, .01)
            hi_blender = Cubic_Spline_Blender(0.99, 1)            
            sfc = self.extended_sfc_surrogate(sfc_surrogate, cond, lo_blender, hi_blender)
            thr = self.extended_thrust_surrogate(thr_surrogate, cond, lo_blender, hi_blender)
        else:
            sfc = sfc_surrogate.predict(cond)
            thr = thr_surrogate.predict(cond)

        sfc = sfc*self.sfc_input_scale*self.sfc_anchor_scale
        thr = thr*self.thrust_input_scale*self.thrust_anchor_scale
       
        F    = thr
        mdot = thr*sfc*self.number_of_engines
       
        // Save the output
        results = Data()
        results.thrust_force_vector = self.number_of_engines * F * [np.cos(self.thrust_angle),0,-np.sin(self.thrust_angle)]
        results.vehicle_mass_rate   = mdot
   
        return results          
    

Instances