diff --git a/examples/pincell_depletion/restart_depletion.py b/examples/pincell_depletion/restart_depletion.py index 95bbb9954b..6bb715f3b5 100644 --- a/examples/pincell_depletion/restart_depletion.py +++ b/examples/pincell_depletion/restart_depletion.py @@ -43,7 +43,7 @@ model = openmc.Model(geometry=geometry, settings=settings) # Create depletion "operator" chain_file = 'chain_simple.xml' -op = openmc.deplete.Operator(model, chain_file, previous_results) +op = openmc.deplete.CoupledOperator(model, chain_file, previous_results) # Perform simulation using the predictor algorithm time_steps = [1.0, 1.0, 1.0, 1.0, 1.0] # days diff --git a/examples/pincell_depletion/run_depletion.py b/examples/pincell_depletion/run_depletion.py index ae069334ed..6a6c25f59b 100644 --- a/examples/pincell_depletion/run_depletion.py +++ b/examples/pincell_depletion/run_depletion.py @@ -88,7 +88,7 @@ model = openmc.Model(geometry=geometry, settings=settings) # Create depletion "operator" chain_file = 'chain_simple.xml' -op = openmc.deplete.Operator(model, chain_file) +op = openmc.deplete.CoupledOperator(model, chain_file) # Perform simulation using the predictor algorithm time_steps = [1.0, 1.0, 1.0, 1.0, 1.0] # days diff --git a/openmc/model/model.py b/openmc/model/model.py index 52c52154e3..ab99ac9787 100644 --- a/openmc/model/model.py +++ b/openmc/model/model.py @@ -331,7 +331,7 @@ class Model: Indicate whether or not a transport solve should be run at the end of the last timestep. Defaults to running this transport solve. operator_kwargs : dict - Keyword arguments passed to the depletion Operator initializer + Keyword arguments passed to the depletion operator initializer (e.g., :func:`openmc.deplete.Operator`) directory : str, optional Directory to write XML files to. If it doesn't exist already, it @@ -360,8 +360,8 @@ class Model: with _change_directory(Path(directory)): with openmc.lib.quiet_dll(output): - depletion_operator = \ - dep.Operator(self, **op_kwargs) + # TODO: Support use of IndependentOperator too + depletion_operator = dep.CoupledOperator(self, **op_kwargs) # Tell depletion_operator.finalize NOT to clear C API memory when # it is done diff --git a/tests/regression_tests/deplete_with_transport/test.py b/tests/regression_tests/deplete_with_transport/test.py index 0c2a4cd973..58065035f3 100644 --- a/tests/regression_tests/deplete_with_transport/test.py +++ b/tests/regression_tests/deplete_with_transport/test.py @@ -53,7 +53,7 @@ def test_full(run_in_tmpdir, problem, multiproc): # Create operator chain_file = Path(__file__).parents[2] / 'chain_simple.xml' - op = openmc.deplete.Operator(model, chain_file) + op = openmc.deplete.CoupledOperator(model, chain_file) op.round_number = True # Power and timesteps diff --git a/tests/unit_tests/test_deplete_activation.py b/tests/unit_tests/test_deplete_activation.py index cb3b86b9c8..1842ad8ac8 100644 --- a/tests/unit_tests/test_deplete_activation.py +++ b/tests/unit_tests/test_deplete_activation.py @@ -64,7 +64,7 @@ def test_activation(run_in_tmpdir, model, reaction_rate_mode, reaction_rate_opts chain.export_to_xml('test_chain.xml') # Create transport operator - op = openmc.deplete.Operator( + op = openmc.deplete.CoupledOperator( model, 'test_chain.xml', normalization_mode="source-rate", reaction_rate_mode=reaction_rate_mode, @@ -144,7 +144,7 @@ def test_decay(run_in_tmpdir): model = openmc.Model(geometry=geometry, settings=settings) # Create transport operator - op = openmc.deplete.Operator( + op = openmc.deplete.CoupledOperator( model, 'test_chain.xml', normalization_mode="source-rate" )