portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2024-11-13 01:05:36 +00:00
Code Releases Activity

Merge branch 'develop' into feature/scalar_adjointFT

Browse Source
This commit is contained in:
Guido Cossu 2017-10-25 10:49:50 +01:00
commit e0cae833da
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cartesian/Cartesian_full.h
View File

@ -81,6 +81,8 @@ public:
Init(dimensions,simd_layout,processor_grid); Init(dimensions,simd_layout,processor_grid);
} }
virtual ~GridCartesian() = default;
void Init(const std::vector<int> &dimensions, void Init(const std::vector<int> &dimensions,
const std::vector<int> &simd_layout, const std::vector<int> &simd_layout,
const std::vector<int> &processor_grid) const std::vector<int> &processor_grid)
@ -159,7 +161,6 @@ public:
} }
}; };
virtual ~GridCartesian() = default;
}; };
} }
#endif #endif

2
lib/cartesian/Cartesian_red_black.h
View File

@ -133,6 +133,8 @@ public:
{ {
Init(base->_fdimensions,base->_simd_layout,base->_processors,checker_dim_mask,checker_dim) ; Init(base->_fdimensions,base->_simd_layout,base->_processors,checker_dim_mask,checker_dim) ;
} }
virtual ~GridRedBlackCartesian() = default;
#if 0 #if 0
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Create redblack grid ;; deprecate these. Should not // Create redblack grid ;; deprecate these. Should not

7
lib/communicator/Communicator_mpi.cc
View File

@ -52,6 +52,13 @@ void CartesianCommunicator::Init(int *argc, char ***argv) {
MPI_Comm_dup (MPI_COMM_WORLD,&communicator_world); MPI_Comm_dup (MPI_COMM_WORLD,&communicator_world);
ShmInitGeneric(); ShmInitGeneric();
} }
CartesianCommunicator::~CartesianCommunicator()
{
if (communicator && !MPI::Is_finalized())
MPI_Comm_free(&communicator);
}
void CartesianCommunicator::GlobalSum(uint32_t &u){ void CartesianCommunicator::GlobalSum(uint32_t &u){
int ierr=MPI_Allreduce(MPI_IN_PLACE,&u,1,MPI_UINT32_T,MPI_SUM,communicator); int ierr=MPI_Allreduce(MPI_IN_PLACE,&u,1,MPI_UINT32_T,MPI_SUM,communicator);
assert(ierr==0); assert(ierr==0);

7
lib/communicator/Communicator_mpit.cc
View File

@ -53,6 +53,13 @@ void CartesianCommunicator::Init(int *argc, char ***argv) {
ShmInitGeneric(); ShmInitGeneric();
} }
CartesianCommunicator::~CartesianCommunicator()
{
if (communicator && !MPI::Is_finalized())
MPI_Comm_free(&communicator);
}
void CartesianCommunicator::GlobalSum(uint32_t &u){ void CartesianCommunicator::GlobalSum(uint32_t &u){
int ierr=MPI_Allreduce(MPI_IN_PLACE,&u,1,MPI_UINT32_T,MPI_SUM,communicator); int ierr=MPI_Allreduce(MPI_IN_PLACE,&u,1,MPI_UINT32_T,MPI_SUM,communicator);
assert(ierr==0); assert(ierr==0);

3
lib/communicator/Communicator_none.cc
View File

@ -57,8 +57,7 @@ CartesianCommunicator::CartesianCommunicator(const std::vector<int> &processors)
} }
CartesianCommunicator::~CartesianCommunicator(){} CartesianCommunicator::~CartesianCommunicator(){}
void CartesianCommunicator::GlobalSum(float &){} void CartesianCommunicator::GlobalSum(float &){}
void CartesianCommunicator::GlobalSumVector(float *,int N){} void CartesianCommunicator::GlobalSumVector(float *,int N){}
void CartesianCommunicator::GlobalSum(double &){} void CartesianCommunicator::GlobalSum(double &){}

5
tests/hmc/Test_hmc_ScalarActionNxN.cc
View File

@ -31,7 +31,8 @@ class ScalarActionParameters : Serializable {
public: public:
GRID_SERIALIZABLE_CLASS_MEMBERS(ScalarActionParameters, GRID_SERIALIZABLE_CLASS_MEMBERS(ScalarActionParameters,
double, mass_squared, double, mass_squared,
double, lambda); double, lambda,
double, g);
template <class ReaderClass > template <class ReaderClass >
ScalarActionParameters(Reader<ReaderClass>& Reader){ ScalarActionParameters(Reader<ReaderClass>& Reader){
@ -140,7 +141,7 @@ int main(int argc, char **argv) {
// Scalar action in adjoint representation // Scalar action in adjoint representation
ScalarActionParameters SPar(Reader); ScalarActionParameters SPar(Reader);
ScalarAction Saction(SPar.mass_squared, SPar.lambda); ScalarAction Saction(SPar.mass_squared, SPar.lambda, SPar.g);
// Collect actions // Collect actions
ActionLevel<ScalarAction::Field, ScalarNxNMatrixFields<Ncolours>> Level1(1); ActionLevel<ScalarAction::Field, ScalarNxNMatrixFields<Ncolours>> Level1(1);