Merge pull request svalinn#903 from pshriwise/fix-attr-ordering

gonuke · Sep 1, 2023 · f140ff4 · f140ff4
2 parents a7d1f3f + 2ad03cf
commit f140ff4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
@@ -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

diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml
@@ -53,7 +53,7 @@ jobs:
         shell: bash -l {0}
         run: |
           echo "HOME=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV
-      
+
 
       - name: Build MOAB
         shell: bash -l {0}
@@ -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
 
@@ -93,4 +94,3 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE/bld
           PATH=$GITHUB_WORKSPACE/bld/bin:$PATH make test
-
diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -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)
@@ -56,7 +58,7 @@ v3.2.1
 **Removed:**
 
 **Fixed:**
-      
+
 **Security:**
 
 **Maintenance:**

diff --git a/src/dagmc/dagmcmetadata.cpp b/src/dagmc/dagmcmetadata.cpp
@@ -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