|  | @@ -48,24 +48,7 @@
 | 
											
												
													
														|  |          </#if>
 |  |          </#if>
 | 
											
												
													
														|  |      </vehicles>
 |  |      </vehicles>
 | 
											
												
													
														|  |      <toolspecific>
 |  |      <toolspecific>
 | 
											
												
													
														|  | -       <#if vo.ffd??>
 |  | 
 | 
											
												
													
														|  | -         <FFD mapType="complex" uID="FFD">
 |  | 
 | 
											
												
													
														|  | -                <switch mapType="boolean">1</switch>
 |  | 
 | 
											
												
													
														|  | -                <FFDFile>${vo.ffd.fname}</FFDFile>
 |  | 
 | 
											
												
													
														|  | -                <order mapType="integer">2</order>
 |  | 
 | 
											
												
													
														|  | -                <Controlpoints mapType="complex">
 |  | 
 | 
											
												
													
														|  | -                    <Nx mapType="integer">${vo.ffd.nx}</Nx>
 |  | 
 | 
											
												
													
														|  | -                    <Ny mapType="integer">${vo.ffd.ny}</Ny>
 |  | 
 | 
											
												
													
														|  | -                    <Nz mapType="integer">${vo.ffd.nz}</Nz>
 |  | 
 | 
											
												
													
														|  | -                </Controlpoints>
 |  | 
 | 
											
												
													
														|  | -                <vars mapType="complex">
 |  | 
 | 
											
												
													
														|  | -                    <sample mapType="vector">${vo.ffd.vars?replace( ",", ";")}</sample>
 |  | 
 | 
											
												
													
														|  | -                    <local_shape_dv mapType="boolean">1</local_shape_dv>
 |  | 
 | 
											
												
													
														|  | -                </vars>
 |  | 
 | 
											
												
													
														|  | -         </FFD>
 |  | 
 | 
											
												
													
														|  | -      <#else>
 |  | 
 | 
											
												
													
														|  | -      </#if>
 |  | 
 | 
											
												
													
														|  | -        <CFD>
 |  | 
 | 
											
												
													
														|  | 
 |  | +         <CFD>
 | 
											
												
													
														|  |           <#if vo.xfoil??>
 |  |           <#if vo.xfoil??>
 | 
											
												
													
														|  |              <XFOIL mapType="complex" uID="xfoil">
 |  |              <XFOIL mapType="complex" uID="xfoil">
 | 
											
												
													
														|  |                  <proName>CRM</proName>
 |  |                  <proName>CRM</proName>
 | 
											
										
											
												
													
														|  | @@ -158,6 +141,23 @@
 | 
											
												
													
														|  |           <#else>
 |  |           <#else>
 | 
											
												
													
														|  |           </#if>
 |  |           </#if>
 | 
											
												
													
														|  |          </CFD>
 |  |          </CFD>
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | 
 |  | +        <CSD/>
 | 
											
												
													
														|  | 
 |  | +        <#if vo.ffd??>
 | 
											
												
													
														|  | 
 |  | +         <FFD mapType="complex" uID="FFD">
 | 
											
												
													
														|  | 
 |  | +                <switch mapType="boolean">1</switch>
 | 
											
												
													
														|  | 
 |  | +                <FFDFile>${vo.ffd.fname}</FFDFile>
 | 
											
												
													
														|  | 
 |  | +                <order mapType="integer">2</order>
 | 
											
												
													
														|  | 
 |  | +                <Controlpoints mapType="complex">
 | 
											
												
													
														|  | 
 |  | +                    <Nx mapType="integer">${vo.ffd.nx}</Nx>
 | 
											
												
													
														|  | 
 |  | +                    <Ny mapType="integer">${vo.ffd.ny}</Ny>
 | 
											
												
													
														|  | 
 |  | +                    <Nz mapType="integer">${vo.ffd.nz}</Nz>
 | 
											
												
													
														|  | 
 |  | +                </Controlpoints>
 | 
											
												
													
														|  | 
 |  | +                <vars mapType="complex">
 | 
											
												
													
														|  | 
 |  | +                    <sample mapType="vector">${vo.ffd.vars?replace( ",", ";")}</sample>
 | 
											
												
													
														|  | 
 |  | +                    <local_shape_dv mapType="boolean">1</local_shape_dv>
 | 
											
												
													
														|  | 
 |  | +                </vars>
 | 
											
												
													
														|  | 
 |  | +         </FFD>
 | 
											
												
													
														|  | 
 |  | +          <#else>
 | 
											
												
													
														|  | 
 |  | +          </#if>
 | 
											
												
													
														|  |      </toolspecific>
 |  |      </toolspecific>
 | 
											
												
													
														|  |  </cpacs>
 |  |  </cpacs>
 |