Geant4 v11 fix #907

ahnaf-tahmid-chowdhury · 2023-09-18T17:51:49Z

I created a backup branch and reverted all the changes on my develop branch in the DAGMC repository. It seems like my previous PR got deleted in the process. Thus, I have created a new one. I apologize for any inconvenience this may have caused.

ahnaf-tahmid-chowdhury · 2023-09-18T18:17:04Z

Geant4 provide Geant4Config.cmake that allows to find Geant4. Do we still need FindGeant4?

gonuke

This PR now undoes a lot of recent changes in DAGMC. It needs additional cleanup

gonuke · 2023-09-19T02:47:26Z

src/dagmc/DagMC.cpp

-#if MOAB_VERSION_MAJOR == 5 && MOAB_VERSION_MINOR > 2
-// find a which volume contains the current point
-ErrorCode DagMC::find_volume(const double xyz[3], EntityHandle& volume,
-                             const double* uvw) {
-  ErrorCode rval = ray_tracer->find_volume(xyz, volume, uvw);
-  return rval;
-}
-#endif
-


I don't think this should be removed

ahnaf-tahmid-chowdhury · 2023-10-02T13:41:48Z

Adding #860 for history

ahnaf-tahmid-chowdhury · 2023-10-03T03:09:34Z

#34 5.300 /root/build_dir/dagmc/src/pyne/pyne.cpp/root/build_dir/dagmc/src/dagmc/DagMC.cpp:816:18: error: out-of-line definition of 'find_volume' does not match any declaration in 'moab::DagMC'
  #34 5.305 ErrorCode DagMC::find_volume(const double xyz[3], EntityHandle& volume,
  #34 5.306                  ^~~~~~~~~~~
  #34 5.308 :12283:74: warning: implicit conversion from 'const Json::Int64' (aka 'const long long') to 'double' changes value from 9223372036854775807 to 9223372036854775808 [-Wimplicit-int-float-conversion]

gonuke

As I've mentioned in a few places, the way you have reconstructed this PR has removed some important updates that came from other PRs that happened in between. Normally, if you hadn't deleted your previous branch, we could just rely on a git rebase, but this will take a little more care to get right.

.github/workflows/docker_publish.yml

gonuke · 2023-10-12T13:40:32Z

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


not sure if we need/want to update the default yet - I'll think about it as I review the rest of the PR

I will be testing with both

gonuke · 2023-10-12T13:47:58Z

src/dagmc/DagMC.cpp

