Convert input_set to use region property and fix error in cell 2

tests/input_set.py

@@ -296,56 +296,52 @@ class InputSet(object):
         fuel_cold = openmc.Universe(name='Fuel pin, cladding, cold water',
                                     universe_id=1)
         c21 = openmc.Cell(cell_id=21)
-        c21.add_surface(s1, -1)
+        c21.region = -s1
         c21.fill = fuel
         c22 = openmc.Cell(cell_id=22)
-        c22.add_surface(s1, +1)
-        c22.add_surface(s2, -1)
+        c22.region = +s1 & -s2
         c22.fill = clad
         c23 = openmc.Cell(cell_id=23)
-        c23.add_surface(s2, +1)
+        c23.region = +s2
         c23.fill = cold_water
         fuel_cold.add_cells((c21, c22, c23))
 
         tube_cold = openmc.Universe(name='Instrumentation guide tube, '
                                     'cold water', universe_id=2)
         c24 = openmc.Cell(cell_id=24)
-        c24.add_surface(s3, -1)
+        c24.region = -s3
         c24.fill = cold_water
         c25 = openmc.Cell(cell_id=25)
-        c25.add_surface(s3, +1)
-        c25.add_surface(s4, -1)
+        c25.region = +s3 & -s4
         c25.fill = clad
         c26 = openmc.Cell(cell_id=26)
-        c26.add_surface(s4, +1)
+        c26.region = +s4
         c26.fill = cold_water
         tube_cold.add_cells((c24, c25, c26))
 
         fuel_hot = openmc.Universe(name='Fuel pin, cladding, hot water',
                                    universe_id=3)
         c27 = openmc.Cell(cell_id=27)
-        c27.add_surface(s1, -1)
+        c27.region = -s1
         c27.fill = fuel
         c28 = openmc.Cell(cell_id=28)
-        c28.add_surface(s1, +1)
-        c28.add_surface(s2, -1)
+        c28.region = +s1 & -s2
         c28.fill = clad
         c29 = openmc.Cell(cell_id=29)
-        c29.add_surface(s2, +1)
+        c29.region = +s2
         c29.fill = hot_water
         fuel_hot.add_cells((c27, c28, c29))
 
         tube_hot = openmc.Universe(name='Instrumentation guide tube, hot water',
                                    universe_id=4)
         c30 = openmc.Cell(cell_id=30)
-        c30.add_surface(s3, -1)
+        c30.region = -s3
         c30.fill = hot_water
         c31 = openmc.Cell(cell_id=31)
-        c31.add_surface(s3, +1)
-        c31.add_surface(s4, -1)
+        c31.region = +s3 & -s4
         c31.fill = clad
         c32 = openmc.Cell(cell_id=32)
-        c32.add_surface(s4, +1)
+        c32.region = +s4
         c32.fill = hot_water
         tube_hot.add_cells((c30, c31, c32))
 
@@ -419,33 +415,27 @@ class InputSet(object):
              [fuel_hot]*17 ]
 
         # Define assemblies.
-        fa_cw = openmc.Universe(name='Water assembly (cold)',
-                                universe_id=5)
+        fa_cw = openmc.Universe(name='Water assembly (cold)', universe_id=5)
         c50 = openmc.Cell(cell_id=50)
-        c50.add_surface(s34, +1)
-        c50.add_surface(s35, -1)
+        c50.region = +s34 & -s35
         c50.fill = cold_water
         fa_cw.add_cells((c50, ))
 
-        fa_hw = openmc.Universe(name='Water assembly (hot)',
-                                universe_id=7)
+        fa_hw = openmc.Universe(name='Water assembly (hot)', universe_id=7)
         c70 = openmc.Cell(cell_id=70)
-        c70.add_surface(s35, +1)
-        c70.add_surface(s36, -1)
+        c70.region = +s35 & -s36
         c70.fill = hot_water
         fa_hw.add_cells((c70, ))
 
         fa_cold = openmc.Universe(name='Fuel assembly (cold)', universe_id=6)
         c60 = openmc.Cell(cell_id=60)
-        c60.add_surface(s34, +1)
-        c60.add_surface(s35, -1)
+        c60.region = +s34 & -s35
         c60.fill = l100
         fa_cold.add_cells((c60, ))
 
         fa_hot = openmc.Universe(name='Fuel assembly (hot)', universe_id=8)
         c80 = openmc.Cell(cell_id=80)
