Merge remote-tracking branch 'mit-crpg/openmc/develop' into band-samp

docs/source/quickinstall.rst

@@ -43,7 +43,7 @@ following commands in a terminal:
 
     git clone git://github.com/mit-crpg/openmc.git
     cd openmc/src
-    git checkout master
+    git checkout -b master origin/master
     make
     sudo make install
 

src/ace.F90

@@ -657,6 +657,20 @@ contains
       rxn % multiplicity  = abs(nint(XSS(JXS5 + i - 1)))
       rxn % scatter_in_cm = (nint(XSS(JXS5 + i - 1)) < 0)
 
+      ! If multiplicity is energy-dependent (absolute value > 100), set it based
+      ! on the MT value
+      if (rxn % multiplicity > 100) then
+        if (any(rxn%MT == [11, 16, 24, 30, 41])) then
+          rxn % multiplicity = 2
+        elseif (any(rxn%MT == [17, 25, 42])) then
+          rxn % multiplicity = 3
+        elseif (rxn%MT == 37) then
+          rxn % multiplicity = 4
+        else
+          rxn % multiplicity = 1
+        end if
+      end if
+
       ! read starting energy index
       LOCA = int(XSS(LXS + i - 1))
       IE   = int(XSS(JXS7 + LOCA - 1))

tests/update_results.py

@@ -56,6 +56,20 @@ for adir in sorted(folders):
     for i in range(35 - sz):
         print('.', end="")
 
+    if adir == 'test_source_file':
+        # Handle source file test separately since it requires running OpenMC
+        # twice
+        if os.path.exists('results_error.dat'):
+            os.remove('results_error.dat')
+        proc = Popen(['python', 'test_source_file.py', '--exe', openmc_exe],
+                     stderr=STDOUT, stdout=PIPE)
+        returncode = proc.wait()
+        if os.path.exists('results_error.dat'):
+            os.rename('results_error.dat', 'results_true.dat')
+        print(BOLD + OKGREEN + "[OK]" + ENDC)
+        os.chdir('..')
+        continue
+
     # Run openmc
     proc = Popen([openmc_exe], stderr=STDOUT, stdout=PIPE)
     returncode = proc.wait()