-EntityHandle DagMC::entity_by_id(int dimension, int id) const {
+EntityHandle DagMC::entity_by_id(int dimension, int id) {


this is a regression from another PR that added the const - please remove this change

gonuke · 2023-10-12T13:52:56Z

src/dagmc/DagMC.hpp

-inline EntityHandle DagMC::entity_by_index(int dimension, int index) const {
+inline EntityHandle DagMC::entity_by_index(int dimension, int index) {


gonuke · 2023-10-12T13:53:01Z

src/dagmc/DagMC.hpp

-inline int DagMC::index_by_handle(EntityHandle handle) const {
+inline int DagMC::index_by_handle(EntityHandle handle) {


gonuke · 2023-10-12T13:53:09Z

src/dagmc/DagMC.hpp

-inline unsigned int DagMC::num_entities(int dimension) const {
+inline unsigned int DagMC::num_entities(int dimension) {


gonuke · 2023-10-12T13:55:27Z

src/dagmc/dagmcmetadata.cpp

-      require_density(require_density_present),
-      logger(verbosity) {
+      logger(verbosity),
+      require_density(require_density_present) {


This is an important change from another PR

gonuke · 2023-10-12T13:56:55Z

src/geant4/app/src/ExN01UserScoreWriter.cc

+// retrieve the map
+#ifdef GEANT4_GT_10_6
+  using MeshScoreMap = G4VScoringMesh::MeshScoreMap;
+#endif
+


wasn't this already in an earlier PR?

As I recall, this should be required for >10.6 and It may need to be available in earlier PR.

gonuke

I think this is the only problem. Let's see what happens when the actions run on your account after we fix this.

cmake/FindGeant4.cmake

Co-authored-by: Paul Wilson <[email protected]>

ahnaf-tahmid-chowdhury · 2023-12-01T01:10:22Z

@gonuke docker build is passing now

ahnaf-tahmid-chowdhury added 12 commits September 18, 2023 23:29

find geant4 manual mode

2bf5f31

remove moab condition

2b1fc23

remove moab version condition

0c4a183

rearrange logger, then require_density

8a6af96

remove moab conditions

c162950

new condition Geant4_VERSION GREATER_EQUAL 11.0

47cd28b

removed itaps and added PyNE's dagmc by @gonuke

71a1763

GEANT4_GT_11

627be18

GEANT4_GT_11

0e17740

GEANT4_GT_10_6 uill use MeshScoreMap

55292f7

geant4 v11 support

a1d0362

Patch to compile with Geant4 11.x

0f5239d

Geant4ConfigVersion

f7c4acf

gonuke requested changes Sep 19, 2023

View reviewed changes

find a volume in a DAGMC instance if moab >5.2

4c0302e

ahnaf-tahmid-chowdhury added 2 commits October 2, 2023 21:00

geant4 11.1.2 added

5737e45

geant4_version=11.1.2

968f6f7

gonuke requested changes Oct 12, 2023

View reviewed changes

ahnaf-tahmid-chowdhury added 9 commits October 19, 2023 19:45

follow dagmc format

6d8c89d

add const

8f583c6

add const

8ce9f3b

soft reset

61f28e5

geant4 11.1.2

0769e84

sefault geant4 11.1.2

b4b5a7d

new stage geant4

fc1507c

add 11.1.2 geant4

510445f

geant4 11.1.2

928b9f0

ahnaf-tahmid-chowdhury added 2 commits October 20, 2023 09:46

soft reset

ee0b75b

Merge branch 'svalinn:develop' into fix-geant4-build

42b98d3

ahnaf-tahmid-chowdhury requested a review from gonuke October 22, 2023 17:32

ahnaf-tahmid-chowdhury marked this pull request as ready for review November 20, 2023 12:44

gonuke requested changes Nov 30, 2023

View reviewed changes

cmake/FindGeant4.cmake Outdated Show resolved Hide resolved

ahnaf-tahmid-chowdhury and others added 2 commits November 30, 2023 20:30

Update cmake/FindGeant4.cmake

c0fc92c

Co-authored-by: Paul Wilson <[email protected]>

find path for geant4 11+

fa54fff

This was referenced Nov 30, 2023

Add g4 11 docker #923

Closed

Geant4 v11 update #924

Merged

pshriwise merged commit fa54fff into svalinn:develop Dec 7, 2023
3 of 12 checks passed

ahnaf-tahmid-chowdhury mentioned this pull request Dec 7, 2023

DAGMC not compatible with Geant4 v11.1.1 #857

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Geant4 v11 fix #907

Geant4 v11 fix #907

ahnaf-tahmid-chowdhury commented Sep 18, 2023

ahnaf-tahmid-chowdhury commented Sep 18, 2023

gonuke left a comment

gonuke Sep 19, 2023

ahnaf-tahmid-chowdhury commented Oct 2, 2023

ahnaf-tahmid-chowdhury commented Oct 3, 2023

gonuke left a comment

gonuke Oct 12, 2023

ahnaf-tahmid-chowdhury Oct 19, 2023

gonuke Oct 12, 2023

gonuke Oct 12, 2023

gonuke Oct 12, 2023

gonuke Oct 12, 2023

gonuke Oct 12, 2023

gonuke Oct 12, 2023

ahnaf-tahmid-chowdhury Oct 19, 2023

gonuke left a comment

ahnaf-tahmid-chowdhury commented Dec 1, 2023

		EntityHandle DagMC::entity_by_id(int dimension, int id) const {
		EntityHandle DagMC::entity_by_id(int dimension, int id) {

		inline EntityHandle DagMC::entity_by_index(int dimension, int index) const {
		inline EntityHandle DagMC::entity_by_index(int dimension, int index) {

		inline int DagMC::index_by_handle(EntityHandle handle) const {
		inline int DagMC::index_by_handle(EntityHandle handle) {

		inline unsigned int DagMC::num_entities(int dimension) const {
		inline unsigned int DagMC::num_entities(int dimension) {

Geant4 v11 fix #907

Geant4 v11 fix #907

Conversation

ahnaf-tahmid-chowdhury commented Sep 18, 2023

ahnaf-tahmid-chowdhury commented Sep 18, 2023

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ahnaf-tahmid-chowdhury commented Oct 2, 2023

ahnaf-tahmid-chowdhury commented Oct 3, 2023

gonuke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gonuke left a comment

Choose a reason for hiding this comment

ahnaf-tahmid-chowdhury commented Dec 1, 2023