luke
/
netgen
mirror of https://github.com/RTimothyEdwards/netgen.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards 2024-04-04 02:00:01 -04:00
parent 178af5f493 fd0c8c87ea
commit e63593c7e2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.272
1.5.273

6
base/netcmp.c
View File

@ -4467,9 +4467,9 @@ void parallel_sort(struct objlist *ob1, struct nlist *tp1, int idx1, int run)
proplist = (propsort *)MALLOC(run * sizeof(propsort));
obp = obn;
mval = 1;
pval = aval = oval = 0.0;
for (i = 0; i < run; i++) {
mval = 1;
has_crit = FALSE;
merge_type = MERGE_NONE;
ca = co = (char)0;
@ -6211,7 +6211,9 @@ PropertyMatch(struct Element *E1, struct Element *E2,
if (kl1 != NULL)
break; // Property is required
}
else if (vl1->value.ival != 1)
else if ((vl1->type == PROP_INTEGER) && (vl1->value.ival != 1))
break; // Property M != 1 or S != 1 is a mismatch.
else if ((vl1->type == PROP_DOUBLE) && (vl1->value.dval != 1))
break; // Property M != 1 or S != 1 is a mismatch.
}
if (vl1->type != PROP_ENDLIST) {