[ViewVC] Diff of: radiance/ray/src/cv/epw2wea.c

Comparing ray/src/cv/epw2wea.c (file contents):
Revision 2.3 by greg, Mon Dec 16 23:04:04 2013 UTC vs.
Revision 2.4 by greg, Fri Aug 2 18:47:25 2024 UTC

#	Line 16 \| Line 16 \| *int main( int argc, char argv[])**
16		FILE* WEA_FILE;
17		int year, month,day, hour_in,minute=60,i;
18		int minute_message=1;
19	+	int get_ac = 0;
20		float dir_norm_rad, dif_or_rad,dummy_float;
21	+	float aod;
22	+	int cc;
23		char keyword[2000]="";
24		char minute_string[2000]="";
25		char epw_file[200]="";
#	Line 35 \| Line 38 \| *int main( int argc, char argv[])**
38		{
39		strcpy(epw_file, argv[1]);
40		strcpy(wea_file, argv[2]);
41	+	if (argc ==4 && argv[3][0] == '-' && argv[3][1] == 'a') /* option -a */
42	+	get_ac = 1;
43		for (i = 3; i < argc; i++)
44		if (argv[i][0] == '-' )
45		switch (argv[i][1])
#	Line 110 \| Line 115 \| *int main( int argc, char argv[])**
115
116		fscanf(EPW_FILE,",%f,%f",&dir_norm_rad, &dif_or_rad);
117		fprintf(WEA_FILE,"%.0f %.0f",dir_norm_rad, dif_or_rad);
118	+	if (get_ac){
119	+	fscanf(EPW_FILE,",%f",&dummy_float);
120	+	fscanf(EPW_FILE,",%f",&dummy_float);
121	+	fscanf(EPW_FILE,",%f",&dummy_float);
122	+	fscanf(EPW_FILE,",%f",&dummy_float);
123	+	fscanf(EPW_FILE,",%f",&dummy_float);
124	+	fscanf(EPW_FILE,",%f",&dummy_float);
125	+	fscanf(EPW_FILE,",%d",&cc);
126	+	fscanf(EPW_FILE,",%f",&dummy_float);
127	+	fscanf(EPW_FILE,",%f",&dummy_float);
128	+	fscanf(EPW_FILE,",%f",&dummy_float);
129	+	fscanf(EPW_FILE,",%f",&dummy_float);
130	+	fscanf(EPW_FILE,",%f",&dummy_float);
131	+	fscanf(EPW_FILE,",%f",&dummy_float);
132	+	fscanf(EPW_FILE,",%f",&aod);
133	+
134	+	fprintf(WEA_FILE," %.3f %.1f",aod, cc/10.);
135	+
136	+	}
137
138		fscanf(EPW_FILE,"%[^\n]");fscanf(EPW_FILE,"%[\n\r]");
139		fprintf(WEA_FILE,"\n");

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines