Commit 50491743 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Add a safety MPI barrier after broadcasting configuration objects

parent afe16f63

src/cluster/cluster.cpp

+3 −1
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ void cluster(const string& config_file, const string& data_file, const string& o 
	sconf->mpibcast(mpidata);	    

	cid->mpibcast(mpidata);

	p_scattering_angles->mpibcast(mpidata);

	int send_barrier = MPI_Barrier(MPI_COMM_WORLD);

      }

#endif

      // Create this variable and initialise it with a default here, so that it is defined anyway, with or without OpenMP support enabled
@@ -612,6 +613,7 @@ void cluster(const string& config_file, const string& data_file, const string& o 
    ScattererConfiguration *sconf = new ScattererConfiguration(mpidata);

    ClusterIterationData *cid = new ClusterIterationData(mpidata, device_count);

    ScatteringAngles *p_scattering_angles = new ScatteringAngles(mpidata);

    int recv_barrier = MPI_Barrier(MPI_COMM_WORLD);



    // Create this variable and initialise it with a default here, so that it is defined anyway, with or without OpenMP support enabled

    int ompnumthreads = 1;

src/inclusion/inclusion.cpp

+4 −2
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ void inclusion(const string& config_file, const string& data_file, const string& 
	sconf->mpibcast(mpidata);	    

	cid->mpibcast(mpidata);

	p_scattering_angles->mpibcast(mpidata);

	int send_barrier = MPI_Barrier(MPI_COMM_WORLD);

      }

#endif

      // Create this variable and initialise it with a default here, so that it is defined anyway, with or without OpenMP support enabled
@@ -569,6 +570,7 @@ void inclusion(const string& config_file, const string& data_file, const string& 
    ScattererConfiguration *sconf = new ScattererConfiguration(mpidata);

    InclusionIterationData *cid = new InclusionIterationData(mpidata, device_count);

    ScatteringAngles *p_scattering_angles = new ScatteringAngles(mpidata);

    int recv_barrier = MPI_Barrier(MPI_COMM_WORLD);

    

    // Create this variable and initialise it with a default here, so that it is defined anyway, with or without OpenMP support enabled

    int ompnumthreads = 1;

src/sphere/sphere.cpp

+3 −1
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ void sphere(const string& config_file, const string& data_file, const string& ou 
	sconf->mpibcast(mpidata);	    

	sid->mpibcast(mpidata);

	p_sa->mpibcast(mpidata);

	int send_barrier = MPI_Barrier(MPI_COMM_WORLD);

      }

#endif

      // Create this variable and initialise it with a default here, so that it is defined anyway, with or without OpenMP support enabled
@@ -340,6 +341,7 @@ void sphere(const string& config_file, const string& data_file, const string& ou 
    ScattererConfiguration *sconf = new ScattererConfiguration(mpidata);

    SphereIterationData *sid = new SphereIterationData(mpidata, device_count);

    ScatteringAngles *p_sa = new ScatteringAngles(mpidata);

    int recv_barrier = MPI_Barrier(MPI_COMM_WORLD);

    

    // Create this variable and initialise it with a default here, so that it is defined anyway, with or without OpenMP support enabled

    int ompnumthreads = 1;