From 74612356663e7684e65355778f05e788d4d3898b Mon Sep 17 00:00:00 2001 From: "W. Daryl Hawkins" Date: Thu, 19 Jun 2025 23:09:39 -0500 Subject: [PATCH] Updating quadrature objects to use new API with scattering_order. --- HEU_MET_FAST_003/HEU_MET_FAST_003.py | 6 +++++- 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 +- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/HEU_MET_FAST_003/HEU_MET_FAST_003.py b/HEU_MET_FAST_003/HEU_MET_FAST_003.py index 624f2f5..3311076 100644 --- a/HEU_MET_FAST_003/HEU_MET_FAST_003.py +++ b/HEU_MET_FAST_003/HEU_MET_FAST_003.py @@ -88,7 +88,11 @@ groupsets=[ { "groups_from_to": (0, num_groups - 1), - "angular_quadrature": GLCProductQuadrature3DXYZ(n_polar=8, n_azimuthal=16), + "angular_quadrature": GLCProductQuadrature3DXYZ( + n_polar=8, + n_azimuthal=16, + scattering_order=3 + ), "inner_linear_method": "petsc_gmres", "angle_aggregation_type": "single", "angle_aggregation_num_subsets": 1, diff --git a/OpenSn_Logo_CAD/opensn.py b/OpenSn_Logo_CAD/opensn.py index aa95c2b..0f27482 100644 --- a/OpenSn_Logo_CAD/opensn.py +++ b/OpenSn_Logo_CAD/opensn.py @@ -39,7 +39,7 @@ src = VolumetricSource(block_ids=[1], group_strength=src_strength) # Quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=8, n_azimuthal=16) + pquad = GLCProductQuadrature3DXYZ(n_polar=8, n_azimuthal=16, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem( diff --git a/Six_1g_spherical_benchmarks/Problem_1.py b/Six_1g_spherical_benchmarks/Problem_1.py index f0fe599..16e1ed4 100644 --- a/Six_1g_spherical_benchmarks/Problem_1.py +++ b/Six_1g_spherical_benchmarks/Problem_1.py @@ -80,7 +80,7 @@ bsrc = [4.0 * np.pi] # Angular quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4) + pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem( diff --git a/Six_1g_spherical_benchmarks/Problem_2.py b/Six_1g_spherical_benchmarks/Problem_2.py index f0fe599..16e1ed4 100644 --- a/Six_1g_spherical_benchmarks/Problem_2.py +++ b/Six_1g_spherical_benchmarks/Problem_2.py @@ -80,7 +80,7 @@ bsrc = [4.0 * np.pi] # Angular quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4) + pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem( diff --git a/Six_1g_spherical_benchmarks/Problem_3.py b/Six_1g_spherical_benchmarks/Problem_3.py index 15df624..62095c3 100644 --- a/Six_1g_spherical_benchmarks/Problem_3.py +++ b/Six_1g_spherical_benchmarks/Problem_3.py @@ -42,7 +42,7 @@ mg_src = VolumetricSource(block_ids=[2], group_strength=[1.0]) # Angular quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4) + pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem( diff --git a/Six_1g_spherical_benchmarks/Problem_4.py b/Six_1g_spherical_benchmarks/Problem_4.py index c84eb19..8e5d2ee 100644 --- a/Six_1g_spherical_benchmarks/Problem_4.py +++ b/Six_1g_spherical_benchmarks/Problem_4.py @@ -43,7 +43,7 @@ bsrc = [4.0 * np.pi] # Angular quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4) + pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem( diff --git a/Six_1g_spherical_benchmarks/Problem_5.py b/Six_1g_spherical_benchmarks/Problem_5.py index 12a2f5e..2b24745 100644 --- a/Six_1g_spherical_benchmarks/Problem_5.py +++ b/Six_1g_spherical_benchmarks/Problem_5.py @@ -43,7 +43,7 @@ bsrc = [4.0 * np.pi] # Angular quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4) + pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem( diff --git a/Six_1g_spherical_benchmarks/Problem_6.py b/Six_1g_spherical_benchmarks/Problem_6.py index e9e7dcf..4cb1af3 100644 --- a/Six_1g_spherical_benchmarks/Problem_6.py +++ b/Six_1g_spherical_benchmarks/Problem_6.py @@ -44,7 +44,7 @@ mg_src = VolumetricSource(block_ids=[1], group_strength=[1.0]) # Angular quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4) + pquad = GLCProductQuadrature3DXYZ(n_polar=2, n_azimuthal=4, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem( diff --git a/Urban_Source/urban_source.py b/Urban_Source/urban_source.py index 382adee..3a890f8 100644 --- a/Urban_Source/urban_source.py +++ b/Urban_Source/urban_source.py @@ -41,7 +41,7 @@ src = VolumetricSource(block_ids=[2], group_strength=src_strength) # Quadrature - pquad = GLCProductQuadrature3DXYZ(n_polar=8, n_azimuthal=16) + pquad = GLCProductQuadrature3DXYZ(n_polar=8, n_azimuthal=16, scattering_order=0) # Solver phys = DiscreteOrdinatesProblem(