Code refactoring. (293a4bc0) · Commits · TNL / tnl-dev

src/TNL/Communicators/NoDistrCommunicator.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -72,13 +72,13 @@ namespace Communicators {
		static Request ISend( const T *data, int count, int dest)
		{
		return 1;
		};
		}

		template <typename T>
		static Request IRecv( const T *data, int count, int src)
		{
		return 1;
		};
		}

		static void WaitAll(Request *reqs, int length)
		{
		@@ -87,7 +87,7 @@ namespace Communicators {
		template< typename T >
		static void Bcast( T& data, int count, int root)
		{
		};
		}

		/* template< typename T >
		static void Allreduce( T& data,

src/TNL/Functions/MeshFunction_impl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -547,7 +547,7 @@ MeshFunction< Mesh, MeshEntityDimension, Real >::
		Synchronize()
		{
		auto distrMesh = this->getMesh().GetDistMesh();
		if(distrMesh != NULL && distrMesh->IsDistributed())
		if(distrMesh != NULL && distrMesh->isDistributed())
		{
		this->synchronizer.template Synchronize<CommunicatorType>(*this);
		}

src/TNL/Meshes/DistributedMeshes/DistributedGridSynchronizer.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ private:
		{
		TNL_ASSERT_TRUE(isSet,"Synchronizer is not set, but used to Synchronize");

		if(!distributedgrid->IsDistributed())
		if(!distributedgrid->isDistributed())
		return;

		int leftN=distributedgrid->getLeft();
		@@ -250,7 +250,7 @@ class DistributedMeshSynchronizer< Functions::MeshFunction< Grid< 2, GridReal, D

		TNL_ASSERT_TRUE(isSet,"Synchronizer is not set, but used to Synchronize");

		if(!distributedgrid->IsDistributed())
		if(!distributedgrid->isDistributed())
		return;

		int *neighbor=distributedgrid->getNeighbors();
		@@ -427,7 +427,7 @@ class DistributedMeshSynchronizer< Functions::MeshFunction< Grid< 3, GridReal, D

		TNL_ASSERT_TRUE(isSet,"Synchronizer is not set, but used to Synchronize");

		if(!distributedgrid->IsDistributed())
		if(!distributedgrid->isDistributed())
		return;

		int *neighbor=distributedgrid->getNeighbors();

src/TNL/Meshes/DistributedMeshes/DistributedGrid_1D.h

+191 −190

Original line number	Diff line number	Diff line
		@@ -29,33 +29,6 @@ class DistributedMesh<Grid< 1, RealType, Device, Index >>

		static constexpr int getMeshDimension() { return 1; };

		private :

		PointType localorigin;
		CoordinatesType localbegin;
		CoordinatesType localsize;
		CoordinatesType localgridsize;
		CoordinatesType overlap;
		CoordinatesType globalsize;
		CoordinatesType globalbegin;
		PointType spaceSteps;


		IndexType Dimensions;
		bool isDistributed;

		int rank;
		int nproc;

		int numberoflarger;

		int left;
		int right;

		bool isSet;


		public:

		DistributedMesh()
		{
		@@ -76,7 +49,7 @@ class DistributedMesh<Grid< 1, RealType, Device, Index >>
		Dimensions= GridType::getMeshDimension();
		spaceSteps=globalGrid.getSpaceSteps();

		isDistributed=false;
		distributed=false;
		if(CommunicatorType::IsInitialized())
		{
		rank=CommunicatorType::GetRank();
		@@ -84,23 +57,23 @@ class DistributedMesh<Grid< 1, RealType, Device, Index >>
		//use only if have more than one process
		if(this->nproc>1)
		{
		isDistributed=true;
		distributed=true;
		}
		}

		if(!isDistributed)
		if(!distributed)
		{
		//Without distribution

		std::cout <<"BEZ Distribuce"<<std::endl;
		rank=0;
		localorigin=globalGrid.getOrigin();
		localsize=globalGrid.getDimensions();
		localgridsize=globalGrid.getDimensions();
		globalsize=globalGrid.getDimensions();
		globalbegin=CoordinatesType(0);
		localOrigin=globalGrid.getOrigin();
		localSize=globalGrid.getDimensions();
		localGridSize=globalGrid.getDimensions();
		globalSize=globalGrid.getDimensions();
		globalBegin=CoordinatesType(0);

		localbegin=CoordinatesType(0);
		localBegin=CoordinatesType(0);
		return;
		}
		else
		@@ -111,43 +84,43 @@ class DistributedMesh<Grid< 1, RealType, Device, Index >>
		if(rank!=nproc-1)
		right=rank+1;

		globalsize=globalGrid.getDimensions();
		globalSize=globalGrid.getDimensions();

		//compute local mesh size
		numberoflarger=globalGrid.getDimensions().x()%nproc;
		numberOfLarger=globalGrid.getDimensions().x()%nproc;

		localsize.x()=(globalGrid.getDimensions().x()/nproc);
		if(numberoflarger>rank)
		localsize.x()+=1;
		localSize.x()=(globalGrid.getDimensions().x()/nproc);
		if(numberOfLarger>rank)
		localSize.x()+=1;

		if(numberoflarger>rank)
		if(numberOfLarger>rank)
		{
		globalbegin.x()=rank*localsize.x();
		localorigin.x()=globalGrid.getOrigin().x()
		+(globalbegin.x()-overlap.x())*globalGrid.getSpaceSteps().x();
		globalBegin.x()=rank*localSize.x();
		localOrigin.x()=globalGrid.getOrigin().x()
		+(globalBegin.x()-overlap.x())*globalGrid.getSpaceSteps().x();
		}
		else
		{
		globalbegin.x()=numberoflarger(localsize.x()+1)+(rank-numberoflarger)localsize.x();
		localorigin.x()=(globalGrid.getOrigin().x()-overlap.x())
		+globalbegin.x()*globalGrid.getSpaceSteps().x();
		globalBegin.x()=numberOfLarger(localSize.x()+1)+(rank-numberOfLarger)localSize.x();
		localOrigin.x()=(globalGrid.getOrigin().x()-overlap.x())
		+globalBegin.x()*globalGrid.getSpaceSteps().x();
		}

		localbegin=overlap;
		localBegin=overlap;

		//vlevo neni prekryv
		if(left==-1)
		{
		localorigin.x()+=overlap.x()*globalGrid.getSpaceSteps().x();
		localbegin.x()=0;
		localOrigin.x()+=overlap.x()*globalGrid.getSpaceSteps().x();
		localBegin.x()=0;
		}

		localgridsize=localsize;
		localGridSize=localSize;
		//add overlaps
		if(left==-1\|\|right==-1)
		localgridsize.x()+=overlap.x();
		localGridSize.x()+=overlap.x();
		else
		localgridsize.x()+=2*overlap.x();
		localGridSize.x()+=2*overlap.x();

		}
		}
		@@ -155,8 +128,8 @@ class DistributedMesh<Grid< 1, RealType, Device, Index >>
		void setupGrid( GridType& grid)
		{
		TNL_ASSERT_TRUE(isSet,"DistributedGrid is not set, but used by SetupGrid");
		grid.setOrigin(localorigin);
		grid.setDimensions(localgridsize);
		grid.setOrigin(localOrigin);
		grid.setDimensions(localGridSize);
		//compute local proporions by sideefect
		grid.setSpaceSteps(spaceSteps);
		grid.SetDistMesh(this);
		@@ -172,9 +145,9 @@ class DistributedMesh<Grid< 1, RealType, Device, Index >>
		return convertToString(nproc);
		};

		bool IsDistributed(void)
		bool isDistributed()
		{
		return this->isDistributed;
		return this->distributed;
		};

		int getLeft()
		@@ -194,35 +167,63 @@ class DistributedMesh<Grid< 1, RealType, Device, Index >>
		return this->overlap;
		};

		//number of elemnts of local sub domain WITHOUT overlap
		//number of elements of local sub domain WITHOUT overlap
		CoordinatesType getLocalSize()
		{
		return this->localsize;
		return this->localSize;
		}

		//number of elements of global grid
		CoordinatesType getGlobalSize()
		{
		return this->globalsize;
		return this->globalSize;
		}

		//coordinates of begin of local subdomain without overlaps in global grid
		CoordinatesType getGlobalBegin()
		{
		return this->globalbegin;
		return this->globalBegin;
		}

		//number of elemnts of local sub domain WITH overlap
		CoordinatesType getLocalGridSize()
		{
		return this->localgridsize;
		return this->localGridSize;
		}

		//coordinates of begin of local subdomain without overlaps in local grid
		CoordinatesType getLocalBegin()
		{
		return this->localbegin;
		return this->localBegin;
		}


		private :

		PointType localOrigin;
		CoordinatesType localBegin;
		CoordinatesType localSize;
		CoordinatesType localGridSize;
		CoordinatesType overlap;
		CoordinatesType globalSize;
		CoordinatesType globalBegin;
		PointType spaceSteps;


		IndexType Dimensions;
		bool distributed;

		int rank;
		int nproc;

		int numberOfLarger;

		int left;
		int right;

		bool isSet;


		};

src/TNL/Meshes/DistributedMeshes/DistributedGrid_2D.h

+104 −109

Original line number	Diff line number	Diff line
		@@ -30,31 +30,6 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>

		static constexpr int getMeshDimension() { return 2; };

		private :

		PointType spaceSteps;
		PointType localorigin;
		CoordinatesType localsize;//velikost gridu zpracovavane danym uzlem bez prekryvu
		CoordinatesType localbegin;//souradnice zacatku zpracovavane vypoctove oblasi
		CoordinatesType localgridsize;//velikost lokálního gridu včetně překryvů
		CoordinatesType overlap;
		CoordinatesType globalsize;//velikost celé sítě
		CoordinatesType globalbegin;


		IndexType Dimensions;
		bool isDistributed;

		int rank;
		int nproc;

		int procsdistr[2];
		int myproccoord[2];
		int numberoflarger[2];

		int neighbors[8];

		bool isSet;

		public:
		DistributedMesh()
		@@ -62,9 +37,10 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>
		isSet=false;
		};

		//compute everithing
		template< typename CommunicatorType >
		void setGlobalGrid(GridType &globalGrid, CoordinatesType overlap, int *distribution=NULL)
		void setGlobalGrid( GridType &globalGrid,
		CoordinatesType overlap,
		int *distribution=NULL )
		{
		isSet=true;

		@@ -76,9 +52,7 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>
		Dimensions= GridType::getMeshDimension();
		spaceSteps=globalGrid.getSpaceSteps();
		//Detect MPI and number of process
		isDistributed=false;


		distributed=false;

		if( CommunicatorType::IsInitialized() )
		{
		@@ -87,24 +61,24 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>
		//use MPI only if have more than one process
		if(this->nproc>1)
		{
		isDistributed=true;
		distributed=true;
		}
		}

		if(!isDistributed)
		if( !distributed )
		{
		//Without MPI
		myproccoord[0]=0;
		myproccoord[1]=0;
		processesCoordinates[0]=0;
		processesCoordinates[1]=0;
		procsdistr[0]=1;
		procsdistr[1]=1;
		localorigin=globalGrid.getOrigin();
		localgridsize=globalGrid.getDimensions();
		localsize=globalGrid.getDimensions();
		globalsize=globalGrid.getDimensions();
		globalbegin=CoordinatesType(0);
		localbegin.x()=0;
		localbegin.y()=0;
		localOrigin=globalGrid.getOrigin();
		localGridSize=globalGrid.getDimensions();
		localSize=globalGrid.getDimensions();
		globalSize=globalGrid.getDimensions();
		globalBegin=CoordinatesType(0);
		localBegin.x()=0;
		localBegin.y()=0;

		return;
		}
		@@ -124,89 +98,86 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>
		}
		CommunicatorType::DimsCreate(nproc, 2, procsdistr);

		myproccoord[0]=rank%procsdistr[0];
		myproccoord[1]=rank/procsdistr[0];
		processesCoordinates[0]=rank%procsdistr[0];
		processesCoordinates[1]=rank/procsdistr[0];

		//compute local mesh size
		globalsize=globalGrid.getDimensions();
		numberoflarger[0]=globalGrid.getDimensions().x()%procsdistr[0];
		numberoflarger[1]=globalGrid.getDimensions().y()%procsdistr[1];
		globalSize=globalGrid.getDimensions();
		numberOfLarger[0]=globalGrid.getDimensions().x()%procsdistr[0];
		numberOfLarger[1]=globalGrid.getDimensions().y()%procsdistr[1];

		localsize.x()=(globalGrid.getDimensions().x()/procsdistr[0]);
		localsize.y()=(globalGrid.getDimensions().y()/procsdistr[1]);
		localSize.x()=(globalGrid.getDimensions().x()/procsdistr[0]);
		localSize.y()=(globalGrid.getDimensions().y()/procsdistr[1]);

		if(numberoflarger[0]>myproccoord[0])
		localsize.x()+=1;
		if(numberoflarger[1]>myproccoord[1])
		localsize.y()+=1;
		if(numberOfLarger[0]>processesCoordinates[0])
		localSize.x()+=1;
		if(numberOfLarger[1]>processesCoordinates[1])
		localSize.y()+=1;

		if(numberoflarger[0]>myproccoord[0])
		globalbegin.x()=myproccoord[0]*localsize.x();
		if(numberOfLarger[0]>processesCoordinates[0])
		globalBegin.x()=processesCoordinates[0]*localSize.x();
		else
		globalbegin.x()=numberoflarger[0](localsize.x()+1)+(myproccoord[0]-numberoflarger[0])localsize.x();
		globalBegin.x()=numberOfLarger[0](localSize.x()+1)+(processesCoordinates[0]-numberOfLarger[0])localSize.x();

		if(numberoflarger[1]>myproccoord[1])
		globalbegin.y()=myproccoord[1]*localsize.y();
		if(numberOfLarger[1]>processesCoordinates[1])
		globalBegin.y()=processesCoordinates[1]*localSize.y();

		else
		globalbegin.y()=numberoflarger[1](localsize.y()+1)+(myproccoord[1]-numberoflarger[1])localsize.y();
		globalBegin.y()=numberOfLarger[1](localSize.y()+1)+(processesCoordinates[1]-numberOfLarger[1])localSize.y();

		localorigin=globalGrid.getOrigin()+TNL::Containers::tnlDotProduct(globalGrid.getSpaceSteps(),globalbegin-overlap);
		localOrigin=globalGrid.getOrigin()+TNL::Containers::tnlDotProduct(globalGrid.getSpaceSteps(),globalBegin-overlap);

		//nearnodes
		if(myproccoord[0]>0)
		neighbors[Left]=getRankOfProcCoord(myproccoord[0]-1,myproccoord[1]);
		if(myproccoord[0]<procsdistr[0]-1)
		neighbors[Right]=getRankOfProcCoord(myproccoord[0]+1,myproccoord[1]);
		if(myproccoord[1]>0)
		neighbors[Up]=getRankOfProcCoord(myproccoord[0],myproccoord[1]-1);
		if(myproccoord[1]<procsdistr[1]-1)
		neighbors[Down]=getRankOfProcCoord(myproccoord[0],myproccoord[1]+1);
		if(myproccoord[0]>0 && myproccoord[1]>0)
		neighbors[UpLeft]=getRankOfProcCoord(myproccoord[0]-1,myproccoord[1]-1);
		if(myproccoord[0]>0 && myproccoord[1]<procsdistr[1]-1)
		neighbors[DownLeft]=getRankOfProcCoord(myproccoord[0]-1,myproccoord[1]+1);
		if(myproccoord[0]<procsdistr[0]-1 && myproccoord[1]>0)
		neighbors[UpRight]=getRankOfProcCoord(myproccoord[0]+1,myproccoord[1]-1);
		if(myproccoord[0]<procsdistr[0]-1 && myproccoord[1]<procsdistr[1]-1)
		neighbors[DownRight]=getRankOfProcCoord(myproccoord[0]+1,myproccoord[1]+1);

		localbegin=overlap;
		if(processesCoordinates[0]>0)
		neighbors[Left]=getRankOfProcCoord(processesCoordinates[0]-1,processesCoordinates[1]);
		if(processesCoordinates[0]<procsdistr[0]-1)
		neighbors[Right]=getRankOfProcCoord(processesCoordinates[0]+1,processesCoordinates[1]);
		if(processesCoordinates[1]>0)
		neighbors[Up]=getRankOfProcCoord(processesCoordinates[0],processesCoordinates[1]-1);
		if(processesCoordinates[1]<procsdistr[1]-1)
		neighbors[Down]=getRankOfProcCoord(processesCoordinates[0],processesCoordinates[1]+1);
		if(processesCoordinates[0]>0 && processesCoordinates[1]>0)
		neighbors[UpLeft]=getRankOfProcCoord(processesCoordinates[0]-1,processesCoordinates[1]-1);
		if(processesCoordinates[0]>0 && processesCoordinates[1]<procsdistr[1]-1)
		neighbors[DownLeft]=getRankOfProcCoord(processesCoordinates[0]-1,processesCoordinates[1]+1);
		if(processesCoordinates[0]<procsdistr[0]-1 && processesCoordinates[1]>0)
		neighbors[UpRight]=getRankOfProcCoord(processesCoordinates[0]+1,processesCoordinates[1]-1);
		if(processesCoordinates[0]<procsdistr[0]-1 && processesCoordinates[1]<procsdistr[1]-1)
		neighbors[DownRight]=getRankOfProcCoord(processesCoordinates[0]+1,processesCoordinates[1]+1);

		localBegin=overlap;

		if(neighbors[Left]==-1)
		{
		localorigin.x()+=overlap.x()*globalGrid.getSpaceSteps().x();
		localbegin.x()=0;
		localOrigin.x()+=overlap.x()*globalGrid.getSpaceSteps().x();
		localBegin.x()=0;
		}

		if(neighbors[Up]==-1)
		{
		localorigin.y()+=overlap.y()*globalGrid.getSpaceSteps().y();
		localbegin.y()=0;
		localOrigin.y()+=overlap.y()*globalGrid.getSpaceSteps().y();
		localBegin.y()=0;
		}

		localgridsize=localsize;
		localGridSize=localSize;
		//Add Overlaps
		if(neighbors[Left]!=-1)
		localgridsize.x()+=overlap.x();
		localGridSize.x()+=overlap.x();
		if(neighbors[Right]!=-1)
		localgridsize.x()+=overlap.x();
		localGridSize.x()+=overlap.x();

		if(neighbors[Up]!=-1)
		localgridsize.y()+=overlap.y();
		localGridSize.y()+=overlap.y();
		if(neighbors[Down]!=-1)
		localgridsize.y()+=overlap.y();
		localGridSize.y()+=overlap.y();
		}



		}

		void setupGrid( GridType& grid)
		{
		TNL_ASSERT_TRUE(isSet,"DistributedGrid is not set, but used by SetupGrid");
		grid.setOrigin(localorigin);
		grid.setDimensions(localgridsize);
		grid.setOrigin( localOrigin );
		grid.setDimensions( localGridSize );
		//compute local proporions by sideefect
		grid.setSpaceSteps( spaceSteps );
		grid.SetDistMesh(this);
		@@ -214,7 +185,7 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>

		String printProcessCoords()
		{
		return convertToString(myproccoord[0])+String("-")+convertToString(myproccoord[1]);
		return convertToString(processesCoordinates[0])+String("-")+convertToString(processesCoordinates[1]);
		};

		String printProcessDistr()
		@@ -222,9 +193,9 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>
		return convertToString(procsdistr[0])+String("-")+convertToString(procsdistr[1]);
		};

		bool IsDistributed(void)
		bool isDistributed()
		{
		return this->isDistributed;
		return this->distributed;
		};

		CoordinatesType getOverlap()
		@@ -240,30 +211,30 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>

		CoordinatesType getLocalSize()
		{
		return this->localsize;
		return this->localSize;
		}

		//number of elements of global grid
		CoordinatesType getGlobalSize()
		{
		return this->globalsize;
		return this->globalSize;
		}

		//coordinates of begin of local subdomain without overlaps in global grid
		CoordinatesType getGlobalBegin()
		{
		return this->globalbegin;
		return this->globalBegin;
		}

		CoordinatesType getLocalGridSize()
		{
		return this->localgridsize;
		return this->localGridSize;
		}


		CoordinatesType getLocalBegin()
		{
		return this->localbegin;
		return this->localBegin;
		}

		private :
		@@ -273,6 +244,30 @@ class DistributedMesh<Grid< 2, RealType, Device, Index >>
		return y*procsdistr[0]+x;
		}

		PointType spaceSteps;
		PointType localOrigin;
		CoordinatesType localSize;//velikost gridu zpracovavane danym uzlem bez prekryvu
		CoordinatesType localBegin;//souradnice zacatku zpracovavane vypoctove oblasi
		CoordinatesType localGridSize;//velikost lokálního gridu včetně překryvů
		CoordinatesType overlap;
		CoordinatesType globalSize;//velikost celé sítě
		CoordinatesType globalBegin;


		IndexType Dimensions;
		bool distributed;

		int rank;
		int nproc;

		int procsdistr[2];
		CoordinatesType processesCoordinates;
		int numberOfLarger[2];

		int neighbors[8];

		bool isSet;


		};