crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 14:15:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Changing cad references/symbols to dagmc to leave room for other CAD implementations.

Browse source
This commit is contained in:
pshriwise 2018-09-21 15:48:50 -04:00
parent d0a2009974
commit 3d27fe55eb
17 changed files with 136 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/openmc/cell.h
View file

@ -13,7 +13,7 @@
#include "openmc/constants.h"
#include "openmc/position.h"
#ifdef CAD
#ifdef DAGMC
#include "DagMC.hpp"
#endif
@ -167,12 +167,12 @@ protected:
bool contains_complex(Position r, Direction u, int32_t on_surface) const;
};
#ifdef CAD
class CADCell : public Cell
#ifdef DAGMC
class DAGMCCell : public Cell
{
public:
moab::DagMC *dagmc_ptr;
explicit CADCell();
explicit DAGMCCell();
std::pair<double, int32_t> distance(Position p, Direction u, int32_t on_surface) const;
bool contains(Position p, Direction u, int32_t on_surface) const;

10
include/openmc/surface.h
View file

@ -12,7 +12,7 @@
#include "openmc/constants.h"
#include "openmc/position.h"
#ifdef CAD
#ifdef DAGMC
#include "DagMC.hpp"
#endif
@ -133,14 +133,14 @@ class CSGSurface : public Surface
};
//==============================================================================
//! A `Surface` representing a CAD-based surface in DAGMC.
//! A `Surface` representing a DAGMC-based surface in DAGMC.
//==============================================================================
#ifdef CAD
class CADSurface : public Surface
#ifdef DAGMC
class DAGMCSurface : public Surface
{
public:
moab::DagMC* dagmc_ptr;
explicit CADSurface();
explicit DAGMCSurface();
double evaluate(Position p) const;
double distance(Position p, Direction u,
bool coincident) const;