ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/JSOC/proj/globalhs/apps/jretile_maxmem.c

Comparing proj/globalhs/apps/jretile_maxmem.c (file contents):
Revision 1.5 by tplarson, Fri Mar 31 19:43:36 2017 UTC vs.
Revision 1.6 by tplarson, Fri Mar 31 20:02:28 2017 UTC

#	Line 193 | Line 193 | int jretile_maxmem(void)
193
194		float apinnerout=0.0;
195		float apwidthout=0.0;
196	+	float apinner=0.0;
197	+	float apwidth=0.0;
198		outkeytest = hcon_lookup_lower(&tempoutrec->keywords, "APINNER");
199		if (outkeytest != NULL && outkeytest->info->recscope == 1)
200		apinnerout=drms_getkey_float(tempoutrec, "APINNER", &status);
#	Line 268 | Line 270 | int jretile_maxmem(void)
270		return 1;
271		}
272
271	–	float apinner=0.0;
272	–	float apwidth=0.0;
273		inkeytest = hcon_lookup_lower(&inrec->keywords, "APINNER");
274		if (inkeytest != NULL)
275		apinner=drms_getkey_float(inrec, "APINNER", &status);
276		if (apinnerout != 0.0 && (int)(10000*apinnerout) != (int)(10000*apinner))
277		{
278	<	fprintf(stderr, "ERROR: input APINNER does not equal output APINNER, in=%d, out=%d\n",apinner, apinnerout);
278	>	fprintf(stderr, "ERROR: input APINNER does not equal output APINNER, in=%f, out=%f\n",apinner, apinnerout);
279		drms_close_records(inrecset, DRMS_FREE_RECORD);
280		return 1;
281		}
#	Line 285 | Line 285 | int jretile_maxmem(void)
285		apwidth=drms_getkey_float(inrec, "APWIDTH", &status);
286		if (apinnerout != 0.0 && (int)(10000*apwidthout) != (int)(10000*apwidth))
287		{
288	<	fprintf(stderr, "ERROR: input APWIDTH does not equal output APWIDTH, in=%d, out=%d\n", apwidth, apwidth);
288	>	fprintf(stderr, "ERROR: input APWIDTH does not equal output APWIDTH, in=%f, out=%f\n", apwidth, apwidth);
289		drms_close_records(inrecset, DRMS_FREE_RECORD);
290		return 1;
291		}

Diff Legend

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