X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmagvar%2Ftestmagvar.cxx;h=965c0c406434a8efd6548b6bbae5ca20db91145c;hb=adb7db9229db1d869b254ac18f1471bed464c508;hp=04ed756949ab5df20effc466d6d18dd610a09ef6;hpb=159d3c4c6c4758df0c20f9db49066ef391668753;p=simgear.git

diff --git a/simgear/magvar/testmagvar.cxx b/simgear/magvar/testmagvar.cxx
index 04ed7569..965c0c40 100644
--- a/simgear/magvar/testmagvar.cxx
+++ b/simgear/magvar/testmagvar.cxx
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
   /* output N, E, down components of B (nTesla)
      dip angle (down positive), variation (E positive) */
 double lat_deg,lon_deg,h,var;
-int model,yy,mm,dd;
+int /* model,*/yy,mm,dd;
 double field[6];
 
 if ((argc != 8) && (argc !=7)) {
@@ -36,21 +36,21 @@ mm=     (int)strtol(argv[4],NULL,10);
 dd=     (int)strtol(argv[5],NULL,10);
 yy=     (int)strtol(argv[6],NULL,10);
 if (argc == 8){
-  model=  (int)strtol(argv[7],NULL,10);
+//  model=  (int)strtol(argv[7],NULL,10);
 }else{
-  model=7;
+//  model=7;
 }
 
 
-var = calc_magvar( DEG_TO_RAD * lat_deg, DEG_TO_RAD * lon_deg, h,
+var = calc_magvar( SGD_DEGREES_TO_RADIANS * lat_deg, SGD_DEGREES_TO_RADIANS * lon_deg, h,
 		   yymmdd_to_julian_days(yy,mm,dd), field );
 
-fprintf(stdout,"%6.0lf %6.0lf %6.0lf\n", field[0], field[1], field[2] );
-fprintf(stdout,"%6.0lf %6.0lf %6.0lf\n", field[3], field[4], field[5] );
-fprintf(stdout,"%6.0lf %6.0lf %6.0lf %4.2lf %4.2lf \n",
+fprintf(stdout,"%6.0f %6.0f %6.0f\n", field[0], field[1], field[2] );
+fprintf(stdout,"%6.0f %6.0f %6.0f\n", field[3], field[4], field[5] );
+fprintf(stdout,"%6.0f %6.0f %6.0f %4.2f %4.2f \n",
   field[3],field[4],field[5],
-  RAD_TO_DEG * (atan(field[5]/pow(field[3]*field[3]+field[4]*field[4],0.5))),
-  RAD_TO_DEG * var);
+  SGD_RADIANS_TO_DEGREES * (atan(field[5]/pow(field[3]*field[3]+field[4]*field[4],0.5))),
+  SGD_RADIANS_TO_DEGREES * var);
 exit(0);
 }