X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fmagvar%2Ftestmagvar.cxx;h=3e63b413961f06b020816024e62109cf7775b040;hb=84e5142195f5d3b2bf40b11119991457d7f8558b;hp=1466745a91959b599080992c7562ecba03db4707;hpb=f47fdd63f783bafefcfd8beb7383ef4a02101f9e;p=simgear.git

diff --git a/simgear/magvar/testmagvar.cxx b/simgear/magvar/testmagvar.cxx
index 1466745a..3e63b413 100644
--- a/simgear/magvar/testmagvar.cxx
+++ b/simgear/magvar/testmagvar.cxx
@@ -1,10 +1,12 @@
 /* 2/14/00 fixed help message- dip angle (down positive), variation (E positive) */
 
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cmath>
 
-#include "magvar.hxx"
+#include <simgear/constants.h>
+
+#include "coremag.hxx"
 
 
 int main(int argc, char *argv[])
@@ -14,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)) {
@@ -34,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 = SGMagVar( deg_to_rad(lat_deg), deg_to_rad(lon_deg), h,
-                yymmdd_to_julian_days(yy,mm,dd), field );
+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);
 }