ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix MPI + empty bc/mat-names. (But that should not happen..)

Browse Source
This commit is contained in:
Lukas 2019-02-25 16:38:21 +01:00
parent 4637854c9b
commit a2f81d0337
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/meshing/parallelmesh.cpp
View File

@ -702,7 +702,7 @@ namespace netgen
Array<int> bcname_sizes(nbcs); Array<int> bcname_sizes(nbcs);
int tot_bcsize = 0; int tot_bcsize = 0;
for(int k=0;k<nbcs;k++) { for(int k=0;k<nbcs;k++) {
bcname_sizes[k] = bcnames[k]->size(); bcname_sizes[k] = (bcnames[k]!=NULL) ? bcnames[k]->size() : 0;
tot_bcsize += bcname_sizes[k]; tot_bcsize += bcname_sizes[k];
} }
char compiled_bcnames[tot_bcsize]; char compiled_bcnames[tot_bcsize];
@ -722,7 +722,7 @@ namespace netgen
Array<int> mat_sizes(nmats); Array<int> mat_sizes(nmats);
int tot_matsize = 0; int tot_matsize = 0;
for(int k=0;k<nmats;k++) { for(int k=0;k<nmats;k++) {
mat_sizes[k] = materials[k]->size(); mat_sizes[k] = (materials[k]!=NULL) ? materials[k]->size() : 0;
tot_matsize += mat_sizes[k]; tot_matsize += mat_sizes[k];
} }
char compiled_mats[tot_matsize]; char compiled_mats[tot_matsize];
@ -965,7 +965,7 @@ namespace netgen
SetNBCNames(nbcs); SetNBCNames(nbcs);
int cnt = 0; int cnt = 0;
for(int k=0;k<nbcs;k++) { for(int k=0;k<nbcs;k++) {
SetBCName(k, string(&compiled_bcnames[cnt], bcs[k])); if(bcs[k]>0) SetBCName(k, string(&compiled_bcnames[cnt], bcs[k]));
cnt += bcs[k]; cnt += bcs[k];
} }
@ -983,7 +983,7 @@ namespace netgen
materials.SetSize(nmats); materials.SetSize(nmats);
for(int k=0;k<nmats;k++) { for(int k=0;k<nmats;k++) {
// setmaterial is 1-based ... // setmaterial is 1-based ...
SetMaterial(k+1, string(&compiled_mats[cnt], matsz[k])); if(matsz[k]>0) SetMaterial(k+1, string(&compiled_mats[cnt], matsz[k]));
cnt += matsz[k]; cnt += matsz[k];
} }