Skip to content

Commit 2a479dc

Browse files
nuclearkevinnuclearkevin
committed
Style changes.
1 parent ce76711 commit 2a479dc

File tree

5 files changed

+46
-25
lines changed

5 files changed

+46
-25
lines changed

‎include/openmc/material.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
#include "xtensor/xtensor.hpp"
1010
#include <hdf5.h>
1111

12-
#include "openmc/settings.h"
1312
#include "openmc/bremsstrahlung.h"
1413
#include "openmc/constants.h"
1514
#include "openmc/memory.h" // for unique_ptr
1615
#include "openmc/ncrystal_interface.h"
1716
#include "openmc/particle.h"
17+
#include "openmc/settings.h"
1818
#include "openmc/vector.h"
1919

2020
namespace openmc {
@@ -113,7 +113,10 @@ class Material {
113113

114114
//! Get density in [g/cm^3].
115115
//! \return Density in [g/cm^3]
116-
double density_gpcc() const { return settings::run_CE ? density_gpcc_ : density(); }
116+
double density_gpcc() const
117+
{
118+
return settings::run_CE ? density_gpcc_ : density();
119+
}
117120

118121
//! Get charge density in [e/b-cm]
119122
//! \return Charge density in [e/b-cm]

‎src/random_ray/flat_source_domain.cpp‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,11 @@ void FlatSourceDomain::update_single_neutron_source(SourceRegionHandle& srh)
119119

120120
for (int g_in = 0; g_in < negroups_; g_in++) {
121121
double scalar_flux = srh.scalar_flux_old(g_in);
122-
double sigma_s =
123-
sigma_s_[material * negroups_ * negroups_ + g_out * negroups_ + g_in] * density_mult;
124-
double nu_sigma_f = nu_sigma_f_[material * negroups_ + g_in] * density_mult;
122+
double sigma_s = sigma_s_[material * negroups_ * negroups_ +
123+
g_out * negroups_ + g_in] *
124+
density_mult;
125+
double nu_sigma_f =
126+
nu_sigma_f_[material * negroups_ + g_in] * density_mult;
125127
double chi = chi_[material * negroups_ + g_out];
126128

127129
scatter_source += sigma_s * scalar_flux;
@@ -199,7 +201,8 @@ void FlatSourceDomain::set_flux_to_flux_plus_source(
199201
source_regions_.volume_sq(sr);
200202
}
201203
} else {
202-
double sigma_t = sigma_t_[source_regions_.material(sr) * negroups_ + g] * source_regions_.density_mult(sr);
204+
double sigma_t = sigma_t_[source_regions_.material(sr) * negroups_ + g] *
205+
source_regions_.density_mult(sr);
203206
source_regions_.scalar_flux_new(sr, g) /= (sigma_t * volume);
204207
source_regions_.scalar_flux_new(sr, g) += source_regions_.source(sr, g);
205208
}
@@ -333,7 +336,8 @@ void FlatSourceDomain::compute_k_eff()
333336
double sr_fission_source_new = 0;
334337

335338
for (int g = 0; g < negroups_; g++) {
336-
double nu_sigma_f = nu_sigma_f_[material * negroups_ + g] * source_regions_.density_mult(sr);
339+
double nu_sigma_f = nu_sigma_f_[material * negroups_ + g] *
340+
source_regions_.density_mult(sr);
337341
sr_fission_source_old +=
338342
nu_sigma_f * source_regions_.scalar_flux_old(sr, g);
339343
sr_fission_source_new +=
@@ -563,7 +567,8 @@ double FlatSourceDomain::compute_fixed_source_normalization_factor() const
563567
// to get the total source strength in the expected units.
564568
double sigma_t = 1.0;
565569
if (material != MATERIAL_VOID) {
566-
sigma_t = sigma_t_[material * negroups_ + g] * source_regions_.density_mult(sr);
570+
sigma_t =
571+
sigma_t_[material * negroups_ + g] * source_regions_.density_mult(sr);
567572
}
568573
simulation_external_source_strength +=
569574
source_regions_.external_source(sr, g) * sigma_t * volume;
@@ -637,19 +642,22 @@ void FlatSourceDomain::random_ray_tally()
637642

638643
case SCORE_TOTAL:
639644
if (material != MATERIAL_VOID) {
640-
score = flux * volume * sigma_t_[material * negroups_ + g] * density_mult;
645+
score =
646+
flux * volume * sigma_t_[material * negroups_ + g] * density_mult;
641647
}
642648
break;
643649

644650
case SCORE_FISSION:
645651
if (material != MATERIAL_VOID) {
646-
score = flux * volume * sigma_f_[material * negroups_ + g] * density_mult;
652+
score =
653+
flux * volume * sigma_f_[material * negroups_ + g] * density_mult;
647654
}
648655
break;
649656

650657
case SCORE_NU_FISSION:
651658
if (material != MATERIAL_VOID) {
652-
score = flux * volume * nu_sigma_f_[material * negroups_ + g] * density_mult;
659+
score = flux * volume * nu_sigma_f_[material * negroups_ + g] *
660+
density_mult;
653661
}
654662
break;
655663

@@ -916,7 +924,8 @@ void FlatSourceDomain::output_to_vtk() const
916924
for (int g = 0; g < negroups_; g++) {
917925
int64_t source_element = fsr * negroups_ + g;
918926
float flux = evaluate_flux_at_point(voxel_positions[i], fsr, g);
919-
double sigma_f = sigma_f_[mat * negroups_ + g] * source_regions_.density_mult(fsr);
927+
double sigma_f = sigma_f_[mat * negroups_ + g] *
928+
source_regions_.density_mult(fsr);
920929
total_fission += sigma_f * flux;
921930
}
922931
}
@@ -937,7 +946,8 @@ void FlatSourceDomain::output_to_vtk() const
937946
// multiply it back to get the true external source.
938947
double sigma_t = 1.0;
939948
if (mat != MATERIAL_VOID) {
940-
sigma_t = sigma_t_[mat * negroups_ + g] * source_regions_.density_mult(fsr);
949+
sigma_t = sigma_t_[mat * negroups_ + g] *
950+
source_regions_.density_mult(fsr);
941951
}
942952
total_external += source_regions_.external_source(fsr, g) * sigma_t;
943953
}
@@ -1247,7 +1257,8 @@ void FlatSourceDomain::set_adjoint_sources()
12471257
continue;
12481258
}
12491259
for (int g = 0; g < negroups_; g++) {
1250-
double sigma_t = sigma_t_[material * negroups_ + g] * source_regions_.density_mult(sr);
1260+
double sigma_t =
1261+
sigma_t_[material * negroups_ + g] * source_regions_.density_mult(sr);
12511262
source_regions_.external_source(sr, g) /= sigma_t;
12521263
}
12531264
}
@@ -1528,7 +1539,8 @@ SourceRegionHandle FlatSourceDomain::get_subdivided_source_region_handle(
15281539
// Divide external source term by sigma_t
15291540
if (material != C_NONE) {
15301541
for (int g = 0; g < negroups_; g++) {
1531-
double sigma_t = sigma_t_[material * negroups_ + g] * handle.density_mult();
1542+
double sigma_t =
1543+
sigma_t_[material * negroups_ + g] * handle.density_mult();
15321544
handle.external_source(g) /= sigma_t;
15331545
}
15341546
}
@@ -1611,7 +1623,8 @@ void FlatSourceDomain::apply_transport_stabilization()
16111623
// Only apply stabilization if the diagonal (in-group) scattering XS is
16121624
// negative
16131625
double sigma_s =
1614-
sigma_s_[material * negroups_ * negroups_ + g * negroups_ + g] * density_mult;
1626+
sigma_s_[material * negroups_ * negroups_ + g * negroups_ + g] *
1627+
density_mult;
16151628
if (sigma_s < 0.0) {
16161629
double sigma_t = sigma_t_[material * negroups_ + g] * density_mult;
16171630
double phi_new = source_regions_.scalar_flux_new(sr, g);

‎src/random_ray/linear_source_domain.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@ void LinearSourceDomain::update_single_neutron_source(SourceRegionHandle& srh)
6262
MomentArray flux_linear = srh.flux_moments_old(g_in);
6363

6464
// Handles for cross sections
65-
double sigma_s =
66-
sigma_s_[material * negroups_ * negroups_ + g_out * negroups_ + g_in] * density_mult;
67-
double nu_sigma_f = nu_sigma_f_[material * negroups_ + g_in] * density_mult;
65+
double sigma_s = sigma_s_[material * negroups_ * negroups_ +
66+
g_out * negroups_ + g_in] *
67+
density_mult;
68+
double nu_sigma_f =
69+
nu_sigma_f_[material * negroups_ + g_in] * density_mult;
6870
double chi = chi_[material * negroups_ + g_out];
6971

7072
// Compute source terms for flat and linear components of the flux

‎src/random_ray/random_ray.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,8 @@ void RandomRay::attenuate_flux_flat_source(
435435

436436
// MOC incoming flux attenuation + source contribution/attenuation equation
437437
for (int g = 0; g < negroups_; g++) {
438-
float sigma_t = domain_->sigma_t_[material * negroups_ + g] * srh.density_mult();
438+
float sigma_t =
439+
domain_->sigma_t_[material * negroups_ + g] * srh.density_mult();
439440
float tau = sigma_t * distance;
440441
float exponential = cjosey_exponential(tau); // exponential = 1 - exp(-tau)
441442
float new_delta_psi = (angular_flux_[g] - srh.source(g)) * exponential;
@@ -558,7 +559,8 @@ void RandomRay::attenuate_flux_linear_source(
558559
for (int g = 0; g < negroups_; g++) {
559560

560561
// Compute tau, the optical thickness of the ray segment
561-
float sigma_t = domain_->sigma_t_[material * negroups_ + g] * srh.density_mult();
562+
float sigma_t =
563+
domain_->sigma_t_[material * negroups_ + g] * srh.density_mult();
562564
float tau = sigma_t * distance;
563565

564566
// If tau is very small, set it to zero to avoid numerical issues.

‎src/random_ray/source_region.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ namespace openmc {
1111
//==============================================================================
1212
SourceRegionHandle::SourceRegionHandle(SourceRegion& sr)
1313
: negroups_(sr.scalar_flux_old_.size()), material_(&sr.material_),
14-
density_mult_(&sr.density_mult_), is_small_(&sr.is_small_), n_hits_(&sr.n_hits_),
15-
is_linear_(sr.source_gradients_.size() > 0), lock_(&sr.lock_),
16-
volume_(&sr.volume_), volume_t_(&sr.volume_t_), volume_sq_(&sr.volume_sq_),
17-
volume_sq_t_(&sr.volume_sq_t_), volume_naive_(&sr.volume_naive_),
14+
density_mult_(&sr.density_mult_), is_small_(&sr.is_small_),
15+
n_hits_(&sr.n_hits_), is_linear_(sr.source_gradients_.size() > 0),
16+
lock_(&sr.lock_), volume_(&sr.volume_), volume_t_(&sr.volume_t_),
17+
volume_sq_(&sr.volume_sq_), volume_sq_t_(&sr.volume_sq_t_),
18+
volume_naive_(&sr.volume_naive_),
1819
position_recorded_(&sr.position_recorded_),
1920
external_source_present_(&sr.external_source_present_),
2021
position_(&sr.position_), centroid_(&sr.centroid_),

0 commit comments

Comments
 (0)