-        c80.add_surface(s35, +1)
-        c80.add_surface(s36, -1)
+        c80.region = +s35 & -s36
         c80.fill = l101
         fa_hot.add_cells((c80, ))
 
@@ -509,79 +499,51 @@ class InputSet(object):
         # Define root universe.
         root = openmc.Universe(universe_id=0, name='root universe')
         c1 = openmc.Cell(cell_id=1)
-        c1.add_surface(s6, -1)
-        c1.add_surface(s34, +1)
-        c1.add_surface(s35, -1)
+        c1.region = -s6 & +s34 & -s35
         c1.fill = l200
 
         c2 = openmc.Cell(cell_id=2)
-        c2.add_surface(s6, -1)
-        c1.add_surface(s35, +1)
-        c2.add_surface(s36, -1)
+        c2.region = -s6 & +s35 & -s36
         c2.fill = l201
 
         c3 = openmc.Cell(cell_id=3)
-        c3.add_surface(s7, -1)
-        c3.add_surface(s31, +1)
-        c3.add_surface(s32, -1)
+        c3.region = -s7 & +s31 & -s32
         c3.fill = bot_plate
 
         c4 = openmc.Cell(cell_id=4)
-        c4.add_surface(s5, -1)
-        c4.add_surface(s32, +1)
-        c4.add_surface(s33, -1)
+        c4.region = -s5 & +s32 & -s33
         c4.fill = bot_nozzle
 
         c5 = openmc.Cell(cell_id=5)
-        c5.add_surface(s5, -1)
-        c5.add_surface(s33, +1)
-        c5.add_surface(s34, -1)
+        c5.region = -s5 & +s33 & -s34
         c5.fill = bot_fa
 
         c6 = openmc.Cell(cell_id=6)
-        c6.add_surface(s5, -1)
-        c6.add_surface(s36, +1)
-        c6.add_surface(s37, -1)
+        c6.region = -s5 & +s36 & -s37
         c6.fill = top_fa
 
         c7 = openmc.Cell(cell_id=7)
-        c7.add_surface(s5, -1)
-        c7.add_surface(s37, +1)
-        c7.add_surface(s38, -1)
+        c7.region = -s5 & +s37 & -s38
         c7.fill = top_nozzle
 
         c8 = openmc.Cell(cell_id=8)
-        c8.add_surface(s7, -1)
-        c8.add_surface(s38, +1)
-        c8.add_surface(s39, -1)
+        c8.region = -s7 & +s38 & -s39
         c8.fill = upper_rad_ref
 
         c9 = openmc.Cell(cell_id=9)
-        c9.add_surface(s6, +1)
-        c9.add_surface(s7, -1)
-        c9.add_surface(s32, +1)
-        c9.add_surface(s38, -1)
+        c9.region = +s6 & -s7 & +s32 & -s38
         c9.fill = bot_nozzle
 
         c10 = openmc.Cell(cell_id=10)
-        c10.add_surface(s7, +1)
-        c10.add_surface(s8, -1)
-        c10.add_surface(s31, +1)
-        c10.add_surface(s39, -1)
+        c10.region = +s7 & -s8 & +s31 & -s39
         c10.fill = rpv_steel
 
         c11 = openmc.Cell(cell_id=11)
-        c11.add_surface(s5, +1)
-        c11.add_surface(s6, -1)
-        c11.add_surface(s32, +1)
-        c11.add_surface(s34, -1)
+        c11.region = +s5 & -s6 & +s32 & -s34
         c11.fill = lower_rad_ref
 
         c12 = openmc.Cell(cell_id=12)
-        c12.add_surface(s5, +1)
-        c12.add_surface(s6, -1)
-        c12.add_surface(s36, +1)
-        c12.add_surface(s38, -1)
+        c12.region = +s5 & -s6 & +s36 & -s38
         c12.fill = upper_rad_ref
 
         root.add_cells((c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12))

tests/test_filter_cell/inputs_true.dat

