Skip to content
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

Make basic CDI functions constexpr #1109

Merged
merged 4 commits into from
Aug 19, 2021
Merged

Make basic CDI functions constexpr #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07feb28
Make basic CDI functions constexpr
alexrlongne Aug 16, 2021
000b26c
Don't use .data() yet, requires C++17
alexrlongne Aug 17, 2021
1450907
Merge remote-tracking branch 'upstream/develop' into cdi_reorg
alexrlongne Aug 17, 2021
60200f6
Make CDI functions available on device
alexrlongne Aug 17, 2021
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
8 changes: 4 additions & 4 deletions src/cdi/CDI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ double CDI::integratePlanckSpectrum(size_t const groupIndex, double const T) {
const double upper_bound = frequencyGroupBoundaries[groupIndex];
Check(upper_bound > lower_bound);

double integral = integratePlanckSpectrum(lower_bound, upper_bound, T);
double integral = rtt_cdi::integratePlanckSpectrum(lower_bound, upper_bound, T);

Ensure(integral >= 0.0);
Ensure(integral <= 1.0);
Expand All @@ -136,7 +136,7 @@ double CDI::integratePlanckSpectrum(const double T) {
Check(upper_bound > lower_bound);

// calculate the integral
double integral = integratePlanckSpectrum(lower_bound, upper_bound, T);
double integral = rtt_cdi::integratePlanckSpectrum(lower_bound, upper_bound, T);

Ensure(integral >= 0.0 && integral <= 1.0);

Expand Down Expand Up @@ -165,7 +165,7 @@ double CDI::integrateRosselandSpectrum(size_t const groupIndex, double const T)
const double highFreq = frequencyGroupBoundaries[groupIndex];
Check(highFreq > lowFreq);

double rosseland = integrateRosselandSpectrum(lowFreq, highFreq, T);
double rosseland = rtt_cdi::integrateRosselandSpectrum(lowFreq, highFreq, T);

return rosseland;
}
Expand Down Expand Up @@ -196,7 +196,7 @@ void CDI::integrate_Rosseland_Planckian_Spectrum(const size_t groupIndex, const
Check(highFreq > lowFreq);

// Call the general frequency version
integrate_Rosseland_Planckian_Spectrum(lowFreq, highFreq, T, planck, rosseland);
rtt_cdi::integrate_Rosseland_Planckian_Spectrum(lowFreq, highFreq, T, planck, rosseland);
return;
}

Expand Down
Loading