Skip to content

Commit 7d11bbe

Browse files
committed
Merge branch 'feature_libROM' of https://github.com/su2code/SU2 into feature_libROM
2 parents bd9e5e9 + 04a8dfb commit 7d11bbe

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Common/include/option_structure.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2232,7 +2232,7 @@ enum class POD_KIND {
22322232
STATIC, /*!< \brief Use static SVD for POD basis generation. */
22332233
INCREMENTAL, /*!< \brief Use incremental SVD for POD basis generation. */
22342234
};
2235-
static const MapType<string, POD_KIND> POD_Map = {
2235+
static const MapType<std::string, POD_KIND> POD_Map = {
22362236
MakePair("STATIC_POD", POD_KIND::STATIC)
22372237
MakePair("INCREMENTAL_POD", POD_KIND::INCREMENTAL)
22382238
};

SU2_CFD/src/solvers/CSolver.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4224,7 +4224,7 @@ void CSolver::SavelibROM(CSolver** solver, CGeometry *geometry, CConfig *config,
42244224
if (!u_basis_generator) {
42254225

42264226
/*--- Define SVD basis generator ---*/
4227-
int timesteps = (int)(nTimeIter - TimeIter);
4227+
auto timesteps = static_cast<int>(nTimeIter - TimeIter);
42284228
CAROM::Options svd_options = CAROM::Options(dim, timesteps, -1,
42294229
false, true).setMaxBasisDimension(int(maxBasisDim));
42304230

@@ -4267,9 +4267,9 @@ void CSolver::SavelibROM(CSolver** solver, CGeometry *geometry, CConfig *config,
42674267

42684268
if (unsteady && (TimeIter % save_freq == 0)) {
42694269
// give solution and time steps to libROM:
4270-
double dt = config->GetDelta_UnstTime();
4271-
double t = config->GetCurrent_UnstTime();
4272-
u_basis_generator->takeSample(const_cast<double*>(base_nodes->GetSolution().data()), t, dt);
4270+
su2double dt = config->GetDelta_UnstTime();
4271+
su2double t = config->GetCurrent_UnstTime();
4272+
u_basis_generator->takeSample(const_cast<su2double*>(base_nodes->GetSolution().data()), t, dt);
42734273
}
42744274

42754275
/*--- End collection of data and save POD ---*/
@@ -4278,9 +4278,9 @@ void CSolver::SavelibROM(CSolver** solver, CGeometry *geometry, CConfig *config,
42784278

42794279
if (!unsteady) {
42804280
// dt is different for each node, so just use a placeholder dt
4281-
double dt = base_nodes->GetDelta_Time(0);
4282-
double t = dt*TimeIter;
4283-
u_basis_generator->takeSample(const_cast<double*>(base_nodes->GetSolution().data()), t, dt);
4281+
su2double dt = base_nodes->GetDelta_Time(0);
4282+
su2double t = dt*TimeIter;
4283+
u_basis_generator->takeSample(const_cast<su2double*>(base_nodes->GetSolution().data()), t, dt);
42844284
}
42854285

42864286
if (config->GetKind_PODBasis() == POD_KIND::STATIC) {

0 commit comments

Comments
 (0)