Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / FDM / UIUCModel / uiuc_map_ice.cpp

diff --git a/src/FDM/UIUCModel/uiuc_map_ice.cpp b/src/FDM/UIUCModel/uiuc_map_ice.cpp
index 97420f20856ddf534ec87c574708e3f2e3b394e9..1b9f1a0a7c31de3aa4a6d32944c7fdb1a1a98a41 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_map_ice.cpp
+++ b/src/FDM/UIUCModel/uiuc_map_ice.cpp
@@ -17,11 +17,13 @@
 ----------------------------------------------------------------------
  
  HISTORY:      04/08/2000   initial release
+               --/--/2002   (RD) add SIS icing
 
 ----------------------------------------------------------------------
  
  AUTHOR(S):    Bipin Sehgal       <bsehgal@uiuc.edu>
                Jeff Scott         <jscott@mail.com>
+               Robert Deters      <rdeters@uiuc.edu>
  
 ----------------------------------------------------------------------
  
@@ -55,12 +57,11 @@
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA or view http://www.gnu.org/copyleft/gpl.html.
- 
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 **********************************************************************/
 
 #include "uiuc_map_ice.h"
@@ -159,8 +160,14 @@ void uiuc_map_ice()
   ice_map["demo_eps_pitch_input"] =      demo_eps_pitch_input_flag  ; 
   ice_map["tactilefadef"]         =      tactilefadef_flag          ;
   ice_map["tactile_pitch"]        =      tactile_pitch_flag         ;
-  ice_map["demo_ap_Theta_ref_deg"]=      demo_ap_Theta_ref_deg_flag ;
   ice_map["demo_ap_pah_on"]       =      demo_ap_pah_on_flag        ;
+  ice_map["demo_ap_alh_on"]       =      demo_ap_alh_on_flag        ;
+  ice_map["demo_ap_rah_on"]       =      demo_ap_rah_on_flag        ;
+  ice_map["demo_ap_hh_on"]        =      demo_ap_hh_on_flag         ;
+  ice_map["demo_ap_Theta_ref_"]   =      demo_ap_Theta_ref_flag     ;
+  ice_map["demo_ap_alt_ref_"]     =      demo_ap_alt_ref_flag       ;
+  ice_map["demo_ap_Phi_ref_"]     =      demo_ap_Phi_ref_flag       ;
+  ice_map["demo_ap_Psi_ref_"]     =      demo_ap_Psi_ref_flag       ;
   ice_map["demo_tactile"]         =      demo_tactile_flag          ;
   ice_map["demo_ice_tail"]        =      demo_ice_tail_flag         ;
   ice_map["demo_ice_left"]        =      demo_ice_left_flag         ;