@@ -1 +1 @@
-3b06e27fa039762b59076bb9431ef003e69ef32f8d01bcf908fe85f59bf7127bd8b94bf2f895b1b63e9fcdbd97aeaf4b02bc02e7bd029bfd85263c68498ce562
+caae173f01f7073d634a68a5c4ce97177423e13596a863976e1c40303dc8c05afed457d5a1aa0ae73627ec953143e4f9c1f45bdbd3b0cca76433062467d59777

tests/test_filter_cellborn/inputs_true.dat

@@ -1 +1 @@
-6dd7d019587330bbf9c19bae7ad1d888331858b68bd77218315d5fa7b85df7fb97cb208daed584a780592cf9840e67ea3777ccbde502f3861798aac95722be9c
+2f24eb86cda981982a8db5bb110c72e9cef542c06e15b748c1c7e459f96b0d8ba0978b51dffc006e813cd2e2ae1fa0357336f8322ae263189841afde01f0327b

tests/test_filter_energy/inputs_true.dat

@@ -1 +1 @@
-bc9f43ff6368da544942b93ecfb2561911071c44524e35608fcb92c1262fe5543e09525414a87cd647fbc50113d64ff867730e5f4391f31b096abd7a0543b474
+49835200052ee1a4c9583a7bb4e9430de7d01a6d7a8d4f63ae37be9bbac4fd8c7ed9135ecbc4ab4cb075fd4d77b322265783463dd07c127decceee8c9fe25bfd

tests/test_filter_energyout/inputs_true.dat

@@ -1 +1 @@
-74c55768b2b0f5696d5bff9d36a3639c6d858bf2984d799c8b46908b897af11e691b1f9f05646d52fcee046de3bfee11e35b9b379b2967abb0922f60168017b7
+183b4a06cbd0930cfa4f28d0c385cf3ae93ab97c171580c2ba9eec0e4b716102ad83f510d62258ef6769c446e72e1d5ba9f630b171ee239ec04c9bbd1e56742e

tests/test_filter_group_transfer/inputs_true.dat

@@ -1 +1 @@
-dd69e0768aa7a4e28efd20adc6a607337c9a15682fa307b1aa2459595f90a523f1fa6e4e4f6db1d74e52a2287ef4efa85d77b1751cd1a2d2e6618385cf7f4607
+461a6a4ec3b0b6dc7199c09fa8f527e51cc7a1ea4281a708f8b7bcdbb12f7162027928dfcef68a24eaf6c06037a68e151df9aac9eac6ce56617466f2f5270b71

tests/test_filter_material/inputs_true.dat

@@ -1 +1 @@
-91dd096441a7f01689ed605b7b3322c63a90c4802d73450acd825b715a8163fc892b4971e4b8b0d5a179eb51ad22bcc886f3935e7ab734d0fedebaf679415816
+2fbd0986abff08126680925284929cf67bdad0cd564775197b78065ce3b0e6ad8094f5ca4d14ea69347db69a6cdcc9796a095178ae9b14a927b101f32f3cd0ec

tests/test_filter_universe/inputs_true.dat

@@ -1 +1 @@
-f3dc4c28827ca9035d2d1a39f4adef794f0e27b8c95776485e419b9610aefc6c268e6a1d5889d8170ec9400fc3a4a52bc69cd94e5056078aee7405e0bc62bad5
+51fcaf0aa527d1fd1022e5f312d4d25cd9bacc5fc9792d9f7702ee97cac43700a31f25be767a2cff769c37b5e1cdf3f922467977a9958fa34561e2a102bf8537

tests/test_score_MT/inputs_true.dat

@@ -1 +1 @@
-6ba3ebe9d50584343b012b7a935a0f75b8366659600d4de050a8e4e48405f8da36682e8ab5f495f69b646fc72e176755c0a3540f235806c73d5ebc4fc67db107
+63295b9d510370e65e63a3db627d47d286f5479e53c8eabeda9a5cb25ffe35becb636835aadad11691e34c23292fe11b5f688daee76d76ceac4b5dfd2f9ede4c

tests/test_score_absorption/inputs_true.dat

@@ -1 +1 @@
-a2be808e033014c9d748a0ec503ab6ad498f6b70250c8136bfcb9dc8f5580e69fc0bc1c6acab428c139edf64f51237ba07495b0275a19f509bf3bd20fa298e4e
+482760c362f56e453ce4b466083e77f84a461e636330d7cc2cb1cf7facced678a57a7c785ff9d039b3f575396cb435f99df05d6fa207f553c28ed3ce4f8151b3

