--- ray/src/gen/gendaymtx.c	2019/08/14 21:00:14	2.29
+++ ray/src/gen/gendaymtx.c	2020/01/06 21:22:46	2.33
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: gendaymtx.c,v 2.29 2019/08/14 21:00:14 greg Exp $";
+static const char RCSid[] = "$Id: gendaymtx.c,v 2.33 2020/01/06 21:22:46 greg Exp $";
 #endif
 /*
  *  gendaymtx.c
@@ -81,16 +81,13 @@ static const char RCSid[] = "$Id: gendaymtx.c,v 2.29 2
 
 /* Include files */
 #define	_USE_MATH_DEFINES
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
+#include "platform.h"
 #include "rtmath.h"
 #include "rtio.h"
-#include "resolu.h"
-#include "platform.h"
 #include "color.h"
-#include "resolu.h"
+#include "sun.h"
 
 char *progname;								/* Program name */
 char errmsg[128];							/* Error message buffer */
@@ -255,16 +252,6 @@ static const ModelCoeff DirectLumEff[8] =
 #define	NSUNPATCH	4		/* max. # patches to spread sun into */
 #endif
 
-extern int jdate(int month, int day);
-extern double stadj(int  jd);
-extern double sdec(int  jd);
-extern double salt(double sd, double st);
-extern double sazi(double sd, double st);
-					/* sun calculation constants */
-extern double  s_latitude;
-extern double  s_longitude;
-extern double  s_meridian;
-
 int		nsuns = NSUNPATCH;	/* number of sun patches to use */
 double		fixed_sun_sa = -1;	/* fixed solid angle per sun? */
 
@@ -326,7 +313,6 @@ main(int argc, char *argv[])
 	int	tstorage = 0;		/* number of allocated time steps */
 	int	nstored = 0;		/* number of time steps in matrix */
 	int	last_monthly = 0;	/* month of last report */
-	int	inconsistent = 0;	/* inconsistent options set? */
 	int	mo, da;			/* month (1-12) and day (1-31) */
 	double	hr;			/* hour (local standard time) */
 	double	dir, dif;		/* direct and diffuse values */
@@ -377,24 +363,16 @@ main(int argc, char *argv[])
 			rhsubdiv = atoi(argv[++i]);
 			break;
 		case 'c':			/* sky color */
-			inconsistent |= (skycolor[1] <= 1e-4);
 			skycolor[0] = atof(argv[++i]);
 			skycolor[1] = atof(argv[++i]);
 			skycolor[2] = atof(argv[++i]);
 			break;
 		case 'd':			/* solar (direct) only */
 			skycolor[0] = skycolor[1] = skycolor[2] = 0;
-			if (suncolor[1] <= 1e-4) {
-				inconsistent = 1;
-				suncolor[0] = suncolor[1] = suncolor[2] = 1;
-			}
+			grefl[0] = grefl[1] = grefl[2] = 0;
 			break;
 		case 's':			/* sky only (no direct) */
 			suncolor[0] = suncolor[1] = suncolor[2] = 0;
-			if (skycolor[1] <= 1e-4) {
-				inconsistent = 1;
-				skycolor[0] = skycolor[1] = skycolor[2] = 1;
-			}
 			break;
 		case 'r':			/* rotate distribution */
 			if (argv[i][2] && argv[i][2] != 'z')
@@ -419,9 +397,6 @@ main(int argc, char *argv[])
 		}
 	if (i < argc-1)
 		goto userr;
-	if (inconsistent)
-		fprintf(stderr, "%s: WARNING: inconsistent -s, -d, -c options!\n",
-				progname);
 	if (i == argc-1 && freopen(argv[i], "r", stdin) == NULL) {
 		fprintf(stderr, "%s: cannot open '%s' for input\n",
 				progname, argv[i]);
@@ -680,11 +655,6 @@ ComputeSky(float *parr)
 		diff_illum = diff_irrad * WHTEFFICACY;
 		dir_illum = dir_irrad * WHTEFFICACY;
 	}
-
-	if (bright(skycolor) <= 1e-4) {			/* 0 sky component? */
-		memset(parr, 0, sizeof(float)*3*nskypatch);
-		return;
-	}
 	/* Compute ground radiance (include solar contribution if any) */
 	parr[0] = diff_illum;
 	if (altitude > 0)
@@ -692,6 +662,10 @@ ComputeSky(float *parr)
 	parr[2] = parr[1] = parr[0] *= (1./PI/WHTEFFICACY);
 	multcolor(parr, grefl);
 
+	if (bright(skycolor) <= 1e-4) {			/* 0 sky component? */
+		memset(parr+3, 0, sizeof(float)*3*(nskypatch-1));
+		return;
+	}
 	/* Calculate Perez sky model parameters */
 	CalcPerezParam(sun_zenith, sky_clearness, sky_brightness, index);