Merge branch 'develop' into dd-ci-fix

svalinn · Feb 22, 2024 · 0097561 · 0097561
2 parents abe00a4 + c615622
commit 0097561
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.rst b/README.rst
@@ -21,8 +21,8 @@ Direct Accelerated Geometry Monte Carlo (DAGMC) is a software package that
 allows users to perform Monte Carlo radiation transport directly on CAD models.
 
 DAGMC has been integrated into a variety of Monte Carlo radiation codes
-including MCNP5_, MCNP6_, Geant4_, FLUKA_, Tripoli4_, and Shift_. There are also
-efforts planned to integrate DAGMC into other codes such as Serpent2_, OpenMC_,
+including MCNP5_, MCNP6_, Geant4_, FLUKA_, Tripoli4_, OpenMC_, and Shift_. There are also
+efforts planned to integrate DAGMC into other codes such as Serpent2_,
 Phits_, and FRENSIE_.
 
 DAGMC currently relies on using the commercial solid modeling software Cubit_ (or its

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -12,6 +12,7 @@ Next version
   * Update hdf5 to v1.14.3 from v1.10.4 (#931 #933)
   * Ensure implicit complement handle is placed at the back of DAGMC volume indices (#935)
   * Update MOAB to 5.5.1 from 5.3.0 (#939 #940)
+  * Update README regarding OpenMC (#938)
   * Allow Double Down v1.1.0 Installation in Dockerfile (#929)
 
 v3.2.3