tests/test_score_events/inputs_true.dat

@@ -1 +1 @@
-493830fe4598d5a2e31d4b79aceb79390bfa0bd7e08681ef36d5978a72de3cd7bcdbc06147061664614ed8e069be82d01e880e8e8cb629d3bd7aa1223850c8e6
+a97ae7049ac8c30b838987a3e87cbe5ff70b004ee0434e6204931def46c4c099bfef06e74658dab1114cc1035d3f404211a9bc94ef96e9cfb5b788da39d17bbd

tests/test_score_fission/inputs_true.dat

@@ -1 +1 @@
-e94e6338c6aadaebd6f3cdad768b53908e470dc6d650a170703b21bf0140313559ce2af78f6b8bd13498dc5019ce02603ec6ba7c68731dfa05ca4a540f159625
+5a0461d03b0d9653ee35fded4be23e9b8316e3b7e21d352f822bc1f9763c03e9edab922bdc431f30d2a647c4216d45deba396bf56203027a328b7b28d970e0b8

tests/test_score_flux/inputs_true.dat

@@ -1 +1 @@
-23454cbb568dd5f8569f228b3d0e6d180144279005521ad009d6a99384db79330b274edc431133f5e304a6750bef2b85bfc5af46258a75ce3f0673dd0ec0c54c
+33b7b97f55a337d7001e7927517db6d36d512efec01fa5512c80bbc76b0b581f691a72a3810251aa97491b8cdf25a8ddcc9c9b3e3f54ccc6c315a84e715567d3

tests/test_score_flux_yn/inputs_true.dat

@@ -1 +1 @@
-977c9d76d335d79fa561f9eab8a575a118f900818759b96b6fbdbf8d06a012a44d5892bbb22292f9b730745d86859ffcba6b16b59096eff587fca2a5d6629cf5
+b1a63345fc721f87c8fc25babb06741b585ee5dff5f29bb6debfbabb2ad57cb762d98c14e544df998a27bc725fb2704092fcdde54315ff832dff96c3641551d0

tests/test_score_kappafission/inputs_true.dat

@@ -1 +1 @@
-8dd415b571ad51a62f2394d149f6c417d63babd4e85a1ff6f1cac267c4f4bcd0642ba0b24da39ff926bee4aea7dbbe0371face03d2009d8d74e7ac31c7c45000
+57e4aa7550789aec0fcbc4a8917e9d28b1f1ae098a09cde95b757fd87d0dd3924c1bb9d4b23c59cd3793446fb6bbc8af4e1bb46323d70d5e5acd13db1167f545

tests/test_score_nufission/inputs_true.dat

@@ -1 +1 @@
-0e60125f41bbc362703886097b2bc7297ff0aae6365d4653771b86b1aab2de43a924d81b3d73afb781733b2919f30089373f74da4a96f94f988eb04ddf482e85
+a42b2e165f59d3f499865d5db1e7db9b4cb25e48290f94080e569a9efc0b437d75cbb5773ac564f6cc95b19521fb7bc97a3eb641b491828c90cd086dc0c06a4b

tests/test_score_nuscatter/inputs_true.dat

@@ -1 +1 @@
-c74fb5e4e8caecd11642231b55cb9442264da220329fd6a1c9959214342acd5efb4ef23368b0b018f0388a6102bce65226f6161d32f3613128d8c3762a3f6f9e
+764d3ba6b1bc86b462d44151242bd18fa5f0200b831bb7537cf881b728622799eb95a457f88a503487bfd30095c1fa995818d50a6bc41dd182009772c010e82b

tests/test_score_nuscatter_n/inputs_true.dat

@@ -1 +1 @@
-c184ef2764fa23db32253ec4c23d36cf842f173a0a57c93cb165faf771f2ff23346756160ba5793c558448283eb0917d23e3871753ea2b7e3e24f14d6cf4179f
+17541e365f35ebd25134465a02d9a66e46536c4e3f5769da62137ec94ee7c8fb46ef38b9039aa6430261329a4e1b0ce677174323563e5be2f1368dc0c552e312

tests/test_score_nuscatter_pn/inputs_true.dat

