Commit 0fed714a authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Set the first compilable version of inclusion to test configuration

parent 0edf267e

src/inclusion/inclusion.cpp

+2 −0
Original line number Diff line number Diff line
@@ -314,6 +314,8 @@ void inclusion(const string& config_file, const string& data_file, const string& 
      delete p_output;

      vtppoanp->write_to_disk(output_path + "/c_TPPOAN");

      delete vtppoanp;

      delete cid;

      delete p_scattering_angles;

    }

      

    delete sconf;

src/inclusion/np_inclusion.cpp

+13 −22
Original line number Diff line number Diff line
@@ -64,14 +64,8 @@ extern void inclusion(const string& config_file, const string& data_file, const 
 * \return result: `int` An exit code passed to the OS (0 for succesful execution).

 */

int main(int argc, char **argv) {

#ifdef MPI_VERSION

	int ierr = MPI_Init(&argc, &argv);

	// create and initialise class with essential MPI data

	mixMPI *mpidata = new mixMPI(MPI_COMM_WORLD);

#else

  // create a the class with dummy data if we are not using MPI at all

  mixMPI *mpidata = new mixMPI();

#endif

  string config_file = "../../test_data/inclusion/DEDFB";

  string data_file = "../../test_data/inclusion/DINCLU";

  string output_path = ".";
@@ -81,9 +75,6 @@ int main(int argc, char **argv) { 
    output_path = string(argv[3]);

  }

  inclusion(config_file, data_file, output_path, mpidata);

#ifdef MPI_VERSION

	MPI_Finalize();

#endif

  delete mpidata;

  return 0;

}