Geant4 v11 update #924

gonuke · 2023-11-30T23:28:08Z

Note: These changes were first proposed in #907 by @ahnaf-tahmid-chowdhury. In order for the docker build process to test smoothly, a new PR is being issued with all those changes, attributed to him, but without updating the standard linux_build_test.yml workflow. That workflow will require the new docker images to exist first.

Description

Introduce changes to support building against Geant4 v11.x

Motivation and Context

Some code API changes for Geant4 require some changes.

Changes

Supports build of newer versions of Geant4

Expected behavior

Since these changes should be backward compatible with v10 of Geant4, all tests should pass including testing on both new and old versions of Geant4

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>

gonuke · 2023-11-30T23:30:45Z

Mac testing will fail until we merge #922

ahnaf-tahmid-chowdhury · 2023-12-01T01:16:08Z

I think, there is no need to install gcc manually. GitHub workflow already comes with built-in dev tools.

gonuke · 2023-12-01T03:27:51Z

I'm trying to skip gcc in #922 right now

gonuke · 2023-12-01T15:09:23Z

I think, there is no need to install gcc manually. GitHub workflow already comes with built-in dev tools.

Thanks @ahnaf-tahmid-chowdhury - I've moved that change into this PR since it was such a small change.

Looking for a review here from @pshriwise @shimwell @makeclean @helen-brooks ?

pshriwise

Thanks @ahnaf-tahmid-chowdhury and @gonuke for the update to a newer Geant4 version.

Mostly line comments on the Python script here.

.github/workflows/mac_build_test.yml

pshriwise · 2023-12-06T20:13:19Z

src/geant4/generate_geant4

@@ -70,7 +72,7 @@ def parse_arguments():
            try:
                fh = open(options.dag_file, "r")
            except IOError:
-                print "Error: can\'t find DAG file"
+                print("Error: can't find DAG file")


Suggested change

print("Error: can't find DAG file")

print("Error: can't find DAG file: '{}' ".format(options.dag_file))

To avoid the extra else block at the end:

try: fh = open(options.dag_file, 'r') fh.close() except IOError: print("Error: can't find DAG file: '{}'".format(options.dag_file))

pshriwise · 2023-12-06T20:14:25Z

src/geant4/generate_geant4

+        print("There are no materials in the h5m file!!")
+        print("Assuming all volumes contain vacuum")


Suggested change

print("There are no materials in the h5m file!!")

print("Assuming all volumes contain vacuum")

print("There are no materials in the h5m file.\n "

"Assuming all volumes contain vacuum")

pshriwise · 2023-12-06T20:15:01Z

src/geant4/generate_geant4

@@ -534,7 +484,7 @@ dag_volume_names : list or dictionary of volume names
 def _setup_dagspecific_headers(dag_volume_names, tallies_needed):

    if not dag_volume_names:
-        print "dag volume names not assigned", sys.exc_info()[0]
+        print("dag volume names not assigned", sys.exc_info()[0])


Suggested change

print("dag volume names not assigned", sys.exc_info()[0])

print("DAGMC volume names are not assigned", sys.exc_info()[0])

pshriwise · 2023-12-06T20:16:08Z

src/geant4/generate_geant4

@@ -1680,7 +1630,7 @@ def _write_files(path, dictionary_files):
        try:
            fh = open(path+'/'+key, "w")
        except IOError:
-                print "Error: "+file+" file exists"
+                print("Error: "+key+" file exists")


Suggested change

print("Error: "+key+" file exists")

print("Error: {} file exists".format(key))

pshriwise · 2023-12-06T20:16:53Z

src/geant4/generate_geant4

@@ -1724,7 +1677,7 @@ def _mkdir_p(path):
    try:
        os.makedirs(path)
    except OSError:     
-        print "Error: can\'t create directory, "+path
+        print("Error: can't create directory, "+path)


Suggested change

print("Error: can't create directory, "+path)

print("Error: can't create directory '{}' ".format(path))

pshriwise · 2023-12-06T20:17:35Z

src/geant4/generate_geant4


-    mat_tag = dag_geom.getTagHandle('NAME')
+    dag_vol_names = [dag_materials.keys()]


Suggested change

dag_vol_names = [dag_materials.keys()]

dag_vol_names = list(dag_materials.keys())

pshriwise · 2023-12-06T20:22:40Z

src/geant4/generate_geant4

@@ -1707,9 +1657,12 @@ def _create_directory_structure(directory):
    _mkdir_p(directory+'/src')
    return

+# Fix: Don't know what it does
+"""


Any reason not to remove this function?

pshriwise · 2023-12-06T20:24:23Z

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


These lines are also just above. We should only need this once. Might be a change inherited from the original PR.

gonuke · 2023-12-07T02:48:12Z

Thanks for the review @pshriwise - I think I addressed everything.

pshriwise

Thanks @gonuke!

ahnaf-tahmid-chowdhury and others added 30 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

find a volume in a DAGMC instance if moab >5.2

4c0302e

geant4 11.1.2 added

5737e45

geant4_version=11.1.2

968f6f7

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

soft reset

ee0b75b

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

42b98d3

Update cmake/FindGeant4.cmake

c0fc92c

Co-authored-by: Paul Wilson <paul.wilson@wisc.edu>

find path for geant4 11+

fa54fff

remove build test until we have a working docker container

6b761f1

remove explicit gcc install in mac_build_test.yml

4ec7aa6

gonuke mentioned this pull request Dec 1, 2023

Relax brew gcc #922

Closed

gonuke requested review from helen-brooks, makeclean, pshriwise and shimwell December 1, 2023 15:09

pshriwise requested changes Dec 6, 2023

View reviewed changes

gonuke added 2 commits December 6, 2023 20:45

address review comments

1f137ff

random typo

b1e0091

pshriwise approved these changes Dec 7, 2023

View reviewed changes

pshriwise merged commit c82b52d into develop Dec 7, 2023
8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Geant4 v11 update #924

Geant4 v11 update #924

gonuke commented Nov 30, 2023 •

edited

Loading

gonuke commented Nov 30, 2023

ahnaf-tahmid-chowdhury commented Dec 1, 2023

gonuke commented Dec 1, 2023

gonuke commented Dec 1, 2023

pshriwise left a comment

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

pshriwise Dec 6, 2023

gonuke commented Dec 7, 2023

pshriwise left a comment

	print("Error: can't find DAG file")
	print("Error: can't find DAG file: '{}' ".format(options.dag_file))

		print("There are no materials in the h5m file!!")
		print("Assuming all volumes contain vacuum")

	print("dag volume names not assigned", sys.exc_info()[0])
	print("DAGMC volume names are not assigned", sys.exc_info()[0])

	print("Error: "+key+" file exists")
	print("Error: {} file exists".format(key))

	print("Error: can't create directory, "+path)
	print("Error: can't create directory '{}' ".format(path))


		mat_tag = dag_geom.getTagHandle('NAME')
		dag_vol_names = [dag_materials.keys()]

	dag_vol_names = [dag_materials.keys()]
	dag_vol_names = list(dag_materials.keys())

Geant4 v11 update #924

Geant4 v11 update #924

Conversation

gonuke commented Nov 30, 2023 • edited Loading

Description

Motivation and Context

Changes

Expected behavior

gonuke commented Nov 30, 2023

ahnaf-tahmid-chowdhury commented Dec 1, 2023

gonuke commented Dec 1, 2023

gonuke commented Dec 1, 2023

pshriwise 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 commented Dec 7, 2023

pshriwise left a comment

Choose a reason for hiding this comment

gonuke commented Nov 30, 2023 •

edited

Loading