Skip to content

Improve code compilation #279

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
EmilyBourne merged 2 commits into from
May 20, 2026
Merged

Improve code compilation #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbfbc9d
Improve code compilation
julianlitz May 19, 2026
90862d7
Fix
julianlitz May 19, 2026
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
4 changes: 3 additions & 1 deletion include/ConfigParser/config_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
#include "../../include/PolarGrid/polargrid.h"
#include "../../include/GMGPolar/test_cases.h"
#include "../../include/GMGPolar/igmgpolar.h"
#include "../../include/GMGPolar/gmgpolar.h"
#include "test_selection.h"

namespace gmgpolar
{

template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
class GMGPolar;

class ConfigParser
{
public:
Expand Down
3 changes: 1 addition & 2 deletions scripts/tutorial/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,9 @@ fi

export OMP_NUM_THREADS=$maxOpenMPThreads

"$GMGPOLAR_EXEC" \
"$GMGPOLAR_EXEC" --kokkos-threads $maxOpenMPThreads \
--verbose $verbose \
--paraview $paraview \
--kokkos-threads $maxOpenMPThreads \
--stencilDistributionMethod $stencilDistributionMethod \
--cacheDensityProfileCoefficients $cacheDensityProfileCoefficients \
--cacheDomainGeometry $cacheDomainGeometry \
Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ set(INTERPOLATION_SOURCES
set(CONFIG_PARSER_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/ConfigParser/config_parser.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ConfigParser/select_test_case.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ConfigParser/select_solver_circular.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ConfigParser/select_solver_shafranov.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ConfigParser/select_solver_czarny.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ConfigParser/select_solver_culham.cpp
)

# Create the main library
Expand Down
13 changes: 12 additions & 1 deletion src/ConfigParser/config_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,19 @@ bool ConfigParser::parse(int argc, char* argv[])
{

if (argc != 0) {
// Filter out Kokkos arguments before cmdline parser sees them
std::vector<char*> filtered_argv;
for (int i = 0; i < argc; ++i) {
std::string arg(argv[i]);
if (arg.rfind("--kokkos-", 0) == 0 || arg.rfind("--kokkos_", 0) == 0) {
continue;
}
filtered_argv.push_back(argv[i]);
}
int filtered_argc = static_cast<int>(filtered_argv.size());

try {
parser_.parse_check(argc, argv);
parser_.parse_check(filtered_argc, filtered_argv.data());
}
catch (const cmdline::cmdline_error& parse_error) {
std::cerr << "Error: " << parse_error.what() << std::endl;
Expand Down
243 changes: 243 additions & 0 deletions src/ConfigParser/select_solver_circular.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,243 @@
#include "../include/ConfigParser/config_parser.h"
#include "../include/GMGPolar/gmgpolar.h"

using namespace gmgpolar;

template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
void ConfigParser::solve(GMGPolar<DomainGeometry, DensityProfileCoefficients>& solver) const
{
if constexpr (std::is_same_v<DomainGeometry, CircularGeometry>) {

switch (problem_type_) {

/* ------------------------------------------------------------------ */
case ProblemType::CARTESIAN_R2: {
CartesianR2_Boundary_CircularGeometry bc(Rmax_);
switch (alpha_type_) {
case AlphaCoeff::POISSON: {
CartesianR2_Poisson_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case AlphaCoeff::SONNENDRUCKER:
switch (beta_type_) {
case BetaCoeff::ZERO: {
CartesianR2_Sonnendrucker_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
CartesianR2_SonnendruckerGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
case AlphaCoeff::ZONI:
switch (beta_type_) {
case BetaCoeff::ZERO: {
CartesianR2_Zoni_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
CartesianR2_ZoniGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
case AlphaCoeff::ZONI_SHIFTED:
switch (beta_type_) {
case BetaCoeff::ZERO: {
CartesianR2_ZoniShifted_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
CartesianR2_ZoniShiftedGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
default:
throw std::runtime_error("Invalid alpha.\n");
}
break;
}

/* ------------------------------------------------------------------ */
case ProblemType::CARTESIAN_R6: {
CartesianR6_Boundary_CircularGeometry bc(Rmax_);
switch (alpha_type_) {
case AlphaCoeff::POISSON: {
CartesianR6_Poisson_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case AlphaCoeff::SONNENDRUCKER:
switch (beta_type_) {
case BetaCoeff::ZERO: {
CartesianR6_Sonnendrucker_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
CartesianR6_SonnendruckerGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
case AlphaCoeff::ZONI:
switch (beta_type_) {
case BetaCoeff::ZERO: {
CartesianR6_Zoni_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
CartesianR6_ZoniGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
case AlphaCoeff::ZONI_SHIFTED:
switch (beta_type_) {
case BetaCoeff::ZERO: {
CartesianR6_ZoniShifted_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
CartesianR6_ZoniShiftedGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
default:
throw std::runtime_error("Invalid alpha.\n");
}
break;
}

/* ------------------------------------------------------------------ */
case ProblemType::POLAR_R6: {
PolarR6_Boundary_CircularGeometry bc(Rmax_);
switch (alpha_type_) {
case AlphaCoeff::POISSON: {
PolarR6_Poisson_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case AlphaCoeff::SONNENDRUCKER:
switch (beta_type_) {
case BetaCoeff::ZERO: {
PolarR6_Sonnendrucker_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
PolarR6_SonnendruckerGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
case AlphaCoeff::ZONI:
switch (beta_type_) {
case BetaCoeff::ZERO: {
PolarR6_Zoni_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
PolarR6_ZoniGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
case AlphaCoeff::ZONI_SHIFTED:
switch (beta_type_) {
case BetaCoeff::ZERO: {
PolarR6_ZoniShifted_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
case BetaCoeff::ALPHA_INVERSE: {
PolarR6_ZoniShiftedGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta.\n");
}
break;
default:
throw std::runtime_error("Invalid alpha.\n");
}
break;
}

/* ------------------------------------------------------------------ */
case ProblemType::REFINED_RADIUS: {
Refined_Boundary_CircularGeometry bc(Rmax_);
switch (alpha_type_) {
case AlphaCoeff::ZONI_SHIFTED:
switch (beta_type_) {
case BetaCoeff::ALPHA_INVERSE: {
Refined_ZoniShiftedGyro_CircularGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta for configuration.\n");
}
break;
default:
throw std::runtime_error("Invalid alpha for configuration.\n");
}
break;
}

default:
throw std::runtime_error("Invalid problem.\n");
}
}
}

// Explicit instantiations — CircularGeometry for all coefficient types
template void
ConfigParser::solve<CircularGeometry, PoissonCoefficients>(GMGPolar<CircularGeometry, PoissonCoefficients>&) const;
template void ConfigParser::solve<CircularGeometry, SonnendruckerCoefficients>(
GMGPolar<CircularGeometry, SonnendruckerCoefficients>&) const;
template void ConfigParser::solve<CircularGeometry, SonnendruckerGyroCoefficients>(
GMGPolar<CircularGeometry, SonnendruckerGyroCoefficients>&) const;
template void
ConfigParser::solve<CircularGeometry, ZoniCoefficients>(GMGPolar<CircularGeometry, ZoniCoefficients>&) const;
template void
ConfigParser::solve<CircularGeometry, ZoniGyroCoefficients>(GMGPolar<CircularGeometry, ZoniGyroCoefficients>&) const;
template void ConfigParser::solve<CircularGeometry, ZoniShiftedCoefficients>(
GMGPolar<CircularGeometry, ZoniShiftedCoefficients>&) const;
template void ConfigParser::solve<CircularGeometry, ZoniShiftedGyroCoefficients>(
GMGPolar<CircularGeometry, ZoniShiftedGyroCoefficients>&) const;
78 changes: 78 additions & 0 deletions src/ConfigParser/select_solver_culham.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
#include "../include/ConfigParser/config_parser.h"
#include "../include/GMGPolar/gmgpolar.h"

using namespace gmgpolar;

template <concepts::DomainGeometry DomainGeometry, concepts::DensityProfileCoefficients DensityProfileCoefficients>
void ConfigParser::solve(GMGPolar<DomainGeometry, DensityProfileCoefficients>& solver) const
{
if constexpr (std::is_same_v<DomainGeometry, CulhamGeometry>) {

switch (problem_type_) {

/* ------------------------------------------------------------------ */
/* Culham only supports POLAR_R6 and REFINED_RADIUS. */
/* CARTESIAN_R2 and CARTESIAN_R6 are not defined for this geometry. */
/* ------------------------------------------------------------------ */

case ProblemType::POLAR_R6: {
PolarR6_Boundary_CulhamGeometry bc(Rmax_);
switch (alpha_type_) {
case AlphaCoeff::ZONI_SHIFTED:
switch (beta_type_) {
case BetaCoeff::ALPHA_INVERSE: {
PolarR6_ZoniShiftedGyro_CulhamGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta for configuration.\n");
}
break;
default:
throw std::runtime_error("Invalid alpha for configuration.\n");
}
break;
}

/* ------------------------------------------------------------------ */
case ProblemType::REFINED_RADIUS: {
Refined_Boundary_CulhamGeometry bc(Rmax_);
switch (alpha_type_) {
case AlphaCoeff::ZONI_SHIFTED:
switch (beta_type_) {
case BetaCoeff::ALPHA_INVERSE: {
Refined_ZoniShiftedGyro_CulhamGeometry src(grid_, Rmax_);
solver.solve(bc, src);
break;
}
default:
throw std::runtime_error("Invalid beta for configuration.\n");
}
break;
default:
throw std::runtime_error("Invalid alpha for configuration.\n");
}
break;
}

default:
throw std::runtime_error("Invalid geometry for configuration.\n");
}
}
}

// Explicit instantiations — CulhamGeometry for all coefficient types
template void
ConfigParser::solve<CulhamGeometry, PoissonCoefficients>(GMGPolar<CulhamGeometry, PoissonCoefficients>&) const;
template void ConfigParser::solve<CulhamGeometry, SonnendruckerCoefficients>(
GMGPolar<CulhamGeometry, SonnendruckerCoefficients>&) const;
template void ConfigParser::solve<CulhamGeometry, SonnendruckerGyroCoefficients>(
GMGPolar<CulhamGeometry, SonnendruckerGyroCoefficients>&) const;
template void ConfigParser::solve<CulhamGeometry, ZoniCoefficients>(GMGPolar<CulhamGeometry, ZoniCoefficients>&) const;
template void
ConfigParser::solve<CulhamGeometry, ZoniGyroCoefficients>(GMGPolar<CulhamGeometry, ZoniGyroCoefficients>&) const;
template void
ConfigParser::solve<CulhamGeometry, ZoniShiftedCoefficients>(GMGPolar<CulhamGeometry, ZoniShiftedCoefficients>&) const;
template void ConfigParser::solve<CulhamGeometry, ZoniShiftedGyroCoefficients>(
GMGPolar<CulhamGeometry, ZoniShiftedGyroCoefficients>&) const;
Loading
Loading