Changeset 1507
 Timestamp:
 05/29/18 14:43:56 (6 years ago)
 Location:
 XIOS
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

XIOS/dev/XIOS_DEV_CMIP6/src/node/mesh.cpp
r1158 r1507 532 532 533 533 // For determining the global edge index 534 size_tnbEdgesOnProc = nbEdges_;535 size_tnbEdgesAccum;534 unsigned long nbEdgesOnProc = nbEdges_; 535 unsigned long nbEdgesAccum; 536 536 MPI_Scan(&nbEdgesOnProc, &nbEdgesAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 537 537 nbEdgesAccum = nbEdges_; … … 662 662 // Maps modified in this step: 663 663 // nodeIdx2Idx = <idx, idxGlo> 664 intnodeCount = nodeIdx2Idx.size();665 intnodeStart, nbNodes;664 unsigned long nodeCount = nodeIdx2Idx.size(); 665 unsigned long nodeStart, nbNodes; 666 666 MPI_Scan(&nodeCount, &nodeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 667 667 int nNodes = nodeStart; … … 755 755 756 756 // For determining the global face index 757 size_tnbFacesOnProc = nbFaces_;758 size_tnbFacesAccum;757 unsigned long nbFacesOnProc = nbFaces_; 758 unsigned long nbFacesAccum; 759 759 MPI_Scan(&nbFacesOnProc, &nbFacesAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 760 760 nbFacesAccum = nbFaces_; … … 880 880 } 881 881 882 intedgeStart, nbEdges;882 unsigned long edgeStart, nbEdges; 883 883 MPI_Scan(&edgeCount, &edgeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 884 884 int nEdges = edgeStart; … … 1100 1100 } 1101 1101 1102 intedgeCount = edgeIdx2Idx.size();1103 intedgeStart, nbEdges;1102 unsigned long edgeCount = edgeIdx2Idx.size(); 1103 unsigned long edgeStart, nbEdges; 1104 1104 MPI_Scan(&edgeCount, &edgeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 1105 1105 int nEdges = edgeStart; … … 1370 1370 // Maps modified in this step: 1371 1371 // nodeIdx2Idx = <idx, idxGlo> 1372 intnodeCount = nodeIdx2Idx.size();1373 intnodeStart, nbNodes;1372 unsigned long nodeCount = nodeIdx2Idx.size(); 1373 unsigned long nodeStart, nbNodes; 1374 1374 MPI_Scan(&nodeCount, &nodeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 1375 1375 int nNodes = nodeStart; … … 1490 1490 } 1491 1491 1492 intedgeCount = edgeIdx2Idx.size();1493 intedgeStart, nbEdges;1492 unsigned long edgeCount = edgeIdx2Idx.size(); 1493 unsigned long edgeStart, nbEdges; 1494 1494 MPI_Scan(&edgeCount, &edgeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 1495 1495 int nEdges = edgeStart; 
XIOS/trunk/src/node/mesh.cpp
r1002 r1507 532 532 533 533 // For determining the global edge index 534 size_tnbEdgesOnProc = nbEdges_;535 size_tnbEdgesAccum;534 unsigned long nbEdgesOnProc = nbEdges_; 535 unsigned long nbEdgesAccum; 536 536 MPI_Scan(&nbEdgesOnProc, &nbEdgesAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 537 537 nbEdgesAccum = nbEdges_; … … 662 662 // Maps modified in this step: 663 663 // nodeIdx2Idx = <idx, idxGlo> 664 intnodeCount = nodeIdx2Idx.size();665 intnodeStart, nbNodes;664 unsigned long nodeCount = nodeIdx2Idx.size(); 665 unsigned long nodeStart, nbNodes; 666 666 MPI_Scan(&nodeCount, &nodeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 667 667 int nNodes = nodeStart; … … 755 755 756 756 // For determining the global face index 757 size_tnbFacesOnProc = nbFaces_;758 size_tnbFacesAccum;757 unsigned long nbFacesOnProc = nbFaces_; 758 unsigned long nbFacesAccum; 759 759 MPI_Scan(&nbFacesOnProc, &nbFacesAccum, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 760 760 nbFacesAccum = nbFaces_; … … 880 880 } 881 881 882 intedgeStart, nbEdges;882 unsigned long edgeStart, nbEdges; 883 883 MPI_Scan(&edgeCount, &edgeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 884 884 int nEdges = edgeStart; … … 1100 1100 } 1101 1101 1102 intedgeCount = edgeIdx2Idx.size();1103 intedgeStart, nbEdges;1102 unsigned long edgeCount = edgeIdx2Idx.size(); 1103 unsigned long edgeStart, nbEdges; 1104 1104 MPI_Scan(&edgeCount, &edgeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 1105 1105 int nEdges = edgeStart; … … 1370 1370 // Maps modified in this step: 1371 1371 // nodeIdx2Idx = <idx, idxGlo> 1372 intnodeCount = nodeIdx2Idx.size();1373 intnodeStart, nbNodes;1372 unsigned long nodeCount = nodeIdx2Idx.size(); 1373 unsigned long nodeStart, nbNodes; 1374 1374 MPI_Scan(&nodeCount, &nodeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 1375 1375 int nNodes = nodeStart; … … 1490 1490 } 1491 1491 1492 intedgeCount = edgeIdx2Idx.size();1493 intedgeStart, nbEdges;1492 unsigned long edgeCount = edgeIdx2Idx.size(); 1493 unsigned long edgeStart, nbEdges; 1494 1494 MPI_Scan(&edgeCount, &edgeStart, 1, MPI_UNSIGNED_LONG, MPI_SUM, comm); 1495 1495 int nEdges = edgeStart;
Note: See TracChangeset
for help on using the changeset viewer.