fly/A320-family
1
0
Fork 0
Code Activity

Wing condensation at higher aoa, bugfixes

Browse source
This commit is contained in:
legoboyvdlp R 2020-05-21 23:20:48 +01:00
parent c82a822563
commit ee4ba79902
2 changed files with 172 additions and 244 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

208
Models/Effects/wing-condensation-L.xml
View file

@ -11,61 +11,35 @@
<condition> <condition>
<and> <and>
<or> <greater-than-equals>
<greater-than-equals> <expression>
<expression> <sum>
<sum> <product>
<product> <property>environment/relative-humidity</property>
<property>environment/relative-humidity</property> <value>0.075</value>
<value>0.1</value> </product>
</product> <property>fdm/jsbsim/aero/alpha-deg</property>
<property>systems/navigation/adr/output/aoa-1</property> </sum>
</sum> </expression>
</expression> <value>13.5</value>
<value>13.5</value> </greater-than-equals>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-2</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-3</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
</or>
<greater-than> <greater-than>
<property>velocities/groundspeed-kt</property> <property>velocities/groundspeed-kt</property>
<value>100</value> <value>100</value>
</greater-than> </greater-than>
<less-than> <less-than>
<property>velocities/groundspeed-kt</property> <property>velocities/groundspeed-kt</property>
<value>210</value> <value>210</value>
</less-than> </less-than>
<greater-than> <greater-than>
<property>environment/relative-humidity</property> <property>environment/relative-humidity</property>
<value>50</value> <value>50</value>
</greater-than> </greater-than>
<less-than-equals> <less-than-equals>
<property>environment/temperature-degc</property> <property>environment/temperature-degc</property>
<value>28</value> <value>28</value>
</less-than-equals> </less-than-equals>
<greater-than> <greater-than>
<property>position/altitude-agl-ft</property> <property>position/altitude-agl-ft</property>
<value>0</value> <value>0</value>
</greater-than> </greater-than>
@ -73,20 +47,10 @@
<property>position/altitude-agl-ft</property> <property>position/altitude-agl-ft</property>
<value>8000</value> <value>8000</value>
</less-than> </less-than>
<or> <greater-than>
<greater-than> <property>fdm/jsbsim/aero/alpha-deg</property>
<property>systems/navigation/adr/output/aoa-1</property> <value>0</value>
<value>0</value> </greater-than>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-2</property>
<value>0</value>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-3</property>
<value>0</value>
</greater-than>
</or>
</and> </and>
</condition> </condition>
@ -109,49 +73,49 @@
</vertex> </vertex>
</placer> </placer>
<shooter> <shooter>
<theta-min-deg> <theta-min-deg>
<!-- <expression> <!-- <expression>
<sum> <sum>
<value>70</value> <value>70</value>
<property>systems/navigation/adr/output/aoa-1</property> <property>systems/navigation/adr/output/aoa-1</property>
</sum> </sum>
</expression> --> </expression> -->
<value>90</value> <value>90</value>
</theta-min-deg> </theta-min-deg>
<theta-max-deg> <theta-max-deg>
<!-- <expression> <!-- <expression>
<sum> <sum>
<value>110</value> <value>110</value>
<property>systems/navigation/adr/output/aoa-1</property> <property>systems/navigation/adr/output/aoa-1</property>
</sum> </sum>
</expression> --> </expression> -->
<value>90</value> <value>90</value>
</theta-max-deg> </theta-max-deg>
<phi-min-deg>90</phi-min-deg> <phi-min-deg>90</phi-min-deg>
<phi-max-deg>90</phi-max-deg> <phi-max-deg>90</phi-max-deg>
<speed-mps> <speed-mps>
<!-- <expression> <!-- <expression>
<product> <product>
<property>velocities/groundspeed-kt</property> <property>velocities/groundspeed-kt</property>
<value>-1</value> <value>-1</value>
</product> </product>
</expression> --> </expression> -->
<value>0</value> <value>0</value>
<spread>0</spread> <spread>0</spread>
</speed-mps> </speed-mps>
<rotation-speed> <rotation-speed>
<x-max-deg-sec>180</x-max-deg-sec> <x-max-deg-sec>180</x-max-deg-sec>
<x-min-deg-sec>180</x-min-deg-sec> <x-min-deg-sec>180</x-min-deg-sec>
<y-max-deg-sec>180</y-max-deg-sec> <y-max-deg-sec>180</y-max-deg-sec>
<y-min-deg-sec>-180</y-min-deg-sec> <y-min-deg-sec>-180</y-min-deg-sec>
<z-max-deg-sec>-180</z-max-deg-sec> <z-max-deg-sec>-180</z-max-deg-sec>
<z-min-deg-sec>-180</z-min-deg-sec> <z-min-deg-sec>-180</z-min-deg-sec>
</rotation-speed> </rotation-speed>
</shooter> </shooter>
<counter> <counter>
<particles-per-sec> <particles-per-sec>
<expression> <expression>
<product> <product>
<value>4</value> <value>4</value>
@ -159,13 +123,13 @@
</product> </product>
</expression> </expression>
<spread>10</spread> <spread>10</spread>
</particles-per-sec> </particles-per-sec>
</counter> </counter>
<align>billboard</align> <align>billboard</align>
<particle> <particle>
<start> <start>
<color> <color>
<red> <red>
<expression> <expression>
@ -203,8 +167,8 @@
<size> <size>
<value>1.5</value> <value>1.5</value>
</size> </size>
</start> </start>
<end> <end>
<color> <color>
<red> <red>
<expression> <expression>
@ -239,22 +203,22 @@
</expression> </expression>
</alpha> </alpha>
</color> </color>
<size> <size>
<value>2</value> <value>2</value>
</size> </size>
</end> </end>
<life-sec> <life-sec>
<value>0.00001</value> <value>0.00001</value>
</life-sec> </life-sec>
<mass-kg>0.025</mass-kg> <mass-kg>0.025</mass-kg>
<radius-m>0.175</radius-m> <radius-m>0.175</radius-m>
</particle> </particle>
<program> <program>
<fluid>air</fluid> <fluid>air</fluid>
<gravity>true</gravity> <gravity>true</gravity>
<wind>true</wind> <wind>true</wind>
</program> </program>
</particlesystem> </particlesystem>

