Merge pull request #1844 from paulromano/surface-tally-bug

pshriwise · web-flow · commit f69149b66a34 · 2021-06-08T16:01:12.000-05:00
Disallow non-current scores with a surface filter
diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp
@@ -507,8 +507,11 @@ void Tally::set_scores(const vector<std::string>& scores)
   if (type_ == TallyType::SURFACE || type_ == TallyType::MESH_SURFACE) {
     if (scores_.size() != 1)
       fatal_error("Cannot tally other scores in the same tally as surface "
-        "currents");
+        "currents.");
   }
+  if ((surface_present || meshsurface_present) && scores_[0] != SCORE_CURRENT)
+    fatal_error("Cannot tally score other than 'current' when using a surface "
+      "or mesh-surface filter.");
 }
 
 void

Original file line number	Diff line number	Diff line change
`@@ -507,8 +507,11 @@ void Tally::set_scores(const vector<std::string>& scores)`
`507`	`507`	`if (type_ == TallyType::SURFACE \|\| type_ == TallyType::MESH_SURFACE) {`
`508`	`508`	`if (scores_.size() != 1)`
`509`	`509`	`fatal_error("Cannot tally other scores in the same tally as surface "`
`510`		`- "currents");`
	`510`	`+ "currents.");`
`511`	`511`	`}`
	`512`	`+ if ((surface_present \|\| meshsurface_present) && scores_[0] != SCORE_CURRENT)`
	`513`	`+ fatal_error("Cannot tally score other than 'current' when using a surface "`
	`514`	`+ "or mesh-surface filter.");`
`512`	`515`	`}`
`513`	`516`
`514`	`517`	`void`