Port over remaining Point3D usage to the more type and unit safe SG* classes.

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

diff --git a/src/FDM/UIUCModel/uiuc_icing_demo.cpp b/src/FDM/UIUCModel/uiuc_icing_demo.cpp
index bc9ee8816066deddf05ce334177d775b533e6f73..dc322c4880bb367da495c156a42fa3798c1b5e85 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_icing_demo.cpp
+++ b/src/FDM/UIUCModel/uiuc_icing_demo.cpp
@@ -58,8 +58,7 @@
 
  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.
 
 **********************************************************************/
 
@@ -186,11 +185,53 @@ void uiuc_icing_demo()
                                     demo_ap_pah_on_ntime,
                                     time);
   }
-  if (demo_ap_Theta_ref_deg){
-    double time = Simtime - demo_ap_Theta_ref_deg_startTime;
-    ap_Theta_ref_deg = uiuc_1Dinterpolation(demo_ap_Theta_ref_deg_timeArray,
-                                           demo_ap_Theta_ref_deg_daArray,
-                                           demo_ap_Theta_ref_deg_ntime,
+  if (demo_ap_alh_on){
+    double time = Simtime - demo_ap_alh_on_startTime;
+    ap_alh_on = uiuc_1Dinterpolation(demo_ap_alh_on_timeArray,
+                                    demo_ap_alh_on_daArray,
+                                    demo_ap_alh_on_ntime,
+                                    time);
+  }
+  if (demo_ap_rah_on){
+    double time = Simtime - demo_ap_rah_on_startTime;
+    ap_rah_on = uiuc_1Dinterpolation(demo_ap_rah_on_timeArray,
+                                    demo_ap_rah_on_daArray,
+                                    demo_ap_rah_on_ntime,
+                                    time);
+  }
+  if (demo_ap_hh_on){
+    double time = Simtime - demo_ap_hh_on_startTime;
+    ap_hh_on = uiuc_1Dinterpolation(demo_ap_hh_on_timeArray,
+                                   demo_ap_hh_on_daArray,
+                                   demo_ap_hh_on_ntime,
+                                   time);
+  }
+  if (demo_ap_Theta_ref){
+    double time = Simtime - demo_ap_Theta_ref_startTime;
+    ap_Theta_ref_rad = uiuc_1Dinterpolation(demo_ap_Theta_ref_timeArray,
+                                           demo_ap_Theta_ref_daArray,
+                                           demo_ap_Theta_ref_ntime,
+                                           time);
+  }
+  if (demo_ap_alt_ref){
+    double time = Simtime - demo_ap_alt_ref_startTime;
+    ap_alt_ref_ft = uiuc_1Dinterpolation(demo_ap_alt_ref_timeArray,
+                                           demo_ap_alt_ref_daArray,
+                                           demo_ap_alt_ref_ntime,
+                                           time);
+  }
+  if (demo_ap_Phi_ref){
+    double time = Simtime - demo_ap_Phi_ref_startTime;
+    ap_Phi_ref_rad = uiuc_1Dinterpolation(demo_ap_Phi_ref_timeArray,
+                                           demo_ap_Phi_ref_daArray,
+                                           demo_ap_Phi_ref_ntime,
+                                           time);
+  }
+  if (demo_ap_Psi_ref){
+    double time = Simtime - demo_ap_Psi_ref_startTime;
+    ap_Psi_ref_rad = uiuc_1Dinterpolation(demo_ap_Psi_ref_timeArray,
+                                           demo_ap_Psi_ref_daArray,
+                                           demo_ap_Psi_ref_ntime,
                                            time);
   }