Changeset 19730

Timestamp:

Sep 23, 2008, 6:05:08 PM (18 years ago)

Author:

eugene

Message:

various bugs

File:

• trunk/Ohana/src/skycalc/src/sunmoon.c (modified) (5 diffs)

trunk/Ohana/src/skycalc/src/sunmoon.c

@@ -26 +26 @@
   if ((N = get_argument (argc, argv, "-longitude"))) {
     remove_argument (N, &argc, argv);
-    longitude = atof (argv[N]) * (24.0 / 360.0);
+    longitude = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }
 
-  longitude = MKO_LATITUDE; // MKO latitude in decimal degrees
+  latitude = MKO_LATITUDE; // MKO latitude in decimal degrees
   if ((N = get_argument (argc, argv, "-latitude"))) {
     remove_argument (N, &argc, argv);
@@ -46 +46 @@
   if (argc != 4) {
     fprintf (stderr, "USAGE: sunmoon [-longitude long] [-latitude lat] [-elevation elev] (date) (ra) (dec)\n");
-    fprintf (stderr, " longitude : W long in decimal degrees\n");
-    fprintf (stderr, " latitude  : N lat in decimal degrees\n");
+    fprintf (stderr, " longitude : W long in decimal HOURS\n");
+    fprintf (stderr, " latitude  : N lat in decimal DEGREES\n");
     fprintf (stderr, " elevation : meters above sea level\n");
     fprintf (stderr, " ra & dec  : decimal degrees\n");
@@ -77 +77 @@
   sid = SC_lst(jdnow, longitude);
 
-  if (VERBOSE) fprintf (stderr, "jdnow: %lf, sid: $lf\n", jdnow, sid);
+  if (VERBOSE) fprintf (stderr, "jdnow: %lf, sid: %lf\n", jdnow, sid);
 
   // get the sun coordinates
   SC_lpsun (jdnow, &sun_ra, &sun_dec);
-  sun_ha = sid - sun_ra;
+  sun_ha = (sid - sun_ra);
   sun_ra *= 15.0;
   sun_alt = SC_altit (sun_dec, sun_ha, latitude, &sun_az);
@@ -90 +90 @@
   // get the moon coordintes
   SC_accumoon (jdnow, latitude, sid, elevation, &geo_ra, &geo_dec, &geo_dist, &moon_ra, &moon_dec, &moon_dist);
-  moon_ha = sid - moon_ra;
+  moon_ha = (sid - moon_ra);
   moon_ra *= 15.0; // convert to degrees
   moon_alt = SC_altit (moon_dec, moon_ha, latitude, &moon_az);
@@ -97 +97 @@
   if (VERBOSE) fprintf (stderr, "moon @ ra,dec = %f %f : alt, az = %f %f\n", moon_ra, moon_dec, moon_alt, moon_az);
 
-  phase = (sun_ra - moon_ra - 180)/360.0;
-  while (phase < -0.5) phase += 1.0;
-  while (phase >  0.5) phase -= 1.0;
+  phase = (moon_ra - sun_ra)/360.0;
+  while (phase <  0.0) phase += 1.0;
+  while (phase >  1.0) phase -= 1.0;
 
   if (VERBOSE) fprintf (stderr, "sun @ %f %f dist %f\n", sun_ra, sun_dec, sun_angle);