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

Fix order of attribute initialization #903

Merged
merged 6 commits into from
Sep 1, 2023
Merged

Fix order of attribute initialization #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56f03a7
Adding reorder flag to CI builds
pshriwise Aug 31, 2023
cd98a30
Update changelog
pshriwise Aug 31, 2023
b8c980b
Correcting flag
pshriwise Aug 31, 2023
f16c866
Fix ordering of attribute initialization
pshriwise Aug 31, 2023
25bac6b
Update changelog
pshriwise Aug 31, 2023
2ad03cf
Merge branch 'develop' into fix-attr-ordering
pshriwise Aug 31, 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
1 change: 1 addition & 0 deletions .github/workflows/linux_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jobs:
-DCMAKE_Fortran_COMPILER=gfortran \
-DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-DDOUBLE_DOWN=${double_down} \
-DCMAKE_CXX_FLAGS="-Werror=reorder" \
-Ddd_ROOT=${double_down_install_dir} && \
make -j2 && \
make install
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/mac_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
shell: bash -l {0}
run: |
echo "HOME=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV


- name: Build MOAB
shell: bash -l {0}
Expand All @@ -80,11 +80,12 @@ jobs:
mkdir -p $GITHUB_WORKSPACE/bld
cd $GITHUB_WORKSPACE/bld
cmake ../ -DMOAB_DIR=${HOME}/moab \
-DBUILD_CI_TESTS=ON \
-DBUILD_STATIC_EXE=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX=${HOME}/dagmc
-DBUILD_CI_TESTS=ON \
-DBUILD_STATIC_EXE=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=OFF \
-DCMAKE_CXX_FLAGS="-Werror=reorder" \
-DCMAKE_INSTALL_PREFIX=${HOME}/dagmc
make
make install

Expand All @@ -93,4 +94,3 @@ jobs:
run: |
cd $GITHUB_WORKSPACE/bld
PATH=$GITHUB_WORKSPACE/bld/bin:$PATH make test

4 changes: 3 additions & 1 deletion doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Next version
* Streamline CI to take advantage of better docker image management (#880, #896)
* Move more CI from scripts to actions (#895)
* Develop advisory tests on merge for MOAB, double-down and Geant4 (#870, #898, #899)
* Adding flags to CI to ensure compatibility with MOOSE apps (#902)
* Fixing order of attribute initialization in the metadata class (#903)

**Fixed:**
* Patch to compile with Geant4 10.6 (#803)
Expand Down Expand Up @@ -56,7 +58,7 @@ v3.2.1
**Removed:**

**Fixed:**

**Security:**

**Maintenance:**
Expand Down
4 changes: 2 additions & 2 deletions src/dagmc/dagmcmetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
dagmcMetaData::dagmcMetaData(moab::DagMC* dag_ptr, bool verbosity,
bool require_density_present)
: DAG(dag_ptr),
logger(verbosity),
require_density(require_density_present) {
require_density(require_density_present),
logger(verbosity) {
// these are the keywords that dagmc will understand
// from groups if you need to process more
// they should be added here
Expand Down