208
Models/Effects/wing-condensation-R.xml
View file

@ -11,61 +11,35 @@
<condition> <condition>
<and> <and>
<or> <greater-than-equals>
<greater-than-equals> <expression>
<expression> <sum>
<sum> <product>
<product> <property>environment/relative-humidity</property>
<property>environment/relative-humidity</property> <value>0.075</value>
<value>0.1</value> </product>
</product> <property>fdm/jsbsim/aero/alpha-deg</property>
<property>systems/navigation/adr/output/aoa-1</property> </sum>
</sum> </expression>
</expression> <value>13.5</value>
<value>13.5</value> </greater-than-equals>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-2</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
<greater-than-equals>
<expression>
<sum>
<product>
<property>environment/relative-humidity</property>
<value>0.1</value>
</product>
<property>systems/navigation/adr/output/aoa-3</property>
</sum>
</expression>
<value>13.5</value>
</greater-than-equals>
</or>
<greater-than> <greater-than>
<property>velocities/groundspeed-kt</property> <property>velocities/groundspeed-kt</property>
<value>100</value> <value>100</value>
</greater-than> </greater-than>
<less-than> <less-than>
<property>velocities/groundspeed-kt</property> <property>velocities/groundspeed-kt</property>
<value>210</value> <value>210</value>
</less-than> </less-than>
<greater-than> <greater-than>
<property>environment/relative-humidity</property> <property>environment/relative-humidity</property>
<value>50</value> <value>50</value>
</greater-than> </greater-than>
<less-than-equals> <less-than-equals>
<property>environment/temperature-degc</property> <property>environment/temperature-degc</property>
<value>28</value> <value>28</value>
</less-than-equals> </less-than-equals>
<greater-than> <greater-than>
<property>position/altitude-agl-ft</property> <property>position/altitude-agl-ft</property>
<value>0</value> <value>0</value>
</greater-than> </greater-than>
@ -73,20 +47,10 @@
<property>position/altitude-agl-ft</property> <property>position/altitude-agl-ft</property>
<value>8000</value> <value>8000</value>
</less-than> </less-than>
<or> <greater-than>
<greater-than> <property>fdm/jsbsim/aero/alpha-deg</property>
<property>systems/navigation/adr/output/aoa-1</property> <value>0</value>
<value>0</value> </greater-than>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-2</property>
<value>0</value>
</greater-than>
<greater-than>
<property>systems/navigation/adr/output/aoa-3</property>
<value>0</value>
</greater-than>
</or>
</and> </and>
</condition> </condition>
@ -109,49 +73,49 @@
</vertex> </vertex>
</placer> </placer>
<shooter> <shooter>
<theta-min-deg> <theta-min-deg>
<!-- <expression> <!-- <expression>
<sum> <sum>
<value>70</value> <value>70</value>
<property>systems/navigation/adr/output/aoa-1</property> <property>systems/navigation/adr/output/aoa-1</property>
</sum> </sum>
</expression> --> </expression> -->
<value>90</value> <value>90</value>
</theta-min-deg> </theta-min-deg>
<theta-max-deg> <theta-max-deg>
<!-- <expression> <!-- <expression>
<sum> <sum>
<value>110</value> <value>110</value>
<property>systems/navigation/adr/output/aoa-1</property> <property>systems/navigation/adr/output/aoa-1</property>
</sum> </sum>
</expression> --> </expression> -->
<value>90</value> <value>90</value>
</theta-max-deg> </theta-max-deg>
<phi-min-deg>90</phi-min-deg> <phi-min-deg>90</phi-min-deg>
<phi-max-deg>90</phi-max-deg> <phi-max-deg>90</phi-max-deg>
<speed-mps> <speed-mps>
<!-- <expression> <!-- <expression>
<product> <product>
<property>velocities/groundspeed-kt</property> <property>velocities/groundspeed-kt</property>
<value>-1</value> <value>-1</value>
</product> </product>
</expression> --> </expression> -->
<value>0</value> <value>0</value>
<spread>0</spread> <spread>0</spread>
</speed-mps> </speed-mps>
<rotation-speed> <rotation-speed>
<x-max-deg-sec>180</x-max-deg-sec> <x-max-deg-sec>180</x-max-deg-sec>
<x-min-deg-sec>180</x-min-deg-sec> <x-min-deg-sec>180</x-min-deg-sec>
<y-max-deg-sec>180</y-max-deg-sec> <y-max-deg-sec>180</y-max-deg-sec>
<y-min-deg-sec>-180</y-min-deg-sec> <y-min-deg-sec>-180</y-min-deg-sec>
<z-max-deg-sec>-180</z-max-deg-sec> <z-max-deg-sec>-180</z-max-deg-sec>
<z-min-deg-sec>-180</z-min-deg-sec> <z-min-deg-sec>-180</z-min-deg-sec>
</rotation-speed> </rotation-speed>
</shooter> </shooter>
<counter> <counter>
<particles-per-sec> <particles-per-sec>
<expression> <expression>
<product> <product>
<value>4</value> <value>4</value>
@ -159,13 +123,13 @@
</product> </product>
</expression> </expression>
<spread>10</spread> <spread>10</spread>
</particles-per-sec> </particles-per-sec>
</counter> </counter>
<align>billboard</align> <align>billboard</align>
<particle> <particle>
<start> <start>
<color> <color>
<red> <red>
<expression> <expression>
@ -203,8 +167,8 @@
<size> <size>
<value>1.5</value> <value>1.5</value>
</size> </size>
</start> </start>
<end> <end>
<color> <color>
<red> <red>
<expression> <expression>
@ -239,22 +203,22 @@
</expression> </expression>
</alpha> </alpha>
</color> </color>
<size> <size>
<value>2</value> <value>2</value>
</size> </size>
</end> </end>
<life-sec> <life-sec>
<value>0.00001</value> <value>0.00001</value>
</life-sec> </life-sec>
<mass-kg>0.025</mass-kg> <mass-kg>0.025</mass-kg>
<radius-m>0.175</radius-m> <radius-m>0.175</radius-m>
</particle> </particle>
<program> <program>
<fluid>air</fluid> <fluid>air</fluid>
<gravity>true</gravity> <gravity>true</gravity>
<wind>true</wind> <wind>true</wind>
</program> </program>
</particlesystem> </particlesystem>