From: Wolfgang Bangerth Date: Mon, 13 May 2024 20:55:32 +0000 (-0600) Subject: Remove unnecessary 'typename' keywords. X-Git-Tag: v9.6.0-rc1~259^2~4 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40a5a0f5d65e4b3748ac08246d7f3ec42a8a1b41;p=dealii.git Remove unnecessary 'typename' keywords. --- diff --git a/examples/step-39/step-39.cc b/examples/step-39/step-39.cc index 743856ec11..37f663bd1f 100644 --- a/examples/step-39/step-39.cc +++ b/examples/step-39/step-39.cc @@ -94,15 +94,14 @@ namespace Step39 class MatrixIntegrator : public MeshWorker::LocalIntegrator { public: - void cell(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void - boundary(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void face(MeshWorker::DoFInfo &dinfo1, - MeshWorker::DoFInfo &dinfo2, - typename MeshWorker::IntegrationInfo &info1, - typename MeshWorker::IntegrationInfo &info2) const override; + void cell(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void boundary(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void face(MeshWorker::DoFInfo &dinfo1, + MeshWorker::DoFInfo &dinfo2, + MeshWorker::IntegrationInfo &info1, + MeshWorker::IntegrationInfo &info2) const override; }; @@ -147,9 +146,8 @@ namespace Step39 template - void MatrixIntegrator::cell( - MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const + void MatrixIntegrator::cell(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const { FullMatrix &M = dinfo.matrix(0, false).matrix; @@ -221,11 +219,11 @@ namespace Step39 // Interior faces use the interior penalty method: template - void MatrixIntegrator::face( - MeshWorker::DoFInfo &dinfo1, - MeshWorker::DoFInfo &dinfo2, - typename MeshWorker::IntegrationInfo &info1, - typename MeshWorker::IntegrationInfo &info2) const + void + MatrixIntegrator::face(MeshWorker::DoFInfo &dinfo1, + MeshWorker::DoFInfo &dinfo2, + MeshWorker::IntegrationInfo &info1, + MeshWorker::IntegrationInfo &info2) const { const FEValuesBase &fe_face_values_1 = info1.fe_values(0); const FEValuesBase &fe_face_values_2 = info2.fe_values(0); @@ -306,29 +304,27 @@ namespace Step39 class RHSIntegrator : public MeshWorker::LocalIntegrator { public: - void cell(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void - boundary(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void face(MeshWorker::DoFInfo &dinfo1, - MeshWorker::DoFInfo &dinfo2, - typename MeshWorker::IntegrationInfo &info1, - typename MeshWorker::IntegrationInfo &info2) const override; + void cell(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void boundary(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void face(MeshWorker::DoFInfo &dinfo1, + MeshWorker::DoFInfo &dinfo2, + MeshWorker::IntegrationInfo &info1, + MeshWorker::IntegrationInfo &info2) const override; }; template - void - RHSIntegrator::cell(MeshWorker::DoFInfo &, - typename MeshWorker::IntegrationInfo &) const + void RHSIntegrator::cell(MeshWorker::DoFInfo &, + MeshWorker::IntegrationInfo &) const {} template - void RHSIntegrator::boundary( - MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const + void + RHSIntegrator::boundary(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const { const FEValuesBase &fe = info.fe_values(); Vector &local_vector = dinfo.vector(0).block(0); @@ -350,11 +346,10 @@ namespace Step39 template - void - RHSIntegrator::face(MeshWorker::DoFInfo &, - MeshWorker::DoFInfo &, - typename MeshWorker::IntegrationInfo &, - typename MeshWorker::IntegrationInfo &) const + void RHSIntegrator::face(MeshWorker::DoFInfo &, + MeshWorker::DoFInfo &, + MeshWorker::IntegrationInfo &, + MeshWorker::IntegrationInfo &) const {} @@ -365,24 +360,22 @@ namespace Step39 class Estimator : public MeshWorker::LocalIntegrator { public: - void cell(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void - boundary(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void face(MeshWorker::DoFInfo &dinfo1, - MeshWorker::DoFInfo &dinfo2, - typename MeshWorker::IntegrationInfo &info1, - typename MeshWorker::IntegrationInfo &info2) const override; + void cell(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void boundary(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void face(MeshWorker::DoFInfo &dinfo1, + MeshWorker::DoFInfo &dinfo2, + MeshWorker::IntegrationInfo &info1, + MeshWorker::IntegrationInfo &info2) const override; }; // The cell contribution is the Laplacian of the discrete solution, since // the right hand side is zero. template - void - Estimator::cell(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const + void Estimator::cell(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const { const FEValuesBase &fe = info.fe_values(); @@ -399,9 +392,8 @@ namespace Step39 // namely the norm of the difference between the finite element solution and // the correct boundary condition. template - void Estimator::boundary( - MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const + void Estimator::boundary(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const { const FEValuesBase &fe = info.fe_values(); @@ -426,11 +418,10 @@ namespace Step39 // Finally, on interior faces, the estimator consists of the jumps of the // solution and its normal derivative, weighted appropriately. template - void - Estimator::face(MeshWorker::DoFInfo &dinfo1, - MeshWorker::DoFInfo &dinfo2, - typename MeshWorker::IntegrationInfo &info1, - typename MeshWorker::IntegrationInfo &info2) const + void Estimator::face(MeshWorker::DoFInfo &dinfo1, + MeshWorker::DoFInfo &dinfo2, + MeshWorker::IntegrationInfo &info1, + MeshWorker::IntegrationInfo &info2) const { const FEValuesBase &fe = info1.fe_values(); const std::vector &uh1 = info1.values[0][0]; @@ -475,15 +466,14 @@ namespace Step39 class ErrorIntegrator : public MeshWorker::LocalIntegrator { public: - void cell(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void - boundary(MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const override; - void face(MeshWorker::DoFInfo &dinfo1, - MeshWorker::DoFInfo &dinfo2, - typename MeshWorker::IntegrationInfo &info1, - typename MeshWorker::IntegrationInfo &info2) const override; + void cell(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void boundary(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const override; + void face(MeshWorker::DoFInfo &dinfo1, + MeshWorker::DoFInfo &dinfo2, + MeshWorker::IntegrationInfo &info1, + MeshWorker::IntegrationInfo &info2) const override; }; // Here we have the integration on cells. There is currently no good @@ -499,9 +489,8 @@ namespace Step39 // this one does not have any jump terms and only appears in the integration // on cells. template - void ErrorIntegrator::cell( - MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const + void ErrorIntegrator::cell(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const { const FEValuesBase &fe = info.fe_values(); std::vector> exact_gradients(fe.n_quadrature_points); @@ -531,9 +520,9 @@ namespace Step39 template - void ErrorIntegrator::boundary( - MeshWorker::DoFInfo &dinfo, - typename MeshWorker::IntegrationInfo &info) const + void + ErrorIntegrator::boundary(MeshWorker::DoFInfo &dinfo, + MeshWorker::IntegrationInfo &info) const { const FEValuesBase &fe = info.fe_values(); @@ -556,11 +545,10 @@ namespace Step39 template - void ErrorIntegrator::face( - MeshWorker::DoFInfo &dinfo1, - MeshWorker::DoFInfo &dinfo2, - typename MeshWorker::IntegrationInfo &info1, - typename MeshWorker::IntegrationInfo &info2) const + void ErrorIntegrator::face(MeshWorker::DoFInfo &dinfo1, + MeshWorker::DoFInfo &dinfo2, + MeshWorker::IntegrationInfo &info1, + MeshWorker::IntegrationInfo &info2) const { const FEValuesBase &fe = info1.fe_values(); const std::vector &uh1 = info1.values[0][0];