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

parallel multidim fix

Browse Source
This commit is contained in:
Joachim Schoeberl 2011-11-03 11:02:05 +00:00
parent fec9740f4c
commit bf3a579548
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/visualization/vsmesh.cpp
View File

@ -914,7 +914,7 @@ namespace netgen
for ( int dest = 1; dest < ntasks; dest++ ) for ( int dest = 1; dest < ntasks; dest++ )
{ {
MyMPI_Recv (par_filledlists[dest], dest, MPI_TAG_VIS); MyMPI_Recv (par_filledlists[dest], dest, MPI_TAG_VIS);
cout << "proc " << dest << " has drawn to list " << par_filledlists[dest] << endl; // cout << "proc " << dest << " has drawn to list " << par_filledlists[dest] << endl;
} }
if (filledlist) if (filledlist)

31
libsrc/visualization/vssolution.cpp
View File

@ -697,8 +697,7 @@ namespace netgen
if (vispar.clipenable && clipsolution == 1 && sol) if (vispar.clipenable && clipsolution == 1 && sol)
DrawClipPlaneTrigs (); // sol, scalcomp); DrawClipPlaneTrigs ();
if (clipplanelist_vec) if (clipplanelist_vec)
glDeleteLists (clipplanelist_vec, 1); glDeleteLists (clipplanelist_vec, 1);
@ -971,8 +970,6 @@ namespace netgen
glEndList (); glEndList ();
} }
glEnd(); glEnd();
} }
clipplanetimestamp = max2 (vispar.clipplanetimestamp, solutiontimestamp); clipplanetimestamp = max2 (vispar.clipplanetimestamp, solutiontimestamp);
@ -1031,6 +1028,10 @@ namespace netgen
if (mesh->GetTimeStamp () > solutiontimestamp) if (mesh->GetTimeStamp () > solutiontimestamp)
sol = NULL; sol = NULL;
if (sol && sol->solclass) sol->solclass->SetMultiDimComponent (multidimcomponent);
glLineWidth (1.0f); glLineWidth (1.0f);
GLfloat col_grey[] = { 0.6f, 0.6f, 0.6f }; GLfloat col_grey[] = { 0.6f, 0.6f, 0.6f };
@ -3715,8 +3716,7 @@ namespace netgen
void VisualSceneSolution :: void VisualSceneSolution :: DrawClipPlaneTrigs ()
DrawClipPlaneTrigs () // const SolData * sol, int comp)
{ {
#ifdef PARALLELGL #ifdef PARALLELGL
@ -3726,13 +3726,6 @@ namespace netgen
Array<int> parlists (ntasks); Array<int> parlists (ntasks);
/*
for ( int dest = 1; dest < ntasks; dest++ )
{
MyMPI_Send ("redraw", dest, MPI_TAG_CMD);
MyMPI_Send ("clipplanetrigs", dest, MPI_TAG_VIS);
}
*/
MyMPI_SendCmd ("redraw"); MyMPI_SendCmd ("redraw");
MyMPI_SendCmd ("clipplanetrigs"); MyMPI_SendCmd ("clipplanetrigs");
@ -4117,7 +4110,7 @@ namespace netgen
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 4 1, 4, 1
}; };
MPI_Aint displ[] = { (char*)&usetexture - (char*)this, MPI_Aint displ[] = { (char*)&usetexture - (char*)this,
(char*)&clipsolution - (char*)this, (char*)&clipsolution - (char*)this,
@ -4135,22 +4128,22 @@ namespace netgen
(char*)&subdivisions - (char*)this, (char*)&subdivisions - (char*)this,
(char*)&evalfunc - (char*)this, (char*)&evalfunc - (char*)this,
(char*)&clipplane[0] - (char*)this,
(char*)&clipplane[0] - (char*)this }; (char*)&multidimcomponent - (char*)this
};
MPI_Datatype types[] = { MPI_Datatype types[] = {
MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT,
MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT, MPI_INT,
MPI_DOUBLE, MPI_DOUBLE, MPI_INT, MPI_INT, MPI_DOUBLE, MPI_DOUBLE, MPI_INT, MPI_INT,
MPI_INT, MPI_DOUBLE MPI_INT, MPI_DOUBLE, MPI_INT
}; };
MPI_Type_create_struct (14, blocklen, displ, types, &type); MPI_Type_create_struct (15, blocklen, displ, types, &type);
MPI_Type_commit ( &type ); MPI_Type_commit ( &type );
MPI_Bcast (this, 1, type, 0, MPI_COMM_WORLD); MPI_Bcast (this, 1, type, 0, MPI_COMM_WORLD);
MPI_Type_free (&type); MPI_Type_free (&type);
/* /*