--- ray/src/cv/epw2wea.c	2013/10/21 20:30:50	2.2
+++ ray/src/cv/epw2wea.c	2024/08/02 21:18:40	2.5
@@ -1,3 +1,6 @@
+#ifndef lint
+static const char RCSid[] = "$Id: epw2wea.c,v 2.5 2024/08/02 21:18:40 greg Exp $";
+#endif
 /*  Copyright (c) 2003
  *  National Research Council Canada
  *  written by Christoph Reinhart
@@ -12,45 +15,50 @@
 
 int main( int argc, char  *argv[])
 {
-	FILE *EPW_FILE;
-	FILE* WEA_FILE;
+	FILE *EPW_FILE = NULL;
+	FILE* WEA_FILE = stdout;
 	int year, month,day, hour_in,minute=60,i;
 	int minute_message=1;
+	int get_ac = 0;
 	float dir_norm_rad, dif_or_rad,dummy_float;
+	float aod;
+	int cc;
     char keyword[2000]="";
 	char minute_string[2000]="";
-	char epw_file[200]="";
-	char wea_file[200] ="";
+	char *epw_file = NULL;
+	char *wea_file = NULL;
 	char city[200] ="";
 	char country[200] ="";
 	char latitude[200] ="",longitude[200] ="",time_zone[200] ="",elevation[200] ="";
 
-	if (argc < 3)
+	for ( ; argc > 2 && argv[1][0] == '-'; argc--, argv++)
+		if (argv[1][1] == 'a') {
+			get_ac = !get_ac;
+		} else {
+			fprintf(stderr, "epw2wea: unknown option: %s\n", argv[1]);
+			exit(1);
+		}
+
+	if ((argc < 2) | (argc > 3))
 	{
 		fprintf(stderr,"epw2wea: FATAL ERROR - wrong number of arguments\n");
-		fprintf(stderr,"start program with: epw2wea <file-name.epw> <file-name.wea>\n");
+		fprintf(stderr,"Usage: epw2wea [-a] file-name.epw [file-name.wea]\n");
 		exit(1);
 	}
-	if (argc >= 3)
-	{
-		strcpy(epw_file, argv[1]);
-		strcpy(wea_file, argv[2]);
-		for (i = 3; i < argc; i++)
-		if (argv[i][0] == '-' )
-			switch (argv[i][1])
-			{
-				case 'h':	/* scaling factor */
-					break;
-			}
-		else
-		{
-			fprintf(stdout,"epw2wea: fatal error - %s bad option for input arguments\n", argv[i]);
-			exit(0);
+	epw_file = argv[1];
+	EPW_FILE=fopen(epw_file, "r");
+	if (!EPW_FILE) {
+		fprintf(stderr, "%s: cannot open for reading\n", epw_file);
+		exit(1);
+	}
+	if (argc == 3) {
+		wea_file = argv[2];
+		WEA_FILE=fopen(wea_file, "w");
+		if (!WEA_FILE) {
+			fprintf(stderr, "%s: cannot open for writing\n", wea_file);
+			exit(1);
 		}
 	}
-
-	EPW_FILE=fopen(epw_file, "r");
-	WEA_FILE=fopen(wea_file, "w");
 	fscanf(EPW_FILE,"%[^,]s",keyword);
 	if( !strcmp(keyword,"LOCATION") ){
 	fscanf(EPW_FILE,",%[^,]s",city);
@@ -70,7 +78,7 @@ int main( int argc, char  *argv[])
 	printf("longitude %.2f\n",-1.0*atof(longitude));
 	fprintf(WEA_FILE,"longitude %.2f\n",-1.0*atof(longitude));
 	fscanf(EPW_FILE,",%[^,]s",time_zone);
-	printf("time_zone %.0f\n",-15.0*atoi(time_zone));
+	printf("time_zone %.2f\n",-15.0*atof(time_zone));
 	fprintf(WEA_FILE,"time_zone %.0f\n",-15.0*atoi(time_zone));
 	fscanf(EPW_FILE,",%s[^\n]",elevation);
 	printf("site_elevation %s\nweather_data_file_units 1\n",elevation);
@@ -110,6 +118,25 @@ int main( int argc, char  *argv[])
 
 		fscanf(EPW_FILE,",%f,%f",&dir_norm_rad, &dif_or_rad);
 		fprintf(WEA_FILE,"%.0f %.0f",dir_norm_rad, dif_or_rad);
+		if (get_ac){
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%d",&cc);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&dummy_float);
+			fscanf(EPW_FILE,",%f",&aod);
+
+			fprintf(WEA_FILE," %.3f %.1f",aod, cc/10.);
+			
+		}
 
 		fscanf(EPW_FILE,"%*[^\n]");fscanf(EPW_FILE,"%*[\n\r]");
 		fprintf(WEA_FILE,"\n");