ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/eplus_adduvf.c

Comparing ray/src/util/eplus_adduvf.c (file contents):
Revision 2.13 by greg, Thu Feb 27 20:39:04 2014 UTC vs.
Revision 2.20 by greg, Fri Jan 17 17:33:48 2020 UTC

#	Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8		*/
9
10		#include <stdlib.h>
11	+	#include "platform.h"
12		#include "rtio.h"
13		#include "rtmath.h"
14		#include "random.h"
#	Line 176 | Line 177 | add_subsurf(IDF_OBJECT *param)
177		static IDF_FIELD *
178		get_vlist(IDF_OBJECT *param, const char *zname)
179		{
180	<	const int       itm_len = sizeof(IDF_FIELD)+6;
181	<	static char     fld_buf[4*itm_len];
182	<	static char     *next_fbp = fld_buf;
183	<	int             i;
184	<	IDF_FIELD       *res;
180	>	#define itm_len         (sizeof(IDF_FIELD)+6)
181	>	static char             fld_buf[4*itm_len];
182	>	static char             *next_fbp = fld_buf;
183	>	int                     i;
184	>	IDF_FIELD               *res;
185		/* check if subsurface */
186		if (!strcmp(param->pname, SUBSURF_PNAME)) {
187		if (zname != NULL) {
#	Line 219 | Line 220 | get_vlist(IDF_OBJECT *param, const char *zname)
220		sprintf(res->val, "%d", i/3);
221		}
222		return(res);
223	+	#undef itm_len
224		}
225
226		/* Get/allocate surface polygon */
#	Line 323 | Line 325 | static double
325		rad_subsurface(IDF_OBJECT *param, FILE *ofp)
326		{
327		const char      *sname = idf_getfield(param,NAME_FLD)->val;
328	<	SURFACE         *surf = get_surface(idf_getfield(param,SS_VERT_FLD));
328	>	SURFACE         *surf = get_surface(get_vlist(param, NULL));
329		double          area;
330		int             i;
331
#	Line 361 | Line 363 | start_rcontrib(SUBPROC *pd, ZONE *zp)
363		IDF_FIELD       *fptr;
364		int             i, j, n;
365		/* start oconv command */
366	<	sprintf(cbuf, "oconv - > '%s'", temp_octree);
366	>	sprintf(cbuf, "oconv - > \"%s\"", temp_octree);
367		if ((ofp = popen(cbuf, "w")) == NULL) {
368		fputs(progname, stderr);
369		fputs(": cannot open oconv process\n", stderr);
#	Line 391 | Line 393 | start_rcontrib(SUBPROC *pd, ZONE *zp)
393		/* now subsurfaces */
394		if (zp->ntotal > zp->nsurf) {
395		if (zp->area_redu != NULL)
396	<	memset(zp->area_redu, 0, sizeof(float)*zp->nsurf);
397	<	else if ((zp->area_redu = (float *)calloc(zp->nsurf,
396	>	memset(zp->area_redu, 0, sizeof(float)*zp->ntotal);
397	>	else if ((zp->area_redu = (float *)calloc(zp->ntotal,
398		sizeof(float))) == NULL)
399		return(0);
400		}
#	Line 707 | Line 709 | main(int argc, char *argv[])
709		fputs("'\n", stderr);
710		return(1);
711		}
712	+	/* check version (warning) */
713	+	if ((pptr = idf_getobject(our_idf, "Version")) != NULL &&
714	+	pptr->flist != NULL && atoi(pptr->flist->val) != 7) {
715	+	fputs(progname, stderr);
716	+	fputs(": warning - written for IDF version 7.x, not ",
717	+	stderr);
718	+	fputs(pptr->flist->val, stderr);
719	+	fputc('\n', stderr);
720	+	}
721		/* remove existing UVFs */
722		if ((pptr = idf_getobject(our_idf, UVF_PNAME)) != NULL) {
723		IDF_OBJECT      *pnext;
#	Line 715 | Line 726 | main(int argc, char *argv[])
726		do {
727		pnext = pptr->pnext;
728		idf_delobject(our_idf, pptr);
729	<	} while (pnext != NULL);
729	>	} while ((pptr = pnext) != NULL);
730		}
731		/* add to header */
732		if (our_idf->hrem == NULL ||

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)