@@ -71,26 +71,25 @@ PALACE_JSON_SERIALIZE_ENUM(ProblemType, {{ProblemType::DRIVEN, "Driven"},
71
71
72
72
// Helper for converting string keys to enum for EigenSolverBackend.
73
73
PALACE_JSON_SERIALIZE_ENUM (EigenSolverBackend, {{EigenSolverBackend::DEFAULT, " Default" },
74
- {EigenSolverBackend::SLEPC, " SLEPc" },
75
- {EigenSolverBackend::ARPACK, " ARPACK" }})
74
+ {EigenSolverBackend::SLEPC, " SLEPc" },
75
+ {EigenSolverBackend::ARPACK, " ARPACK" }})
76
76
77
- // Helper for converting string keys to enum for SurfaceFluxPostType .
77
+ // Helper for converting string keys to enum for SurfaceFlux .
78
78
PALACE_JSON_SERIALIZE_ENUM (SurfaceFlux, {{SurfaceFlux::ELECTRIC, " Electric" },
79
- {SurfaceFlux::MAGNETIC, " Magnetic" },
80
- {SurfaceFlux::POWER, " Power" }})
79
+ {SurfaceFlux::MAGNETIC, " Magnetic" },
80
+ {SurfaceFlux::POWER, " Power" }})
81
81
82
82
// Helper for converting string keys to enum for InterfaceDielectric.
83
- PALACE_JSON_SERIALIZE_ENUM (InterfaceDielectric,
84
- {{InterfaceDielectric::DEFAULT, " Default" },
85
- {InterfaceDielectric::MA, " MA" },
86
- {InterfaceDielectric::MS, " MS" },
87
- {InterfaceDielectric::SA, " SA" }})
83
+ PALACE_JSON_SERIALIZE_ENUM (InterfaceDielectric, {{InterfaceDielectric::DEFAULT, " Default" },
84
+ {InterfaceDielectric::MA, " MA" },
85
+ {InterfaceDielectric::MS, " MS" },
86
+ {InterfaceDielectric::SA, " SA" }})
88
87
89
88
// Helper for converting string keys to enum for FrequencySampling.
90
89
PALACE_JSON_SERIALIZE_ENUM (FrequencySampling, {{FrequencySampling::DEFAULT, " Default" },
91
- {FrequencySampling::LINEAR, " Linear" },
92
- {FrequencySampling::LOG, " Log" },
93
- {FrequencySampling::POINT, " Point" }})
90
+ {FrequencySampling::LINEAR, " Linear" },
91
+ {FrequencySampling::LOG, " Log" },
92
+ {FrequencySampling::POINT, " Point" }})
94
93
95
94
// Helper for converting string keys to enum for TimeSteppingScheme and Excitation.
96
95
PALACE_JSON_SERIALIZE_ENUM (TimeSteppingScheme,
@@ -109,15 +108,14 @@ PALACE_JSON_SERIALIZE_ENUM(Excitation,
109
108
110
109
// Helper for converting string keys to enum for LinearSolver, KrylovSolver, and
111
110
// MultigridCoarsening
112
- PALACE_JSON_SERIALIZE_ENUM (LinearSolver,
113
- {{LinearSolver::DEFAULT, " Default" },
114
- {LinearSolver::AMS, " AMS" },
115
- {LinearSolver::BOOMER_AMG, " BoomerAMG" },
116
- {LinearSolver::MUMPS, " MUMPS" },
117
- {LinearSolver::SUPERLU, " SuperLU" },
118
- {LinearSolver::STRUMPACK, " STRUMPACK" },
119
- {LinearSolver::STRUMPACK_MP, " STRUMPACK-MP" },
120
- {LinearSolver::JACOBI, " Jacobi" }})
111
+ PALACE_JSON_SERIALIZE_ENUM (LinearSolver, {{LinearSolver::DEFAULT, " Default" },
112
+ {LinearSolver::AMS, " AMS" },
113
+ {LinearSolver::BOOMER_AMG, " BoomerAMG" },
114
+ {LinearSolver::MUMPS, " MUMPS" },
115
+ {LinearSolver::SUPERLU, " SuperLU" },
116
+ {LinearSolver::STRUMPACK, " STRUMPACK" },
117
+ {LinearSolver::STRUMPACK_MP, " STRUMPACK-MP" },
118
+ {LinearSolver::JACOBI, " Jacobi" }})
121
119
PALACE_JSON_SERIALIZE_ENUM (KrylovSolver, {{KrylovSolver::DEFAULT, " Default" },
122
120
{KrylovSolver::CG, " CG" },
123
121
{KrylovSolver::MINRES, " MINRES" },
@@ -1268,7 +1266,7 @@ void WavePortBoundaryData::SetUp(json &boundaries)
1268
1266
MFEM_VERIFY (data.mode_idx > 0 ,
1269
1267
" \" WavePort\" boundary \" Mode\" must be positive (1-based)!" );
1270
1268
data.d_offset = it->value (" Offset" , data.d_offset );
1271
- data.eigen_type = it->value (" SolverType" , data.eigen_type );
1269
+ data.eigen_solver = it->value (" SolverType" , data.eigen_solver );
1272
1270
1273
1271
data.excitation = ParsePortExcitation (it, data.excitation );
1274
1272
data.active = it->value (" Active" , data.active );
@@ -1300,7 +1298,7 @@ void WavePortBoundaryData::SetUp(json &boundaries)
1300
1298
std::cout << " Attributes: " << data.attributes << ' \n ' ;
1301
1299
std::cout << " Mode: " << data.mode_idx << ' \n ' ;
1302
1300
std::cout << " Offset: " << data.d_offset << ' \n ' ;
1303
- std::cout << " SolverType: " << data.eigen_type << ' \n ' ;
1301
+ std::cout << " SolverType: " << data.eigen_solver << ' \n ' ;
1304
1302
std::cout << " Excitation: " << data.excitation << ' \n ' ;
1305
1303
std::cout << " Active: " << data.active << ' \n ' ;
1306
1304
std::cout << " MaxIts: " << data.ksp_max_its << ' \n ' ;
@@ -2113,15 +2111,15 @@ void LinearSolverData::SetUp(json &solver)
2113
2111
return ;
2114
2112
}
2115
2113
type = linear->value (" Type" , type);
2116
- ksp_type = linear->value (" KSPType" , ksp_type );
2114
+ krylov_solver = linear->value (" KSPType" , krylov_solver );
2117
2115
tol = linear->value (" Tol" , tol);
2118
2116
max_it = linear->value (" MaxIts" , max_it);
2119
2117
max_size = linear->value (" MaxSize" , max_size);
2120
2118
initial_guess = linear->value (" InitialGuess" , initial_guess);
2121
2119
2122
2120
// Options related to multigrid.
2123
2121
mg_max_levels = linear->value (" MGMaxLevels" , mg_max_levels);
2124
- mg_coarsen_type = linear->value (" MGCoarsenType" , mg_coarsen_type );
2122
+ mg_coarsening = linear->value (" MGCoarsenType" , mg_coarsening );
2125
2123
mg_use_mesh = linear->value (" MGUseMesh" , mg_use_mesh);
2126
2124
mg_cycle_it = linear->value (" MGCycleIts" , mg_cycle_it);
2127
2125
mg_smooth_aux = linear->value (" MGAuxiliarySmoother" , mg_smooth_aux);
@@ -2135,8 +2133,8 @@ void LinearSolverData::SetUp(json &solver)
2135
2133
pc_mat_real = linear->value (" PCMatReal" , pc_mat_real);
2136
2134
pc_mat_shifted = linear->value (" PCMatShifted" , pc_mat_shifted);
2137
2135
complex_coarse_solve = linear->value (" ComplexCoarseSolve" , complex_coarse_solve);
2138
- pc_side_type = linear->value (" PCSide" , pc_side_type );
2139
- sym_fact_type = linear->value (" ColumnOrdering" , sym_fact_type );
2136
+ pc_side = linear->value (" PCSide" , pc_side );
2137
+ sym_factorization = linear->value (" ColumnOrdering" , sym_factorization );
2140
2138
strumpack_compression_type =
2141
2139
linear->value (" STRUMPACKCompressionType" , strumpack_compression_type);
2142
2140
strumpack_lr_tol = linear->value (" STRUMPACKCompressionTol" , strumpack_lr_tol);
@@ -2203,14 +2201,14 @@ void LinearSolverData::SetUp(json &solver)
2203
2201
if constexpr (JSON_DEBUG)
2204
2202
{
2205
2203
std::cout << " Type: " << type << ' \n ' ;
2206
- std::cout << " KSPType: " << ksp_type << ' \n ' ;
2204
+ std::cout << " KSPType: " << krylov_solver << ' \n ' ;
2207
2205
std::cout << " Tol: " << tol << ' \n ' ;
2208
2206
std::cout << " MaxIts: " << max_it << ' \n ' ;
2209
2207
std::cout << " MaxSize: " << max_size << ' \n ' ;
2210
2208
std::cout << " InitialGuess: " << initial_guess << ' \n ' ;
2211
2209
2212
2210
std::cout << " MGMaxLevels: " << mg_max_levels << ' \n ' ;
2213
- std::cout << " MGCoarsenType: " << mg_coarsen_type << ' \n ' ;
2211
+ std::cout << " MGCoarsenType: " << mg_coarsening << ' \n ' ;
2214
2212
std::cout << " MGUseMesh: " << mg_use_mesh << ' \n ' ;
2215
2213
std::cout << " MGCycleIts: " << mg_cycle_it << ' \n ' ;
2216
2214
std::cout << " MGAuxiliarySmoother: " << mg_smooth_aux << ' \n ' ;
@@ -2223,8 +2221,8 @@ void LinearSolverData::SetUp(json &solver)
2223
2221
std::cout << " PCMatReal: " << pc_mat_real << ' \n ' ;
2224
2222
std::cout << " PCMatShifted: " << pc_mat_shifted << ' \n ' ;
2225
2223
std::cout << " ComplexCoarseSolve: " << complex_coarse_solve << ' \n ' ;
2226
- std::cout << " PCSide: " << pc_side_type << ' \n ' ;
2227
- std::cout << " ColumnOrdering: " << sym_fact_type << ' \n ' ;
2224
+ std::cout << " PCSide: " << pc_side << ' \n ' ;
2225
+ std::cout << " ColumnOrdering: " << sym_factorization << ' \n ' ;
2228
2226
std::cout << " STRUMPACKCompressionType: " << strumpack_compression_type << ' \n ' ;
2229
2227
std::cout << " STRUMPACKCompressionTol: " << strumpack_lr_tol << ' \n ' ;
2230
2228
std::cout << " STRUMPACKLossyPrecision: " << strumpack_lossy_precision << ' \n ' ;
0 commit comments