Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove superfluous headers from DAGMC headers #800

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
+12 −28
Draft

Remove superfluous headers from DAGMC headers #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d730b90
first pass at cleaning up dagmc headers
gonuke Feb 20, 2022
8ca6b45
add changelog
gonuke Feb 20, 2022
bf9570c
forward declare RayHistory
gonuke Feb 20, 2022
99e97ba
cleanup from merge conflict
gonuke Aug 13, 2023
5d6b628
correct rebase confusion in changelog
gonuke Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Next version
* Tweak conda environment for Windows build to avoid conflicting gtest headers (#888)
* Restrict cython version for MOAB (#893)
* Various documentation updates (#869)
* cleaned up headers to include fewer upstream headers (#800)


v3.2.2
====================
Expand All @@ -45,25 +47,9 @@ v3.2.2
* Removing build of static libs as a default option (#802)
* Adding PYTHONPATH to linux CI images and creating pymoab installation directories (#802)

v3.2.1
====================

**Added:**

* Added link to latest Conda package in GitHub README.md

**Changed:**

**Deprecated:**

**Removed:**

**Fixed:**

**Security:**

**Maintenance:**

* Added link to latest Conda package in GitHub README.md (#801)

v3.2.1
====================
Expand Down
8 changes: 8 additions & 0 deletions src/dagmc/DagMC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
#include <sstream>
#include <string>


#include "moab/CartVect.hpp"
#include "moab/FileOptions.hpp"
#include "moab/GeomTopoTool.hpp"
#include "moab/GeomQueryTool.hpp"
#include "moab/GeomUtil.hpp"
#include "moab/Range.hpp"

#ifdef DOUBLE_DOWN
#include "double_down/RTI.hpp"
#endif
Expand Down
12 changes: 1 addition & 11 deletions src/dagmc/DagMC.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,7 @@
#include <vector>

#include "DagMCVersion.hpp"
#include "MBTagConventions.hpp"
#include "logger.hpp"
#include "moab/CartVect.hpp"
#include "moab/Core.hpp"
#include "moab/FileOptions.hpp"
#include "moab/GeomQueryTool.hpp"
#include "moab/GeomTopoTool.hpp"
#include "moab/GeomUtil.hpp"
#include "moab/Interface.hpp"
#include "moab/Range.hpp"

class RefEntity;

struct DagmcVolData {
int mat_id;
Expand All @@ -45,6 +34,7 @@ static const std::string GRAVEYARD_NAME = "mat:graveyard";

class CartVect;
class GeomQueryTool;
class GeomQueryTool::RayHistory;

/**\brief
*
Expand Down
Loading