Skip to content

Random Ray Source Region Refactor #3288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulromano merged 18 commits into from
Feb 11, 2025
Merged

Random Ray Source Region Refactor #3288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a47043d
first pass of SourceRegion refactor complete
jtramm Jan 29, 2025
4129281
refactor is compiling cleanly
jtramm Jan 29, 2025
370bc37
fixed OpenMPMutex wrapper class
jtramm Jan 30, 2025
c2b101a
fixed MPI
jtramm Jan 30, 2025
6b6128b
ran git clang-format develop
jtramm Jan 30, 2025
adecac7
put several parallel for loops back in
jtramm Jan 30, 2025
5e18159
added SourceRegionContainer class
jtramm Jan 30, 2025
aee7c19
added source_region.cpp class instead of having it all in the header
jtramm Jan 30, 2025
7ac6824
first refactor sweep complete
jtramm Jan 30, 2025
0c62980
new refactor working (though mpi not done yet)
jtramm Jan 30, 2025
c8aad40
MPI refactor complete
jtramm Jan 30, 2025
cc6e6b4
fixed issue with MPI linear sources
jtramm Jan 30, 2025
80e480a
changed sr to int64_t
jtramm Jan 30, 2025
29cdf91
continued refactor
jtramm Jan 30, 2025
6014536
removed unneeded parallel fill
jtramm Jan 30, 2025
8d1cd79
moved volume tasks into the SourceRegion object.
jtramm Jan 30, 2025
6747f60
added some comments to the source.h class defintions
jtramm Jan 31, 2025
e9066ca
ran git clang-format develop with llvm 15.0.0
jtramm Jan 31, 2025
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
Prev Previous commit
Next Next commit
changed sr to int64_t
  • Loading branch information
@jtramm
jtramm committed Jan 30, 2025
commit 80e480af58fc00539bb69d7a945c19414fbf36d6
6 changes: 3 additions & 3 deletions include/openmc/random_ray/flat_source_domain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ class FlatSourceDomain {
const vector<int32_t>& instances);
void apply_external_source_to_cell_and_children(int32_t i_cell,
Discrete* discrete, double strength_factor, int32_t target_material_id);
virtual void set_flux_to_flux_plus_source(int sr, double volume, int g);
void set_flux_to_source(int sr, int g);
virtual void set_flux_to_old_flux(int sr, int g);
virtual void set_flux_to_flux_plus_source(int64_t sr, double volume, int g);
void set_flux_to_source(int64_t sr, int g);
virtual void set_flux_to_old_flux(int64_t sr, int g);

//----------------------------------------------------------------------------
// Private data members
Expand Down
4 changes: 2 additions & 2 deletions include/openmc/random_ray/linear_source_domain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class LinearSourceDomain : public FlatSourceDomain {
protected:
//----------------------------------------------------------------------------
// Methods
void set_flux_to_flux_plus_source(int sr, double volume, int g) override;
void set_flux_to_old_flux(int sr, int g) override;
void set_flux_to_flux_plus_source(int64_t sr, double volume, int g) override;
void set_flux_to_old_flux(int64_t sr, int g) override;

}; // class LinearSourceDomain

