Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Make keff search control work with depletion. by GuySten · Pull Request #4083 · openmc-dev/openmc · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Make keff search control work with depletion. by GuySten · Pull Request #4083 · openmc-dev/openmc · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Make keff search control work with depletion. by GuySten · Pull Request #4083 · openmc-dev/openmc · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Make keff search control work with depletion. by GuySten · Pull Request #4083 · openmc-dev/openmc · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Make keff search control work with depletion. by GuySten · Pull Request #4083 · openmc-dev/openmc · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Make keff search control work with depletion. by GuySten · Pull Request #4083 · openmc-dev/openmc · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Make keff search control work with depletion. by GuySten · Pull Request #4083 · openmc-dev/openmc · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions openmc/deplete/keff_search_control.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,15 @@ def run(self, x):
root : float
Parameter value that achieves target keff
"""
# The keff search happens before the transport operator is called for
# this step, so both openmc.lib.materials and the operator's AtomNumber
# still hold the compositions from the previous operator call. Push the
# current beginning-of-step compositions in first, otherwise the search
# is performed on stale materials and _update_vec() below overwrites
# `x` with those stale densities, freezing the composition at its
# initial state for the entire depletion calculation.
self.operator._update_materials_and_nuclides(x)

root = self._search_for_keff()
self._update_vec(x)
return root
Expand Down
57 changes: 56 additions & 1 deletion tests/unit_tests/test_deplete_keff_search_control.py
100644 → 100755
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
"""Tests for KeffSearchControl class """
"""Tests for the KeffSearchControl class and openmc.deplete.keff_search_control."""

from pathlib import Path

Expand All@@ -8,6 +8,7 @@
import openmc
import openmc.lib
from openmc.deplete import CoupledOperator
from openmc.deplete.keff_search_control import _KeffSearchControl

CHAIN_PATH = Path(__file__).parents[1] / "chain_simple.xml"

Expand DownExpand Up@@ -86,6 +87,35 @@ def set_u235_density(u235_density):
return u235_density


class MockOperator:
"""Minimal operator recording calls to _update_materials_and_nuclides."""

def __init__(self, calls):
self.calls = calls

def _update_materials_and_nuclides(self, vec):
self.calls.append(('update_materials', [v.copy() for v in vec]))


@pytest.fixture
def control_and_calls(monkeypatch):
calls = []
operator = MockOperator(calls)
control = _KeffSearchControl(
operator, lambda x: None, x0=0.0, x1=1.0, bracket=[0.0, 2.0])

def fake_search():
calls.append(('search', None))
return 0.5

def fake_update_vec(x):
calls.append(('update_vec', None))

monkeypatch.setattr(control, '_search_for_keff', fake_search)
monkeypatch.setattr(control, '_update_vec', fake_update_vec)
return control, calls


@pytest.mark.parametrize("function, x0, x1, bracket", [
(translate_cell, -1.0, 1.0, (-5.0, 5.0)),
(rotate_cell, -45.0, 45.0, (-90.0, 90.0)),
Expand DownExpand Up@@ -114,3 +144,28 @@ def test_integrator_add_keff_search_control(run_in_tmpdir, function, x0, x1, bra
assert integrator._keff_search_control.search_kwargs['x_max'] == bracket[1]
assert integrator._keff_search_control.search_kwargs['k_tol'] == 0.1
assert not integrator._keff_search_control.search_kwargs['output']


def test_materials_updated_before_search(control_and_calls):
"""Compositions must be pushed to openmc.lib before the search runs.

The keff search is executed at the beginning of a depletion step, before
the transport operator is called. Without an explicit update, both
openmc.lib.materials and the operator's AtomNumber still hold the previous
call's compositions, and _update_vec() overwrites the depleted vector with
them -- freezing nuclide densities at their initial values.
"""
control, calls = control_and_calls
n = [np.array([1.0, 2.0, 3.0]), np.array([4.0, 5.0, 6.0])]

root = control.run(n)

assert root == 0.5
assert [name for name, _ in calls] == [
'update_materials', 'search', 'update_vec']

# The vector handed to the operator must be the current composition
recorded = calls[0][1]
assert len(recorded) == len(n)
for actual, expected in zip(recorded, n):
np.testing.assert_array_equal(actual, expected)
Loading