@@ -1 +1 @@
-79d74ffe32f564b83bdde94048f57233454881f3b55413e9b5e30ce4b9813ff6436dca98d691d941d5f31947f2215dcb656369c2b32e6240e1424e6aad96395e
+8ae1b048b90a049d9ed42336a0a2e8f7a250a14d889cc15e0c2831ed71617a78b92570480a15f936f2dd623c75f55693e38c69041c3cae24aba082409b51bc9f

tests/test_score_nuscatter_yn/inputs_true.dat

@@ -1 +1 @@
-fd7b5b66e5d5e705da488651445d75240b05dcc1d243b2d2e8b8a729c8220221cdfa1eccfeca30897a006caaceae3e8c7449392b5027b290cb388b33e86ff2a3
+205e5cac8129797b815f0e79dad6c41a1876157ba69fcffecf67c3603dc36ded5f0168f9961d51fcb7dc7db6d732e7a3e8f82d04947aa0309df56bb8333d4bc9

tests/test_score_scatter/inputs_true.dat

@@ -1 +1 @@
-8b5e7c3825ef033d12c0574595b16559981ed3dd0ced8609c461cd0e81f1f2ef28195e0a6f6886fcbae64185dfe96001fa12d3d472f6446a3135d3bd6ef83394
+b5baba05419ce120bd22d935af9cdd6d206ad5dc5cae5991a9d160c70bb029f2d87040fa4e19f7190de64b908ac6a41a8b28db4a4f3883ec16e529b1449e983d

tests/test_score_scatter_n/inputs_true.dat

@@ -1 +1 @@
-414d0faeba75d27e4785faa9812f5eac6aa108e7fd3c1388d51ae8e0d7fddd25e9f61e51afdaa70874a32e1c3d2815d82b5c79636b1ccb0d6767144fcf6f813a
+a153add0502ff0fd4b0670f01679e104be1bb05941e73fb35e426c7f1e41a6144c7eb81fdba0d62ea3f39c7c6798028ff6d5df8c7a50b3e3f9e9bfe72fd48c2f

tests/test_score_scatter_pn/inputs_true.dat

@@ -1 +1 @@
-f83e5a272e78dba7a4b3412aa264300efbeae641de0bbcae3febe7ba5fa6668dbf9364fdc7f1c431ab9c58aaf019ae41d98ee69d4dd035d6b5e0188e7d181b20
+fe56d58827d1803c1a49391711ad682be4a7cbc51519248812554f66e3e46266edc179f4254291a5f455751d3cdc13a17bbd103b9810c8818f36e4d283b503be

tests/test_score_scatter_yn/inputs_true.dat

@@ -1 +1 @@
-c90d836355fcbe14112c16f8743b9180371400c022b19f693881d91924788555ed1507a1936b4d241a63564a7661f380c5d0568d398fa8a20a25f41c5b7c4fb8
+d80a9e8befab978bc84a231437a2b96c8f6dba81984c9e82a79360feb26bc9875b661131dbaa2deeb66b0aa50a39b2e738303bc40c5c65ee1995cf52f687ae46

tests/test_score_total/inputs_true.dat

@@ -1 +1 @@
-90633c6010148c10c363ed3b2e9de3213468c51dea6153dff4bb18eadc579041d967e4835023d10b6d8c42fe81017238d119f24cae754d0621698547464b16f3
+8813917cab656135c4eebfdbe5f0d95e6a9409a2b36df1dfb483bdd193a3c0978727918a58399b259b82a7d51ae3f1801148bd978603fec11f27acdbf89520e2

tests/test_score_total_yn/inputs_true.dat

@@ -1 +1 @@
-def382a2f9efec93baf521911ab89e0d73ceadba486f9bb306e9cf82ffc1c67b72498c153519e05b516ff54db431430b2b25b80675961697e19774455711a5f8
+4dbbd9cec921d2420e7567533c833afbe94335073aa760d1fd937adb695191b3ab7c070ec0d32721dddb4a46054e68322cf6a058420e20e439eb1d44f09f4be4

tests/test_score_total_yn/results_true.dat

@@ -288,7 +288,7 @@ tally 2:
 1.155268E-03
 6.855877E-02
 4.048417E-03
--2.701969E-05
+-2.701967E-05
 1.279041E-03
 -2.197636E-02
 2.843662E-04