Skip to content

Commit

Permalink
Fix Eigen construct
Browse files Browse the repository at this point in the history
  • Loading branch information
kennethassogba committed Nov 16, 2024
1 parent 2ed6abc commit 3527288
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
23 changes: 13 additions & 10 deletions examples/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,19 @@ int main() {
m(1, 1) = m(1, 0) + m(0, 1);
std::cout << m << std::endl;

// using vec = Eigen::ArrayXd;
// using mat = Eigen::ArrayXXd;

// vec sigma_t = {0.222222, 0.833333};
// vec D = 1. / (3. * sigma_t);
// vec sigma_a{0.010120, 0.080032};
// vec nusigma_f{0., 0.135};
// vec sigma_f{0., 0.135};
// vec chi{1., 0.};
// mat sigma_s{{0.00, 0.02}, {0.00, 0.00}};
using Eigen::ArrayXd;
using Eigen::ArrayXXd;

ArrayXd sigma_t{{0.222222, 0.833333}};
ArrayXd D = 1. / (3. * sigma_t);
ArrayXd sigma_a{{0.010120, 0.080032}};
ArrayXd nu_sigma_f{{0., 0.135}};
ArrayXd sigma_f{{0., 0.135}};
ArrayXd chi{{1., 0.}};
ArrayXXd sigma_s{{0.00, 0.02}, {0.00, 0.00}};

// Demeter::Material uo2(sigma_t, sigma_s, sigma_a, sigma_f, nu_sigma_f, chi,
// "UO2");

return 0;
}
5 changes: 2 additions & 3 deletions src/demeter/model/material.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
// TODO add optional xs and name
// TODO some material maybe not need all xs, make them optional
namespace Demeter {
using Eigen::ArrayXd;
using Eigen::ArrayXXd;

/**
* @brief Describes the material properties. The cross-sections (xs) are:
* total, scatering, absorption and fission.
*/
class Material {
using ArrayXd = Eigen::ArrayXd; // TODO move to a global definition header
using ArrayXXd = Eigen::ArrayXXd;

public:
Material(ArrayXd& sigma_t, ArrayXXd& sigma_s, ArrayXd& sigma_a,
ArrayXd& sigma_f, ArrayXd& nu_sigma_f, ArrayXd& chi,
Expand Down

0 comments on commit 3527288

Please sign in to comment.