Skip to content

Commit

Permalink
Addressing a couple warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
CamelliaDPG committed Apr 22, 2022
1 parent fa9a673 commit e8f1e45
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,14 @@ namespace
public:
static const FormulationChoice formulation = L2;
};
class StandardAlgorithm
{
public:
static const AlgorithmChoice algorithm = Standard;
};
// StandardAlgorithm is not actually used in our test templates: Standard is the baseline we compare against.
// We therefore comment it out here; the unused static member "algorithm" below generates compilation errors on
// some platforms (with warnings as errors turned on).
// class StandardAlgorithm
// {
// public:
// static const AlgorithmChoice algorithm = Standard;
// };
class AffineNonTensorAlgorithm
{
public:
Expand All @@ -162,11 +165,16 @@ namespace
public:
static const AlgorithmChoice algorithm = Uniform;
};
class DiagonalJacobianAlgorithm // note that DiagonalJacobian is not yet supported by getMesh()
{
public:
static const AlgorithmChoice algorithm = DiagonalJacobian;
};
// DiagonalJacobianAlgorithm is not yet used in our test templates: getMesh() does not support DiagonalJacobian yet.
// (We hope soon to add support for orthogonal extrusions in CellGeometry, which would give us those
// diagonal Jacobians in a natural way.)
// We therefore comment out the class out here; the unused static member "algorithm" below generates compilation errors on
// some platforms (with warnings as errors turned on).
// class DiagonalJacobianAlgorithm // note that DiagonalJacobian is not yet supported by getMesh()
// {
// public:
// static const AlgorithmChoice algorithm = DiagonalJacobian;
// };
class D1
{
public:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ BasisPtr<DeviceType,Scalar,Scalar> getHypercubeBasisForFormulation(FormulationCh
case Serendipity:
INTREPID2_TEST_FOR_EXCEPTION(true, std::invalid_argument, "basis family choice not yet implemented");
}


return Teuchos::null;
}

int main( int argc, char* argv[] )
Expand Down

0 comments on commit e8f1e45

Please sign in to comment.