|
From: <mk...@us...> - 2003-06-20 17:46:28
|
Update of /cvsroot/csp/APPLICATIONS/CSPSim/Tools/XML
In directory sc8-pr-cvs1:/tmp/cvs-serv31360
Modified Files:
falcon_acdata.py
Log Message:
fixed table x,y ordering, thrust units
Index: falcon_acdata.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/CSPSim/Tools/XML/falcon_acdata.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** falcon_acdata.py 16 Apr 2003 21:05:03 -0000 1.1
--- falcon_acdata.py 20 Jun 2003 17:46:25 -0000 1.2
***************
*** 59,67 ****
ybreaks = getattr(data, self.ybreaks)
self.current += map(float, line.split())
! if len(self.current) > len(ybreaks): raise "fubar table"
! if len(self.current) == len(ybreaks):
self.current = map(lambda x, s=self.scale: x*s, self.current)
self.table.append(self.current)
! if len(self.table) == len(xbreaks):
table = Table(xbreaks, ybreaks, self.table)
setattr(data, self.id, table)
--- 59,67 ----
ybreaks = getattr(data, self.ybreaks)
self.current += map(float, line.split())
! if len(self.current) > len(xbreaks): raise "fubar table"
! if len(self.current) == len(xbreaks):
self.current = map(lambda x, s=self.scale: x*s, self.current)
self.table.append(self.current)
! if len(self.table) == len(ybreaks):
table = Table(xbreaks, ybreaks, self.table)
setattr(data, self.id, table)
***************
*** 99,114 ****
hnumlist("aero_alpha_breaks"),
hnum("c_l_multiplier"),
! htable("c_l", "aero_mach_breaks", "aero_alpha_breaks"),
hnum("c_d_multiplier"),
! htable("c_d", "aero_mach_breaks", "aero_alpha_breaks"),
hnum("c_y_multiplier"),
! htable("c_y", "aero_mach_breaks", "aero_alpha_breaks"),
hnum("thrust_multiplier"),
hnum("fuel_flow_multiplier"),
hnumlist("thrust_mach_breaks"),
hnumlist("thrust_altitude_breaks", 0.3048),
! htable("idle_thrust", "thrust_altitude_breaks", "thrust_mach_breaks", 0.4545),
! htable("mil_thrust", "thrust_altitude_breaks", "thrust_mach_breaks", 0.4545),
! htable("ab_thrust", "thrust_altitude_breaks", "thrust_mach_breaks", 0.4545),
]
--- 99,114 ----
hnumlist("aero_alpha_breaks"),
hnum("c_l_multiplier"),
! htable("c_l", "aero_alpha_breaks", "aero_mach_breaks"),
hnum("c_d_multiplier"),
! htable("c_d", "aero_alpha_breaks", "aero_mach_breaks"),
hnum("c_y_multiplier"),
! htable("c_y", "aero_alpha_breaks", "aero_mach_breaks"),
hnum("thrust_multiplier"),
hnum("fuel_flow_multiplier"),
hnumlist("thrust_mach_breaks"),
hnumlist("thrust_altitude_breaks", 0.3048),
! htable("idle_thrust", "thrust_mach_breaks", "thrust_altitude_breaks", 4.545),
! htable("mil_thrust", "thrust_mach_breaks", "thrust_altitude_breaks", 4.545),
! htable("ab_thrust", "thrust_mach_breaks", "thrust_altitude_breaks", 4.545),
]
***************
*** 167,178 ****
tabpr(*curve)
tabpr.indent(-1)
! tabpr("</Value>")
tabpr.indent(-1)
tabpr("</Table>")
def engine_xml(self):
! self.table_xml("idle_thrust", self.data.idle_thrust, 1000.0, 0.1, 1)
! self.table_xml("mil_thrust", self.data.mil_thrust, 1000.0, 0.1, 1)
! self.table_xml("ab_thrust", self.data.ab_thrust, 1000.0, 0.1, 1)
--- 167,178 ----
tabpr(*curve)
tabpr.indent(-1)
! tabpr("</Values>")
tabpr.indent(-1)
tabpr("</Table>")
def engine_xml(self):
! self.table_xml("idle_thrust", self.data.idle_thrust, 0.1, 1000.0, 1)
! self.table_xml("mil_thrust", self.data.mil_thrust, 0.1, 1000.0, 1)
! self.table_xml("ab_thrust", self.data.ab_thrust, 0.1, 1000.0, 1)
|