Geant4 v11 fix

.github/workflows/docker_publish.yml

@@ -5,35 +5,21 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - 'CI/Dockerfile'
-      - '.github/workflows/docker_publish.yml'
+      - "CI/Dockerfile"
+      - ".github/workflows/docker_publish.yml"
 
 jobs:
   build-dependency-and-test-img:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        ubuntu_versions : [
-          20.04,
-          22.04,
-          ]
-        compiler : [
-          gcc,
-          clang,
-          ]
-        hdf5_versions : [
-         1.10.4,
-        ]
-        moab_versions : [
-         5.3.0,
-        ]
-        double_down : [
-          OFF,
-        ]
-        geant_version : [
-          10.7.4,
-        ]
+        ubuntu_versions: [20.04, 22.04]
+        compiler: [gcc, clang]
+        hdf5_versions: [1.10.4]
+        moab_versions: [5.3.0, 5.4.0]
+        double_down: [OFF]
+        geant_version: [10.7.4, 11.1.2]
 
     name: Installing Dependencies, Building DAGMC and running tests
     steps:
@@ -68,36 +54,21 @@ jobs:
           dockerfile: CI/Dockerfile
           build-args: double_down=${{ matrix.double_down}}, geant4_version=${{ matrix.geant_version }}, COMPILER=${{ matrix.compiler }}, UBUNTU_VERSION=${{ matrix.ubuntu_versions }}, HDF5_VERSION=${{ matrix.hdf5_versions }}, MOAB_BRANCH=${{ matrix.moab_versions }}
 
-
   push_stable_ci_img:
     needs: [build-dependency-and-test-img]
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        ubuntu_versions : [
-          20.04,
-          22.04,
-          ]
-        compiler : [
-          gcc,
-          clang,
-          ]
-        hdf5_versions : [
-         1.10.4,
-        ]
-        moab_versions : [
-         5.3.0,
-        ]
-        double_down : [
-          OFF,
-        ]
-        geant_version : [
-          10.7.4,
-        ]
+        ubuntu_versions: [20.04, 22.04]
+        compiler: [gcc, clang]
+        hdf5_versions: [1.10.4]
+        moab_versions: [5.3.0, 5.4.0]
+        double_down: [OFF]
+        geant_version: [10.7.4, 11.1.2]
 
     name: Pushing final images
-    steps:       
+    steps:
       - name: Log in to the Container registry
         if: ${{ github.repository_owner == 'svalinn' }}
         uses: docker/login-action@v2

CI/Dockerfile

@@ -5,7 +5,7 @@
 
 # Global ARGS set before the first build stage are accessable by all build stages
 ARG EMBREE_BRANCH='v3.6.1'
-ARG geant4_version=10.7.4
+ARG geant4_version=11.1.2
 ARG UBUNTU_VERSION=20.04
 ARG MOAB_BRANCH=5.3.0
 ARG double_down=OFF

cmake/FindGeant4.cmake

@@ -1,13 +1,18 @@
 # Find Geant4 cmake config file
 set(Geant4_SEARCH_DIRS)
-# Is this line necessary?
-set(PACKAGE_FIND_VERSION ${Geant4_FIND_VERSION})
+
 file(GLOB Geant4_SEARCH_DIRS "${GEANT4_DIR}/lib*/Geant4-*")
 string(REPLACE "\n" ";" Geant4_SEARCH_DIRS ${Geant4_SEARCH_DIRS})
 
+find_path(Geant4_CMAKE_CONFIG
+  NAMES Geant4Config.cmake
+  PATHS ${Geant4_SEARCH_DIRS}
+  NO_DEFAULT_PATH
+)
+
 find_path(Geant4_CMAKE_CONFIG_VERSION
   NAMES Geant4ConfigVersion.cmake
-  PATHS ${Geant4_SEARCH_DIRS}
+  PATHS ${Geant4_CMAKE_CONFIG}
   NO_DEFAULT_PATH
   )
 
@@ -21,11 +26,6 @@ else ()
   message(FATAL_ERROR "Could not find Geant4")
 endif ()
 
