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 2022-11-01 02:00:02 -04:00
parent 49ccf1949a 27b095754e
commit 935e54abe6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.237 1.5.238

8
base/netcmp.c
View File

@ -5999,10 +5999,12 @@ PropertyMatch(struct objlist *ob1, int file1,
else if ((t2type != PROPERTY) && (checked_one == TRUE)) { else if ((t2type != PROPERTY) && (checked_one == TRUE)) {
// t1 has more property records than t2, and they did not get // t1 has more property records than t2, and they did not get
// merged equally by PropertySortAndCombine(). // merged equally by PropertySortAndCombine().
Fprintf(stdout, "Circuit 2 parallel/series network does not match" if (do_print) {
Fprintf(stdout, "Circuit 2 parallel/series network does not match"
" Circuit 1\n"); " Circuit 1\n");
DumpNetwork(ob1, 1); DumpNetwork(ob1, 1);
DumpNetwork(ob2, 2); DumpNetwork(ob2, 2);
}
mismatches++; mismatches++;
} }
else if (t2type != PROPERTY) { else if (t2type != PROPERTY) {