From 9c13474372e55ccaf6a984a1e0b52c45507198e9 Mon Sep 17 00:00:00 2001 From: "W. Daryl Hawkins" Date: Tue, 15 Jul 2025 20:47:57 -0500 Subject: [PATCH] Updating inputs to make scattering_order a required problem parameter. Adding push and pr testing. Tightening k tolerance for HEU_MET_FAST_003 test. --- .github/workflows/nightly.yaml | 5 +++++ HEU_MET_FAST_003/HEU_MET_FAST_003.py | 4 ++-- OpenSn_Logo_CAD/opensn.py | 2 +- Six_1g_spherical_benchmarks/Problem_1.py | 2 +- Six_1g_spherical_benchmarks/Problem_2.py | 2 +- Six_1g_spherical_benchmarks/Problem_3.py | 2 +- Six_1g_spherical_benchmarks/Problem_4.py | 2 +- Six_1g_spherical_benchmarks/Problem_5.py | 2 +- Six_1g_spherical_benchmarks/Problem_6.py | 2 +- Urban_Source/urban_source.py | 2 +- test.py | 2 +- 11 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 236771a..05ccafe 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -4,6 +4,11 @@ on: schedule: - cron: "0 4 * * *" workflow_dispatch: + push: + branches: [main] + pull_request: + branches: + - main jobs: run-tests: diff --git a/HEU_MET_FAST_003/HEU_MET_FAST_003.py b/HEU_MET_FAST_003/HEU_MET_FAST_003.py index 3311076..9fc7eed 100644 --- a/HEU_MET_FAST_003/HEU_MET_FAST_003.py +++ b/HEU_MET_FAST_003/HEU_MET_FAST_003.py @@ -104,8 +104,8 @@ {"block_ids": [1], "xs": xs_oralloy}, {"block_ids": [2], "xs": xs_tuballoy}, ], + scattering_order=3, options={ - "scattering_order": 3, "use_precursors": False, "verbose_inner_iterations": True, "verbose_outer_iterations": True, @@ -119,7 +119,7 @@ k_solver = NonLinearKEigenSolver( lbs_problem=phys, nl_max_its=500, - nl_abs_tol=1.0e-8, + nl_abs_tol=1.0e-9, ) k_solver.Initialize() k_solver.Execute() diff --git a/OpenSn_Logo_CAD/opensn.py b/OpenSn_Logo_CAD/opensn.py index 0f27482..3ddc993 100644 --- a/OpenSn_Logo_CAD/opensn.py +++ b/OpenSn_Logo_CAD/opensn.py @@ -59,8 +59,8 @@ {"block_ids": [1], "xs": xs_source}, {"block_ids": [2], "xs": xs_block}, ], + scattering_order=0, options={ - "scattering_order": 0, "volumetric_sources": [src], } ) diff --git a/Six_1g_spherical_benchmarks/Problem_1.py b/Six_1g_spherical_benchmarks/Problem_1.py index 16e1ed4..ddb87ec 100644 --- a/Six_1g_spherical_benchmarks/Problem_1.py +++ b/Six_1g_spherical_benchmarks/Problem_1.py @@ -101,8 +101,8 @@ xs_map=[ {"block_ids": [1], "xs": xs_mat}, ], + scattering_order=0, options={ - "scattering_order": 0, "boundary_conditions": [ {"name": "xmin", "type": "isotropic", "group_strength": bsrc}, {"name": "xmax", "type": "isotropic", "group_strength": bsrc}, diff --git a/Six_1g_spherical_benchmarks/Problem_2.py b/Six_1g_spherical_benchmarks/Problem_2.py index 3bdef60..e25a92a 100644 --- a/Six_1g_spherical_benchmarks/Problem_2.py +++ b/Six_1g_spherical_benchmarks/Problem_2.py @@ -66,8 +66,8 @@ xs_map=[ {"block_ids": [1, 2], "xs": xs_void}, ], + scattering_order=0, options={ - "scattering_order": 0, "volumetric_sources": [mg_src], "boundary_conditions": [ {"name": "xmin", "type": "vacuum"}, diff --git a/Six_1g_spherical_benchmarks/Problem_3.py b/Six_1g_spherical_benchmarks/Problem_3.py index 62095c3..a9a8263 100644 --- a/Six_1g_spherical_benchmarks/Problem_3.py +++ b/Six_1g_spherical_benchmarks/Problem_3.py @@ -63,8 +63,8 @@ xs_map=[ {"block_ids": [1, 2, 3], "xs": xs_void}, ], + scattering_order=0, options={ - "scattering_order": 0, "volumetric_sources": [mg_src], "boundary_conditions": [ {"name": "xmin", "type": "vacuum"}, diff --git a/Six_1g_spherical_benchmarks/Problem_4.py b/Six_1g_spherical_benchmarks/Problem_4.py index 8e5d2ee..80d79ab 100644 --- a/Six_1g_spherical_benchmarks/Problem_4.py +++ b/Six_1g_spherical_benchmarks/Problem_4.py @@ -65,8 +65,8 @@ {"block_ids": [1], "xs": xs_mat}, {"block_ids": [2], "xs": xs_void}, ], + scattering_order=0, options={ - "scattering_order": 0, "boundary_conditions": [ {"name": "xmin", "type": "isotropic", "group_strength": bsrc}, {"name": "xmax", "type": "isotropic", "group_strength": bsrc}, diff --git a/Six_1g_spherical_benchmarks/Problem_5.py b/Six_1g_spherical_benchmarks/Problem_5.py index 2b24745..13b4078 100644 --- a/Six_1g_spherical_benchmarks/Problem_5.py +++ b/Six_1g_spherical_benchmarks/Problem_5.py @@ -65,8 +65,8 @@ {"block_ids": [2], "xs": xs_mat}, {"block_ids": [1, 3], "xs": xs_void}, ], + scattering_order=0, options={ - "scattering_order": 0, "boundary_conditions": [ {"name": "xmin", "type": "isotropic", "group_strength": bsrc}, {"name": "xmax", "type": "isotropic", "group_strength": bsrc}, diff --git a/Six_1g_spherical_benchmarks/Problem_6.py b/Six_1g_spherical_benchmarks/Problem_6.py index 4cb1af3..613bb7c 100644 --- a/Six_1g_spherical_benchmarks/Problem_6.py +++ b/Six_1g_spherical_benchmarks/Problem_6.py @@ -66,8 +66,8 @@ {"block_ids": [1], "xs": xs_mat}, {"block_ids": [2], "xs": xs_void}, ], + scattering_order=0, options={ - "scattering_order": 0, "volumetric_sources": [mg_src], "boundary_conditions": [ {"name": "xmin", "type": "vacuum"}, diff --git a/Urban_Source/urban_source.py b/Urban_Source/urban_source.py index 3a890f8..8fd78a1 100644 --- a/Urban_Source/urban_source.py +++ b/Urban_Source/urban_source.py @@ -62,8 +62,8 @@ {"block_ids": [2], "xs": xs_source}, {"block_ids": [3], "xs": xs_air}, ], + scattering_order=0, options={ - "scattering_order": 0, "volumetric_sources": [src], } ) diff --git a/test.py b/test.py index 3a8c3a4..98641f1 100644 --- a/test.py +++ b/test.py @@ -34,7 +34,7 @@ ), ( os.path.join("Six_1g_spherical_benchmarks", "Problem_2.py"), - {"end-radius:": 1.00, "avg-value:": 8.212354}, + {"end-radius:": 1.00, "avg-value:": 0.047223}, 12, 1.0e-6, ),