Skip to content

Commit 6048f6b

Browse files
committed
Fix some warnings
1 parent 0657041 commit 6048f6b

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

palace/drivers/drivensolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ DrivenSolver::Solve(const std::vector<std::unique_ptr<Mesh>> &mesh) const
4141
auto omega = iodata.solver.driven.sample_f;
4242
if (iodata.solver.driven.rst > 0)
4343
{
44-
MFEM_VERIFY(iodata.solver.driven.rst <= omega.size(),
44+
MFEM_VERIFY(iodata.solver.driven.rst <= static_cast<int>(omega.size()),
4545
"\"Restart\": (" << iodata.solver.driven.rst
4646
<< ") is greater than the number of samples ("
4747
<< omega.size() << ")!");

palace/drivers/electrostaticsolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void ElectrostaticSolver::PostprocessTerminals(
163163
output.table["i"] << idx2;
164164

165165
auto &col = output.table[format("i2{}", idx2)];
166-
for (int i = 0; i < terminal_sources.size(); i++)
166+
for (std::size_t i = 0; i < terminal_sources.size(); i++)
167167
{
168168
col << mat(i, j) * scale;
169169
}

palace/drivers/magnetostaticsolver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void MagnetostaticSolver::PostprocessTerminals(
168168
output.table["i"] << idx2;
169169

170170
auto &col = output.table[format("i2{}", idx2)];
171-
for (int i = 0; i < surf_j_op.Size(); i++)
171+
for (std::size_t i = 0; i < surf_j_op.Size(); i++)
172172
{
173173
col << mat(i, j) * scale;
174174
}

palace/models/materialoperator.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ class MaterialOperator
3939
void SetUpMaterialProperties(const IoData &iodata, const mfem::ParMesh &mesh);
4040
void SetUpFloquetWaveVector(const IoData &iodata, const mfem::ParMesh &mesh);
4141

42-
const auto AttrToMat(int attr) const
42+
auto AttrToMat(int attr) const
4343
{
4444
const auto &loc_attr = mesh.GetCeedAttributes();
4545
MFEM_ASSERT(loc_attr.find(attr) != loc_attr.end(),
4646
"Missing libCEED domain attribute for attribute " << attr << "!");
4747
return attr_mat[loc_attr.at(attr) - 1];
4848
}
4949

50-
const auto Wrap(const mfem::DenseTensor &data, int attr) const
50+
auto Wrap(const mfem::DenseTensor &data, int attr) const
5151
{
5252
const int k = AttrToMat(attr);
5353
return mfem::DenseMatrix(const_cast<double *>(data.GetData(k)), data.SizeI(),
@@ -59,17 +59,17 @@ class MaterialOperator
5959

6060
int SpaceDimension() const { return mat_muinv.SizeI(); }
6161

62-
const auto GetInvPermeability(int attr) const { return Wrap(mat_muinv, attr); }
63-
const auto GetPermittivityReal(int attr) const { return Wrap(mat_epsilon, attr); }
64-
const auto GetPermittivityImag(int attr) const { return Wrap(mat_epsilon_imag, attr); }
65-
const auto GetPermittivityAbs(int attr) const { return Wrap(mat_epsilon_abs, attr); }
66-
const auto GetInvImpedance(int attr) const { return Wrap(mat_invz0, attr); }
67-
const auto GetLightSpeed(int attr) const { return Wrap(mat_c0, attr); }
68-
const auto GetConductivity(int attr) const { return Wrap(mat_sigma, attr); }
69-
const auto GetInvLondonDepth(int attr) const { return Wrap(mat_invLondon, attr); }
70-
const auto GetFloquetCurl(int attr) const { return Wrap(mat_muinvkx, attr); }
71-
const auto GetFloquetMass(int attr) const { return Wrap(mat_kxTmuinvkx, attr); }
72-
const auto GetFloquetCross(int attr) const { return Wrap(mat_kx, attr); }
62+
auto GetInvPermeability(int attr) const { return Wrap(mat_muinv, attr); }
63+
auto GetPermittivityReal(int attr) const { return Wrap(mat_epsilon, attr); }
64+
auto GetPermittivityImag(int attr) const { return Wrap(mat_epsilon_imag, attr); }
65+
auto GetPermittivityAbs(int attr) const { return Wrap(mat_epsilon_abs, attr); }
66+
auto GetInvImpedance(int attr) const { return Wrap(mat_invz0, attr); }
67+
auto GetLightSpeed(int attr) const { return Wrap(mat_c0, attr); }
68+
auto GetConductivity(int attr) const { return Wrap(mat_sigma, attr); }
69+
auto GetInvLondonDepth(int attr) const { return Wrap(mat_invLondon, attr); }
70+
auto GetFloquetCurl(int attr) const { return Wrap(mat_muinvkx, attr); }
71+
auto GetFloquetMass(int attr) const { return Wrap(mat_kxTmuinvkx, attr); }
72+
auto GetFloquetCross(int attr) const { return Wrap(mat_kx, attr); }
7373

7474
auto GetLightSpeedMin(int attr) const { return mat_c0_min[AttrToMat(attr)]; }
7575
auto GetLightSpeedMax(int attr) const { return mat_c0_max[AttrToMat(attr)]; }

palace/utils/geodata.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ inline double GetDistanceFromPoint(const mfem::ParMesh &mesh, int attr, bool bdr
187187
mfem::Array<int> marker(bdr ? mesh.bdr_attributes.Max() : mesh.attributes.Max());
188188
marker = 0;
189189
marker[attr - 1] = 1;
190-
return GetDistanceFromPoint(mesh, marker, bdr, dir);
190+
return GetDistanceFromPoint(mesh, marker, bdr, dir, max);
191191
}
192192

193193
// Helper function to compute the average surface normal for all elements with the given

0 commit comments

Comments
 (0)