Debian Codegraph @

3rdparty/yams/freeyams.2012.02.05.patch

raw
1 diff -ru freeyams.2011.09.23/sourceslib/blinde.c freeyams.2011.09.23-orig/sourceslib/blinde.c
2 --- freeyams.2011.09.23/sourceslib/blinde.c 2011-11-16 11:06:08.000000000 +0100
3 +++ freeyams.2011.09.23-orig/sourceslib/blinde.c 2011-11-16 09:59:50.000000000 +0100
4 @@ -36,7 +36,7 @@
5 ida = id[0]*10 + id[1];
6 /*printf("date = %d %d %d\n",iy,im,ida); */
7 if ( YMD(iy,im,ida) > YMD(MAX_YEAR,MAX_MONTH,MAX_DAY) ) {
8 - fprintf(stdout," -- YAMS (LJLL), Version %s (%s)\n",VERSION,RELEASE);
9 + fprintf(stdout," -- YAMS (LJLL), Version %s (%s)\n",YAMS_VERSION,RELEASE);
10 fprintf(stdout," Copyright (C) LJLL, 1999-2006.\n\n");
11 fprintf(stdout," ## Expiration date reached. Sorry.\n");
12 fprintf(stdout," Please contact the author.\n");
13 diff -ru freeyams.2011.09.23/sourceslib/defines.h freeyams.2011.09.23-orig/sourceslib/defines.h
14 --- freeyams.2011.09.23/sourceslib/defines.h 2011-11-16 11:06:08.000000000 +0100
15 +++ freeyams.2011.09.23-orig/sourceslib/defines.h 2011-11-16 09:59:50.000000000 +0100
16 @@ -18,7 +18,7 @@
17 /* current version */
18 #define DEFAULT_FILE "DEFAULT.yams"
19 #define RELEASE "oct, 2006"
20 -#define VERSION "2.4 b"
21 +#define YAMS_VERSION "2.4 b"
22 #define COPYRIGHT "Copyright (C) LJLL, 1999-2006"
23
24 #define REL 1
25 diff -ru freeyams.2011.09.23/sourceslib/extern.h freeyams.2011.09.23-orig/sourceslib/extern.h
26 --- freeyams.2011.09.23/sourceslib/extern.h 2011-11-16 11:06:08.000000000 +0100
27 +++ freeyams.2011.09.23-orig/sourceslib/extern.h 2011-11-16 09:59:50.000000000 +0100
28 @@ -4,6 +4,7 @@
29
30
31 #ifndef __YAMS
32 +#ifndef __YAMSLIB
33 extern Error yerr;
34 extern Info info;
35 extern Options opts;
36 @@ -14,7 +15,7 @@
37 extern short imprim;
38 extern ubyte ddebug;
39 #endif
40 -
41 +#endif
42
43 #ifdef __cplusplus
44 }
45 diff -ru freeyams.2011.09.23/sourceslib/inout.c freeyams.2011.09.23-orig/sourceslib/inout.c
46 --- freeyams.2011.09.23/sourceslib/inout.c 2011-11-16 11:06:08.000000000 +0100
47 +++ freeyams.2011.09.23-orig/sourceslib/inout.c 2011-11-16 09:59:50.000000000 +0100
48 @@ -581,7 +581,7 @@
49 ppt->tag |= M_UNUSED;
50 ppt->flag = ppt->color = 0;
51 }
52 -
53 + printf("sm->connex %d\n",sm->connex);
54 if ( sm->connex > 0 ) {
55 for (k=1; k<=sm->ne; k++) {
56 pt1 = &sm->tria[k];
57 @@ -679,8 +679,8 @@
58 natv++;
59 if ( ppt->tag & M_CORNER ) tatv++;
60 }
61 - if ( !gs->new ) gs->new = ++nn;
62 - if ( !gt->new ) gt->new = ++nt;
63 + if ( !gs->newnum ) gs->newnum = ++nn;
64 + if ( !gt->newnum ) gt->newnum = ++nt;
65 if ( !pt1->edg[i] && pt1->tag[i] == M_NOTAG ) continue;
66 else if ( pt1->adj[i] && (k > pt1->adj[i]) ) continue;
67 nedge++;
68 @@ -864,12 +864,12 @@
69 nn = nbl = 0;
70 for (k=1; k<=sm->nvmax; k++) {
71 gs = &sm->geom[k];
72 - if ( gs->new > 0 ) {
73 + if ( gs->newnum > 0 ) {
74 iadr = nbl * 3;
75 tabf[iadr+0] = gs->vn[0];
76 tabf[iadr+1] = gs->vn[1];
77 tabf[iadr+2] = gs->vn[2];
78 - gs->new = ++nn;
79 + gs->newnum = ++nn;
80 ++nbl;
81 if ( nbl == NMAX ) {
82 LM_write_field(&ms, LM_Normals, nbl, tabf);
83 @@ -890,7 +890,7 @@
84 iadr = nbl * 2;
85 gs = &sm->geom[pt1->vn[i]];
86 tabi[iadr+0] = ppt->tmp;
87 - tabi[iadr+1] = gs->new;
88 + tabi[iadr+1] = gs->newnum;
89 ppt->flag = 1;
90 ++nbl;
91 if ( nbl == NMAX ) {
92 @@ -916,7 +916,7 @@
93 iadr = nbl * 3;
94 tabi[iadr+0] = nn;
95 tabi[iadr+1] = i+1;
96 - tabi[iadr+2] = gs->new;
97 + tabi[iadr+2] = gs->newnum;
98 ++nbl;
99 if ( nbl == NMAX ) {
100 LM_write_field(&ms, LM_NormalAtTriangleVertices, nbl, tabi);
101 @@ -931,12 +931,12 @@
102 nt = nbl = 0;
103 for (k=1; k<=sm->ntmax; k++) {
104 gt = &sm->tgte[k];
105 - if ( gt->new > 0 ) {
106 + if ( gt->newnum > 0 ) {
107 iadr = nbl * 3;
108 tabf[iadr+0] = gt->t[0];
109 tabf[iadr+1] = gt->t[1];
110 tabf[iadr+2] = gt->t[2];
111 - gt->new = ++nt;
112 + gt->newnum = ++nt;
113 ++nbl;
114 if ( nbl == NMAX ) {
115 LM_write_field(&ms, LM_Tangents, nbl, tabf);
116 @@ -956,7 +956,7 @@
117 iadr = nbl * 2;
118 gt = &sm->tgte[ppt->tge];
119 tabi[iadr+0] = ppt->tmp;
120 - tabi[iadr+1] = gt->new;
121 + tabi[iadr+1] = gt->newnum;
122 ppt->flag = 1;
123 ++nbl;
124 if ( nbl == NMAX ) {
125 @@ -1105,8 +1105,8 @@
126 natv++;
127 if ( ppt->tag & M_CORNER ) tatv++;
128 }
129 - if ( !gs->new ) gs->new = ++nn;
130 - if ( !gt->new ) gt->new = ++nq;
131 + if ( !gs->newnum ) gs->newnum = ++nn;
132 + if ( !gt->newnum ) gt->newnum = ++nq;
133 if ( !pq1->edg[i] && pq1->tag[i] == M_NOTAG ) continue;
134 else if ( pq1->adj[i] && (k > pq1->adj[i]) ) continue;
135 nedge++;
136 @@ -1263,12 +1263,12 @@
137 nn = nbl = 0;
138 for (k=1; k<=sm->nvmax; k++) {
139 gs = &sm->geom[k];
140 - if ( gs->new > 0 ) {
141 + if ( gs->newnum > 0 ) {
142 iadr = nbl * 3;
143 tabf[iadr+0] = gs->vn[0];
144 tabf[iadr+1] = gs->vn[1];
145 tabf[iadr+2] = gs->vn[2];
146 - gs->new = ++nn;
147 + gs->newnum = ++nn;
148 ++nbl;
149 if ( nbl == NMAX ) {
150 LM_write_field(&ms, LM_Normals, nbl, tabf);
151 @@ -1289,7 +1289,7 @@
152 iadr = nbl * 2;
153 gs = &sm->geom[pq1->vn[i]];
154 tabi[iadr+0] = ppt->tmp;
155 - tabi[iadr+1] = gs->new;
156 + tabi[iadr+1] = gs->newnum;
157 ppt->flag = 1;
158 ++nbl;
159 if ( nbl == NMAX ) {
160 @@ -1315,7 +1315,7 @@
161 iadr = nbl * 3;
162 tabi[iadr+0] = nn;
163 tabi[iadr+1] = i+1;
164 - tabi[iadr+2] = gs->new;
165 + tabi[iadr+2] = gs->newnum;
166 ++nbl;
167 if ( nbl == NMAX ) {
168 LM_write_field(&ms, LM_NormalAtQuadrilateralVertices, nbl, tabi);
169 @@ -1330,12 +1330,12 @@
170 nq = nbl = 0;
171 for (k=1; k<=sm->ntmax; k++) {
172 gt = &sm->tgte[k];
173 - if ( gt->new > 0 ) {
174 + if ( gt->newnum > 0 ) {
175 iadr = nbl * 3;
176 tabf[iadr+0] = gt->t[0];
177 tabf[iadr+1] = gt->t[1];
178 tabf[iadr+2] = gt->t[2];
179 - gt->new = ++nq;
180 + gt->newnum = ++nq;
181 ++nbl;
182 if ( nbl == NMAX ) {
183 LM_write_field(&ms, LM_Tangents, nbl, tabf);
184 @@ -1355,7 +1355,7 @@
185 iadr = nbl * 2;
186 gt = &sm->tgte[ppt->tge];
187 tabi[iadr+0] = ppt->tmp;
188 - tabi[iadr+1] = gt->new;
189 + tabi[iadr+1] = gt->newnum;
190 ppt->flag = 1;
191 ++nbl;
192 if ( nbl == NMAX ) {
193 @@ -1524,8 +1524,8 @@
194 /* adjust sizes */
195 if ( opts.hmin < 0.0 )
196 opts.hmin = max(opts.hmin,hmin);
197 - if ( opts.hmax < 0.0 )
198 - opts.hmax = max(opts.hmax,hmax);
199 + if ( opts.hmax < 0.0 )
200 + opts.hmax = max(opts.hmax,hmax);
201
202 E_pop();
203 return(1);
204 Only in freeyams.2011.09.23-orig/sourceslib: inout.c.orig
205 diff -ru freeyams.2011.09.23/sourceslib/parsop.c freeyams.2011.09.23-orig/sourceslib/parsop.c
206 --- freeyams.2011.09.23/sourceslib/parsop.c 2011-11-16 11:06:08.000000000 +0100
207 +++ freeyams.2011.09.23-orig/sourceslib/parsop.c 2011-11-16 09:59:50.000000000 +0100
208 @@ -16,7 +16,7 @@
209 }
210
211 /* create standard parameter file */
212 - fprintf(out,"# Generated by YAMS %s\n",VERSION);
213 + fprintf(out,"# Generated by YAMS %s\n",YAMS_VERSION);
214 fprintf(out,"# Uncomment next if absolute unit desired\n");
215 fprintf(out,"#Absolute\n");
216
217 Only in freeyams.2011.09.23-orig/sourceslib: parsop.c.orig
218 diff -ru freeyams.2011.09.23/sourceslib/primsg.c freeyams.2011.09.23-orig/sourceslib/primsg.c
219 --- freeyams.2011.09.23/sourceslib/primsg.c 2011-11-16 11:06:08.000000000 +0100
220 +++ freeyams.2011.09.23-orig/sourceslib/primsg.c 2011-11-16 09:59:50.000000000 +0100
221 @@ -18,10 +18,10 @@
222 case 0000:
223 if ( opts.ctrl & ISO )
224 fprintf(stdout,"\n %s\n MODULE YAMS-LJLL : %s\n %s\n",
225 - STR,VERSION,STR);
226 + STR,YAMS_VERSION,STR);
227 else
228 fprintf(stdout,"\n %s\n MODULE YAMS-LJLL (ANISO) : %s\n %s\n",
229 - STR,VERSION,STR);
230 + STR,YAMS_VERSION,STR);
231 return;
232 case 0001:
233 fprintf(stdout,"\n %s\n END OF MODULE YAMS\n %s\n\n",STR,STR);
234 diff -ru freeyams.2011.09.23/sourceslib/surf.h freeyams.2011.09.23-orig/sourceslib/surf.h
235 --- freeyams.2011.09.23/sourceslib/surf.h 2011-11-16 11:06:08.000000000 +0100
236 +++ freeyams.2011.09.23-orig/sourceslib/surf.h 2011-11-16 09:59:50.000000000 +0100
237 @@ -64,13 +64,13 @@
238 typedef struct geomsupp {
239 float vn[3]; /* array of vertex normals */
240 float gap; /* local gap value */
241 - int new; /* pointer to new number */
242 + int newnum; /* pointer to new number */
243 } GeomSupp;
244 typedef GeomSupp * pGeomSupp;
245
246 typedef struct geomtge {
247 float t[3];
248 - int new;
249 + int newnum;
250 } Geomtge;
251 typedef Geomtge * pGeomtge;
252
253 diff -ru freeyams.2011.09.23/sourceslib/yams.c freeyams.2011.09.23-orig/sourceslib/yams.c
254 --- freeyams.2011.09.23/sourceslib/yams.c 2011-11-16 11:06:08.000000000 +0100
255 +++ freeyams.2011.09.23-orig/sourceslib/yams.c 2011-11-16 09:59:50.000000000 +0100
256 @@ -24,6 +24,7 @@
257 ubyte ddebug;
258 ubyte ecp;
259
260 +long verbosity;
261
262 static void excfun(int sigid) {
263 fprintf(stdout,"\n Unexpected error:"); fflush(stdout);
264 Only in freeyams.2011.09.23-orig/sourceslib: yams.c.orig
265 diff -ru freeyams.2011.09.23/sourceslib/yams.h freeyams.2011.09.23-orig/sourceslib/yams.h
266 --- freeyams.2011.09.23/sourceslib/yams.h 2011-11-16 11:06:08.000000000 +0100
267 +++ freeyams.2011.09.23-orig/sourceslib/yams.h 2011-11-16 09:59:50.000000000 +0100
268 @@ -6,12 +6,17 @@
269 #include <string.h>
270
271 #include "chrono.h"
272 -#include "edge.h"
273 -#include "error.h"
274 -#include "hash.h"
275 -#include "stack.h"
276 -#include "info.h"
277 #include "memory.h"
278 -#include "option.h"
279 -#include "surf.h"
280 +
281 +//#include "edge.h"
282 +//#include "error.h"
283 +//#include "hash.h"
284 +//#include "stack.h"
285 +//#include "info.h"
286 +//#include "memory.h"
287 +//#include "option.h"
288 +//#include "surf.h"
289 +
290 +#include "yamslib.h"
291 +#include "yamslib_internal.h"
292 #include "global.h"
293 diff -ru freeyams.2011.09.23/sourceslib/yams0.c freeyams.2011.09.23-orig/sourceslib/yams0.c
294 --- freeyams.2011.09.23/sourceslib/yams0.c 2011-11-16 11:06:08.000000000 +0100
295 +++ freeyams.2011.09.23-orig/sourceslib/yams0.c 2011-11-16 09:59:50.000000000 +0100
296 @@ -24,7 +24,7 @@
297 if ( imprim ) {
298 if ( ecp )
299 fprintf(stdout," ## Version: Ecole Centrale de Paris ##\n\n");
300 - fprintf(stdout," -- YAMS (LJLL) Version %s (%s)\n",VERSION,RELEASE);
301 + fprintf(stdout," -- YAMS (LJLL) Version %s (%s)\n",YAMS_VERSION,RELEASE);
302 fprintf(stdout," %s.\n",COPYRIGHT);
303 fprintf(stdout," compiled: %s.\n\n",COMPIL);
304 }
305 diff -ru freeyams.2011.09.23/sourceslib/zaldy1.c freeyams.2011.09.23-orig/sourceslib/zaldy1.c
306 --- freeyams.2011.09.23/sourceslib/zaldy1.c 2011-11-16 11:06:08.000000000 +0100
307 +++ freeyams.2011.09.23-orig/sourceslib/zaldy1.c 2011-11-16 09:59:50.000000000 +0100
308 @@ -45,13 +45,20 @@
309 }
310 }
311 else {
312 + int bytes = sizeof(Point) \
313 + + sizeof(Metric) \
314 + + 2 * sizeof(Triangle) \
315 + + 1.5 * sizeof(GeomSupp) \
316 + + 0.2 * sizeof(Geomtge) \
317 + + 3.7 * sizeof(Hashtable);
318 + /*
319 int bytes = sizeof(struct spoint) \
320 + sizeof(struct metric) \
321 + 2 * sizeof(struct striangle) \
322 + 1.5 * sizeof(struct geomsupp) \
323 + 0.2 * sizeof(struct geomtge) \
324 + 3.7 * sizeof(struct shashtab);
325 -
326 + */
327 sm->npmax = (int)((double)memory / bytes * million);
328 sm->npmax = max(sm->npmax,npmax);
329 sm->nemax = max(2 * sm->npmax,nemax);
330 diff -ru freeyams.2011.09.23/sourceslib/zaldy3.c freeyams.2011.09.23-orig/sourceslib/zaldy3.c
331 --- freeyams.2011.09.23/sourceslib/zaldy3.c 2011-11-16 11:06:08.000000000 +0100
332 +++ freeyams.2011.09.23-orig/sourceslib/zaldy3.c 2011-11-16 09:59:50.000000000 +0100
333 @@ -34,7 +34,7 @@
334 for (j=sm->nvmax; j<nvsize; j++) {
335 sm->geom[j].vn[0] = sm->geom[j].vn[1] = sm->geom[j].vn[2] = 0.;
336 sm->geom[j].gap = 1.;
337 - sm->geom[j].new = 0;
338 + sm->geom[j].newnum = 0;
339 }
340 sm->nvmax = nvsize;
341 yerr.inderr[0] = sm->nvmax;
342 diff -u freeyams.2012.02.05/sourceslib/outqua_a.c freeyams.2011.09.23-orig/sourceslib/outqua_a.c
343 --- freeyams.2012.02.05/sourceslib/outqua_a.c 2009-05-13 21:00:03.000000000 +0200
344 +++ freeyams.2011.09.23-orig/sourceslib/outqua_a.c 2012-09-04 08:51:04.000000000 +0200
345 @@ -219,7 +219,7 @@
346 pt = &mesh->tria[iel];
347 fprintf(stdout," WORST ELEMENT %d (%d) %d %d %d\n",iel,ielr,pt->v[0],pt->v[1],pt->v[2]);
348
349 - if ( abs(imprim) < 5 ) return;
350 + if ( abs(imprim) < 5 ) return (1) ;
351
352 fprintf(stdout,"\n HISTOGRAMM\n");
353 imax = min(9,(int)(10.*rapmax));
354 --- freeyams.2012.02.05/sourceslib/eigenv.c 2016-01-28 11:47:05.000000000 +0100
355 +++ freeyams.2012.02.05-orig/sources/eigenv.c 2012-02-04 12:58:11.000000000 +0100
356 @@ -3,7 +3,7 @@
357 #include <math.h>
358
359 /* seeking 1.e-05 accuracy */
360 +#define EPSD 1.e-12
361 -#define EPSD 1.e-15
362 #define EPSD2 1.e-200
363 #define EPS6 5.e-06
364 #define EPS 1.e-06
365 --- freeyams.2012.02.05/sourceslib/sproto.h 2021-02-17 11:09:34.000000000 +0100
366 +++ freeyams.2012.02.05-orig/sourceslib/sproto.h 2009-05-13 20:56:39.000000000 +0200
367 @@ -161,3 +161,19 @@
368 int outmsh_q(pSurfMesh ,char *);
369 int updtop_q(pSurfMesh );
370 int qualfa_q(float *,float *,float *,float *,float *,float *);
371 +
372 +int hippop(pTriangle tria);
373 +int updqua_a(pSurfMesh sm);
374 +int loptia3(pSurfMesh sm,ubyte fechk,float declic) ;
375 +int angdef(pSurfMesh sm);
376 +int boulep2(pSurfMesh sm,int depart,int i,Ball *b);
377 +int simred_a(double m1[6],double m2[6],double m[6]);
378 +int typelt(pSurfMesh sm,int k);
379 +int taspoi(pSurfMesh sm);
380 +int yams6(pSurfMesh sm);
381 +int yamsq(pSurfMesh sm);
382 +int yams22(pSurfMesh sm);
383 +int optedg(pSurfMesh sm) ;
384 +void primem(int np);
385 +#include "eigenv.h"
386 +#include <ctype.h>
387 --- freeyams.2012.02.05/sourceslib/error.c 2006-07-12 18:32:35.000000000 +0200
388 +++ freeyams.2012.02.05-orig/sourceslib/error.c 2021-02-17 10:58:12.000000000 +0100
389 @@ -10,7 +10,7 @@
390 #endif
391
392 #include <stdio.h>
393 -/*#include <ctype.h>*/
394 +#include <ctype.h>
395 #include "string.h"
396
397 #define MAXLEV 25