Commit 2f892e67 authored by Hamilton, Steven P.'s avatar Hamilton, Steven P.
Browse files

Adding new driver.

parent eb80d641

packages/MC/CMakeLists.txt

+8 −2
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ SET(DRIVER_SOURCES 
  mc_driver/Manager_Builder.cc

  mc_driver/Problem_Builder.pt.cc

  mc_driver/Geometry_Builder.pt.cc

  mc_driver/mc.cc

  )

LIST(APPEND HEADERS ${DRIVER_HEADERS})

LIST(APPEND SOURCES ${DRIVER_SOURCES})
@@ -205,12 +204,19 @@ TRIBITS_ADD_EXECUTABLE( 
  INSTALLABLE

  )



TRIBITS_ADD_EXECUTABLE(

  profugus

  NOEXESUFFIX

  NOEXEPREFIX

  SOURCES mc_driver/profugus.cc

  INSTALLABLE

  )



##---------------------------------------------------------------------------##

# Add tests to this package



TRIBITS_ADD_TEST_DIRECTORIES(

  geometry/test

  sim_ce/test

  mc/test)



IF(USE_CUDA)

packages/MC/cmake/config.h.in

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ 
/* PARALLEL MPI ENVIRONMENT VARIABLES */

#include <Utils/config.h>



#ifdef COMM_MPI

#include "Epetra_MpiComm.h"

#else

#include "Epetra_SerialComm.h"

#endif



/* FORTRAN WRAPPERS */

#define FC_FUNC@F77_FUNC@

#define FC_FUNC_@F77_FUNC_@

packages/MC/mc_driver/Manager_Builder.cc

+2 −14
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
#include "geometry/RTK_Geometry.hh"

#include "geometry/Mesh_Geometry.hh"



#include "Teuchos_DefaultComm.hpp"

#include "Teuchos_XMLParameterListHelpers.hpp"



#ifdef USE_CUDA

#include "cuda_mc/Manager_Builder_Cuda.hh"

#endif
@@ -26,18 +23,9 @@ 
namespace mc

{



auto Manager_Builder::build(const std::string &xml_file) -> SP_Manager_Base

auto Manager_Builder::build(Teuchos::RCP<Teuchos::ParameterList> &master)

    -> SP_Manager_Base

{

    SCREEN_MSG("Reading xml file -> " << xml_file);



    // make the master parameterlist

    auto master = Teuchos::rcp(new Teuchos::ParameterList(""));



    // read the data on every domain

    auto comm = Teuchos::DefaultComm<int>::getComm();

    Teuchos::updateParametersFromXmlFileAndBroadcast(

        xml_file.c_str(), master.ptr(), *comm);



    SP_Manager_Base manager;



    auto problem_db = Teuchos::sublist(master,"PROBLEM");

packages/MC/mc_driver/Manager_Builder.hh

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class Manager_Builder 


      typedef std::shared_ptr<Manager_Base> SP_Manager_Base;



      static SP_Manager_Base build(const std::string &xml_file);

      static SP_Manager_Base build(Teuchos::RCP<Teuchos::ParameterList> &pl);



    //! Output messages in a common format.

#define SCREEN_MSG(stream)                            \

packages/MC/mc_driver/mc.cc

+14 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
#include "Manager_Base.hh"

#include "Manager_Builder.hh"



#include "Teuchos_DefaultComm.hpp"

#include "Teuchos_XMLParameterListHelpers.hpp"



// Parallel specs.

int node  = 0;

int nodes = 0;
@@ -111,8 +114,18 @@ int main(int argc, char *argv[]) 


    try

    {

        std::cout << "Reading XML file " << xml_file << std::endl;



        // build parameter list

        auto master = Teuchos::rcp(new Teuchos::ParameterList(""));



        // read the data on every domain

        auto comm = Teuchos::DefaultComm<int>::getComm();

        Teuchos::updateParametersFromXmlFileAndBroadcast(

            xml_file.c_str(), master.ptr(), *comm);



        // make the manager

        auto manager = mc::Manager_Builder::build(xml_file);

        auto manager = mc::Manager_Builder::build(master);



        // solve the problem

        manager->solve();