From 69f97e6f2c029e0c70ec6eeb832bbaaf71f83434 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 11 Apr 2018 11:41:49 -0500 Subject: [PATCH] Force analog for tallies with spherical harmonics filter with cosine=scatter --- src/tallies/tally_filter_sph_harm.F90 | 4 ++-- src/tallies/tally_header.F90 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tallies/tally_filter_sph_harm.F90 b/src/tallies/tally_filter_sph_harm.F90 index 5cd3f59c3b..5c47c2c71f 100644 --- a/src/tallies/tally_filter_sph_harm.F90 +++ b/src/tallies/tally_filter_sph_harm.F90 @@ -20,8 +20,8 @@ module tally_filter_sph_harm public :: openmc_sphharm_filter_set_order public :: openmc_sphharm_filter_set_cosine - integer, parameter :: COSINE_SCATTER = 1 - integer, parameter :: COSINE_PARTICLE = 2 + integer, public, parameter :: COSINE_SCATTER = 1 + integer, public, parameter :: COSINE_PARTICLE = 2 !=============================================================================== ! SPHERICALHARMONICSFILTER gives spherical harmonics expansion moments of a diff --git a/src/tallies/tally_header.F90 b/src/tallies/tally_header.F90 index 29362fee3c..02a578d7e0 100644 --- a/src/tallies/tally_header.F90 +++ b/src/tallies/tally_header.F90 @@ -359,6 +359,9 @@ contains this % estimator = ESTIMATOR_ANALOG type is (SphericalHarmonicsFilter) j = FILTER_SPH_HARMONICS + if (filt % cosine == COSINE_SCATTER) then + this % estimator = ESTIMATOR_ANALOG + end if type is (SpatialLegendreFilter) j = FILTER_SPTL_LEGENDRE this % estimator = ESTIMATOR_COLLISION