X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FLaRCsim%2Fc172_aero.c;h=57e1208b19cc54a82f7f83293432fadcf58fac8e;hb=e6aef49822538c3328b036bb817a32a1956be0e8;hp=c1f1e728cc2d5526b11dbfcf24cf2a682c7ff8b1;hpb=c90db01dc8d5462a3da22771ffa7c96f5ea31217;p=flightgear.git

diff --git a/src/FDM/LaRCsim/c172_aero.c b/src/FDM/LaRCsim/c172_aero.c
index c1f1e728c..57e1208b1 100644
--- a/src/FDM/LaRCsim/c172_aero.c
+++ b/src/FDM/LaRCsim/c172_aero.c
@@ -123,11 +123,9 @@ SCALAR interp(SCALAR *y_table, SCALAR *x_table, int Ntable, SCALAR x)
 	}	 
 	else if(x >= x_table[Ntable-1])
 	{
-		slope=(y_table[Ntable-1]-y_table[Ntable-2])/(x_table[Ntable-1]-x_table[Ntable-2]);
-	    y=slope*(x-x_table[Ntable-1]) +y_table[Ntable-1];
-		 
-/* 		 printf("x larger than x_table[N]: %g %g %d\n",x,x_table[NCL-1],Ntable-1);
- */	}	 
+		 y=y_table[Ntable-1];
+		 /* printf("x larger than x_table[N]: %g %g %d\n",x,x_table[NCL-1],Ntable-1); */
+	}	 
 	else /*x is within the table, interpolate linearly to find y value*/
 	{
 	    
@@ -152,8 +150,11 @@ void aero( SCALAR dt, int Initialize ) {
   static SCALAR alpha_ind[NCL]={-0.087,0,0.175,0.209,0.24,0.262,0.278,0.303,0.314,0.332,0.367};	
   static SCALAR CLtable[NCL]={-0.14,0.31,1.21,1.376,1.51249,1.591,1.63,1.60878,1.53712,1.376,1.142};
 
- 
+ /*Note that CLo,Cdo,Cmo will likely change with flap setting so 
+  they may not be declared static in the future */
    /* printf("Initialize= %d\n",Initialize); */
+   /* if (Initialize != 0)
+    { */
 /* 	   printf("Initializing aero model...Initialize= %d\n", Initialize);
  */	   CLadot=1.7;
 	   CLq=3.9;
@@ -168,7 +169,7 @@ void aero( SCALAR dt, int Initialize ) {
 	   Cma=-0.89;
 	   Cmadot=-5.2;
 	   Cmq=-12.4;
-	   Cmo=-0.015; 
+	   Cmo=-0.062; 
 	   Cmde=-1.28;
 
 	   Clbeta=-0.089;
@@ -195,11 +196,7 @@ void aero( SCALAR dt, int Initialize ) {
 	   b=35.8; /*wing span ft */
 	   Sw=174; /*wing planform surface area ft^2*/
 	   rPiARe=0.054; /*reciprocal of Pi*AR*e*/
-	   
-	   MaxTakeoffWeight=2550;
-	   EmptyWeight=1500;
-       
-	   Zcg=0.51;
+    /* } */
   
   /*
   LaRCsim uses:
@@ -211,29 +208,6 @@ void aero( SCALAR dt, int Initialize ) {
 	aileron > 0  => right wing up
 	rudder > 0   => ANL
   */
-  
-  /*do weight & balance here since there is no better place*/
-  Weight=Mass / INVG;
-  
-  if(Weight > 2550)
-  {  Weight=2550; }
-  else if(Weight < 1500)
-  {  Weight=1500; }
-  
-  
-  if(Dx_cg > 0.5586)
-  {  Dx_cg = 0.5586; }
-  else if(Dx_cg < -0.4655)
-  {  Dx_cg = -0.4655; }
-  
-  Cg=Dx_cg/cbar +0.25;
-  
-  Dz_cg=Zcg*cbar;
-  
-  	
-  
-  
-  
   long_trim=0;
   if(Aft_trim) long_trim = long_trim - trim_inc;
   if(Fwd_trim) long_trim = long_trim + trim_inc;
@@ -245,8 +219,8 @@ void aero( SCALAR dt, int Initialize ) {
   else
   	elevator=(Long_control+long_trim)*23*DEG_TO_RAD;
   
-  aileron  = -1*Lat_control*17.5*DEG_TO_RAD;
-  rudder   = -1*Rudder_pedal*16*DEG_TO_RAD; 
+  aileron  = Lat_control*17.5*DEG_TO_RAD;
+  rudder   = Rudder_pedal*16*DEG_TO_RAD; 
   /*
     The aileron travel limits are 20 deg. TEU and 15 deg TED
     but since we don't distinguish between left and right we'll
@@ -319,5 +293,3 @@ void aero( SCALAR dt, int Initialize ) {
  *//*  printf("Maero: %7.4f Naero: %7.4f Raero: %7.4f\n",M_m_aero,M_n_aero,M_l_aero);
  */  
 }
-
-