Expand Down
94 changes: 47 additions & 47 deletions include/openmc/random_ray/source_region.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,57 +135,57 @@ class SourceRegionContainer {

//----------------------------------------------------------------------------
// Public Accessors
int& material(int sr) { return material_[sr]; }
const int& material(int sr) const { return material_[sr]; }
int& material(int64_t sr) { return material_[sr]; }
const int& material(int64_t sr) const { return material_[sr]; }

OpenMPMutex& lock(int sr) { return lock_[sr]; }
const OpenMPMutex& lock(int sr) const { return lock_[sr]; }
OpenMPMutex& lock(int64_t sr) { return lock_[sr]; }
const OpenMPMutex& lock(int64_t sr) const { return lock_[sr]; }

double& volume(int sr) { return volume_[sr]; }
const double& volume(int sr) const { return volume_[sr]; }
double& volume(int64_t sr) { return volume_[sr]; }
const double& volume(int64_t sr) const { return volume_[sr]; }

double& volume_t(int sr) { return volume_t_[sr]; }
const double& volume_t(int sr) const { return volume_t_[sr]; }
double& volume_t(int64_t sr) { return volume_t_[sr]; }
const double& volume_t(int64_t sr) const { return volume_t_[sr]; }

double& volume_naive(int sr) { return volume_naive_[sr]; }
const double& volume_naive(int sr) const { return volume_naive_[sr]; }
double& volume_naive(int64_t sr) { return volume_naive_[sr]; }
const double& volume_naive(int64_t sr) const { return volume_naive_[sr]; }

int& position_recorded(int sr) { return position_recorded_[sr]; }
const int& position_recorded(int sr) const { return position_recorded_[sr]; }
int& position_recorded(int64_t sr) { return position_recorded_[sr]; }
const int& position_recorded(int64_t sr) const { return position_recorded_[sr]; }

int& external_source_present(int sr) { return external_source_present_[sr]; }
const int& external_source_present(int sr) const
int& external_source_present(int64_t sr) { return external_source_present_[sr]; }
const int& external_source_present(int64_t sr) const
{
return external_source_present_[sr];
}

Position& position(int sr) { return position_[sr]; }
const Position& position(int sr) const { return position_[sr]; }
Position& position(int64_t sr) { return position_[sr]; }
const Position& position(int64_t sr) const { return position_[sr]; }

// Conditional field accessors (only if is_linear_)
Position& centroid(int sr) { return centroid_[sr]; }
const Position& centroid(int sr) const { return centroid_[sr]; }
Position& centroid(int64_t sr) { return centroid_[sr]; }
const Position& centroid(int64_t sr) const { return centroid_[sr]; }

Position& centroid_iteration(int sr) { return centroid_iteration_[sr]; }
const Position& centroid_iteration(int sr) const
Position& centroid_iteration(int64_t sr) { return centroid_iteration_[sr]; }
const Position& centroid_iteration(int64_t sr) const
{
return centroid_iteration_[sr];
}

Position& centroid_t(int sr) { return centroid_t_[sr]; }
const Position& centroid_t(int sr) const { return centroid_t_[sr]; }
Position& centroid_t(int64_t sr) { return centroid_t_[sr]; }
const Position& centroid_t(int64_t sr) const { return centroid_t_[sr]; }

MomentMatrix& mom_matrix(int sr) { return mom_matrix_[sr]; }
const MomentMatrix& mom_matrix(int sr) const { return mom_matrix_[sr]; }
MomentMatrix& mom_matrix(int64_t sr) { return mom_matrix_[sr]; }
const MomentMatrix& mom_matrix(int64_t sr) const { return mom_matrix_[sr]; }

MomentMatrix& mom_matrix_t(int sr) { return mom_matrix_t_[sr]; }
const MomentMatrix& mom_matrix_t(int sr) const { return mom_matrix_t_[sr]; }
MomentMatrix& mom_matrix_t(int64_t sr) { return mom_matrix_t_[sr]; }
const MomentMatrix& mom_matrix_t(int64_t sr) const { return mom_matrix_t_[sr]; }

MomentArray& source_gradients(int sr, int g)
MomentArray& source_gradients(int64_t sr, int g)
{
return source_gradients_[index(sr, g)];
}
const MomentArray& source_gradients(int sr, int g) const
const MomentArray& source_gradients(int64_t sr, int g) const
{
return source_gradients_[index(sr, g)];
}
Expand All @@ -195,11 +195,11 @@ class SourceRegionContainer {
return source_gradients_[se];
}

MomentArray& flux_moments_old(int sr, int g)
MomentArray& flux_moments_old(int64_t sr, int g)
{
return flux_moments_old_[index(sr, g)];
}
const MomentArray& flux_moments_old(int sr, int g) const
const MomentArray& flux_moments_old(int64_t sr, int g) const
{
return flux_moments_old_[index(sr, g)];
}
Expand All @@ -209,11 +209,11 @@ class SourceRegionContainer {
return flux_moments_old_[se];
}

MomentArray& flux_moments_new(int sr, int g)
MomentArray& flux_moments_new(int64_t sr, int g)
{
return flux_moments_new_[index(sr, g)];
}
const MomentArray& flux_moments_new(int sr, int g) const
const MomentArray& flux_moments_new(int64_t sr, int g) const
{
return flux_moments_new_[index(sr, g)];
}
Expand All @@ -223,11 +223,11 @@ class SourceRegionContainer {
return flux_moments_new_[se];
}

MomentArray& flux_moments_t(int sr, int g)
MomentArray& flux_moments_t(int64_t sr, int g)
{
return flux_moments_t_[index(sr, g)];
}
const MomentArray& flux_moments_t(int sr, int g) const
const MomentArray& flux_moments_t(int64_t sr, int g) const
{
return flux_moments_t_[index(sr, g)];
}
Expand All @@ -237,11 +237,11 @@ class SourceRegionContainer {
return flux_moments_t_[se];
}

double& scalar_flux_old(int sr, int g)
double& scalar_flux_old(int64_t sr, int g)
{
return scalar_flux_old_[index(sr, g)];
}
const double& scalar_flux_old(int sr, int g) const
const double& scalar_flux_old(int64_t sr, int g) const
{
return scalar_flux_old_[index(sr, g)];
}
Expand All @@ -251,11 +251,11 @@ class SourceRegionContainer {
return scalar_flux_old_[se];
}

double& scalar_flux_new(int sr, int g)
double& scalar_flux_new(int64_t sr, int g)
{
return scalar_flux_new_[index(sr, g)];
}
const double& scalar_flux_new(int sr, int g) const
const double& scalar_flux_new(int64_t sr, int g) const
{
return scalar_flux_new_[index(sr, g)];
}
Expand All @@ -265,11 +265,11 @@ class SourceRegionContainer {
return scalar_flux_new_[se];
}

double& scalar_flux_final(int sr, int g)
double& scalar_flux_final(int64_t sr, int g)
{
return scalar_flux_final_[index(sr, g)];
}
const double& scalar_flux_final(int sr, int g) const
const double& scalar_flux_final(int64_t sr, int g) const
{
return scalar_flux_final_[index(sr, g)];
}
Expand All @@ -279,16 +279,16 @@ class SourceRegionContainer {
return scalar_flux_final_[se];
}

float& source(int sr, int g) { return source_[index(sr, g)]; }
const float& source(int sr, int g) const { return source_[index(sr, g)]; }
float& source(int64_t sr, int g) { return source_[index(sr, g)]; }
const float& source(int64_t sr, int g) const { return source_[index(sr, g)]; }
float& source(int64_t se) { return source_[se]; }
const float& source(int64_t se) const { return source_[se]; }

float& external_source(int sr, int g)
float& external_source(int64_t sr, int g)
{
return external_source_[index(sr, g)];
}
const float& external_source(int sr, int g) const
const float& external_source(int64_t sr, int g) const
{
return external_source_[index(sr, g)];
}
Expand All @@ -298,11 +298,11 @@ class SourceRegionContainer {
return external_source_[se];
}

vector<TallyTask>& tally_task(int sr, int g)
vector<TallyTask>& tally_task(int64_t sr, int g)
{
return tally_task_[index(sr, g)];
}
const vector<TallyTask>& tally_task(int sr, int g) const
const vector<TallyTask>& tally_task(int64_t sr, int g) const
{
return tally_task_[index(sr, g)];
}
Expand Down Expand Up @@ -363,7 +363,7 @@ class SourceRegionContainer {
// Private Methods

// Helper function for indexing
inline int index(int sr, int g) const { return sr * negroups_ + g; }
inline int index(int64_t sr, int g) const { return sr * negroups_ + g; }
};

} // namespace openmc
Expand Down
Loading