-find_path(Geant4_CMAKE_CONFIG
-  NAMES Geant4Config.cmake
-  PATHS ${Geant4_SEARCH_DIRS}
-  NO_DEFAULT_PATH
-)
 if (Geant4_CMAKE_CONFIG)
   set(Geant4_CMAKE_CONFIG ${Geant4_CMAKE_CONFIG}/Geant4Config.cmake)
   message(STATUS "Geant4_CMAKE_CONFIG: ${Geant4_CMAKE_CONFIG}")
@@ -58,7 +58,7 @@ include(${Geant4_USE_FILE})
 set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS_SAVE})
 
 message(STATUS "Geant4 version: ${Geant4_VERSION}")
-message(STATUS "Geant4 version required: ${PACKAGE_FIND_VERSION}")
+message(STATUS "Geant4 version required: ${Geant4_FIND_VERSION}")
 message(STATUS "Geant4 version compatible: ${PACKAGE_VERSION_COMPATIBLE}")
 message(STATUS "Geant4 version exact: ${PACKAGE_VERSION_EXACT}")
 message(STATUS "Geant4_INCLUDE_DIRS: ${Geant4_INCLUDE_DIRS}")

doc/CHANGELOG.rst

@@ -29,7 +29,7 @@ Next version
    * Adding const identifier to cross-reference methods (#906)
 
 **Fixed:**
-   * Patch to compile with Geant4 10.6 (#803)
+   * Patch to compile with Geant4 11.x (#803 #907)
    * Patched cmake-search paths for double-down and MOAB (#878)
    * Patch to compile with gcc-13 (#882)
    * Tweak conda environment for Windows build to avoid conflicting gtest headers (#888)

src/dagmc/DagMC.cpp

@@ -870,11 +870,11 @@ ErrorCode DagMC::next_vol(EntityHandle surface, EntityHandle old_volume,
 
 /* SECTION III: Indexing & Cross-referencing */
 
-EntityHandle DagMC::entity_by_id(int dimension, int id) const {
+EntityHandle DagMC::entity_by_id(int dimension, int id) {
   return GTT->entity_by_id(dimension, id);
 }
 
-int DagMC::id_by_index(int dimension, int index) const {
+int DagMC::id_by_index(int dimension, int index) {
   EntityHandle h = entity_by_index(dimension, index);
   if (!h) return 0;
 
@@ -883,7 +883,7 @@ int DagMC::id_by_index(int dimension, int index) const {
   return result;
 }
 
-int DagMC::get_entity_id(EntityHandle this_ent) const {
+int DagMC::get_entity_id(EntityHandle this_ent) {
   return GTT->global_id(this_ent);
 }
 

src/dagmc/DagMC.hpp

@@ -225,10 +225,6 @@ class DagMC {
 
   ErrorCode point_in_volume_slow(const EntityHandle volume, const double xyz[3],
                                  int& result);
-#if MOAB_VERSION_MAJOR == 5 && MOAB_VERSION_MINOR > 2
-  ErrorCode find_volume(const double xyz[3], EntityHandle& volume,
-                        const double* uvw = NULL);
-#endif
 
   ErrorCode test_volume_boundary(const EntityHandle volume,
                                  const EntityHandle surface,
@@ -263,16 +259,16 @@ class DagMC {
    */
 
   /** map from dimension & global ID to EntityHandle */
-  EntityHandle entity_by_id(int dimension, int id) const;
+  EntityHandle entity_by_id(int dimension, int id);
   /** map from dimension & base-1 ordinal index to EntityHandle */
-  EntityHandle entity_by_index(int dimension, int index) const;
+  EntityHandle entity_by_index(int dimension, int index);
   /** map from dimension & base-1 ordinal index to global ID */
-  int id_by_index(int dimension, int index) const;
+  int id_by_index(int dimension, int index);
   /** PPHW: Missing dim & global ID ==> base-1 ordinal index */
   /** map from EntityHandle to base-1 ordinal index */
-  int index_by_handle(EntityHandle handle) const;
+  int index_by_handle(EntityHandle handle);
   /** map from EntityHandle to global ID */
-  int get_entity_id(EntityHandle this_ent) const;
+  int get_entity_id(EntityHandle this_ent);
 
   /**\brief get number of geometric sets corresponding to geometry of specified
    *dimension
@@ -282,7 +278,7 @@ class DagMC {
    *the dimensionality of the entities in question \return integer number of
    *entities of that dimension
    */
-  unsigned int num_entities(int dimension) const;
+  unsigned int num_entities(int dimension);
 
  private:
   /** get all group sets on the model */
@@ -564,18 +560,18 @@ class DagMC {
 
 };  // end DagMC
 
-inline EntityHandle DagMC::entity_by_index(int dimension, int index) const {
+inline EntityHandle DagMC::entity_by_index(int dimension, int index) {
   assert(2 <= dimension && 3 >= dimension &&
          (unsigned)index < entHandles[dimension].size());
   return entHandles[dimension][index];
 }
 
-inline int DagMC::index_by_handle(EntityHandle handle) const {
+inline int DagMC::index_by_handle(EntityHandle handle) {
   assert(handle - setOffset < entIndices.size());
   return entIndices[handle - setOffset];
 }
 
-inline unsigned int DagMC::num_entities(int dimension) const {
+inline unsigned int DagMC::num_entities(int dimension) {
   assert(vertex_handle_idx <= dimension && groups_handle_idx >= dimension);
   return entHandles[dimension].size() - 1;
 }

src/dagmc/dagmcmetadata.cpp

@@ -12,8 +12,8 @@
 dagmcMetaData::dagmcMetaData(moab::DagMC* dag_ptr, bool verbosity,
                              bool require_density_present)
     : DAG(dag_ptr),
-      require_density(require_density_present),
-      logger(verbosity) {
+      logger(verbosity),
+      require_density(require_density_present) {
   // these are the keywords that dagmc will understand
   // from groups if you need to process more
   // they should be added here

src/geant4/CMakeLists.txt

@@ -2,7 +2,11 @@ message("")
 
 find_package(Geant4 10.4.2 REQUIRED)
 
-if ( Geant4_VERSION GREATER_EQUAL 10.6 )
+if ( Geant4_VERSION GREATER_EQUAL 11.0 )
+  message(STATUS "Configuring DAGMC for Geant4 version >= 11.0")
+  add_compile_definitions(GEANT4_GT_10_6=1)
+  add_compile_definitions(GEANT4_GT_11=1)
+  elseif( Geant4_VERSION GREATER_EQUAL 10.6 )
   message(STATUS "Configuring DAGMC for Geant4 version >= 10.6")
   add_compile_definitions(GEANT4_GT_10_6=1)
 endif()

src/geant4/app/include/ExN01Analysis.hh

@@ -7,6 +7,10 @@
 #ifndef ExN01Analysis_h
 #define ExN01Analysis_h 1
 
+#ifdef GEANT4_GT_11
+#include "G4AnalysisManager.hh"
+#else
 #include "g4root.hh"
+#endif
 
 #endif

src/geant4/app/src/ExN01DetectorConstruction.cc

@@ -51,8 +51,11 @@ G4VPhysicalVolume* ExN01DetectorConstruction::Construct() {
   // load the material from the UW^2 library
   std::map<std::string, G4Material*> material_lib;
   material_lib = load_uwuw_materials(workflow_data);
-
+#ifdef GEANT4_GT_11
+  G4VisAttributes* invis = new G4VisAttributes(G4VisAttributes::GetInvisible());
+#else
   G4VisAttributes* invis = new G4VisAttributes(G4VisAttributes::Invisible);
+#endif
 
   //------------------------------------------------------ volumes
   // -- World Volume in which we place other volumes

src/geant4/app/src/ExN01UserScoreWriter.cc

@@ -30,7 +30,11 @@ void ExN01UserScoreWriter::DumpAllQuantitiesToFile(const G4String& fileName,
   G4cout << "Dumping mesh " << fScoringMesh->GetWorldName() << " to file"
          << G4endl;
 
-  // retrieve the map
+// retrieve the map
+#ifdef GEANT4_GT_10_6
+  using MeshScoreMap = G4VScoringMesh::MeshScoreMap;
+#endif
+
   MeshScoreMap scMap = fScoringMesh->GetScoreMap();
 
   // get the number of bins