Update Matrixes to Matrices (#17)

LLNL · Feb 22, 2024 · 88a6934 · 88a6934
1 parent 5e2a639
commit 88a6934
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/include/interface_form.hpp b/include/interface_form.hpp
@@ -54,7 +54,7 @@ class InterfaceForm
    const Array<InterfaceNonlinearFormIntegrator*> &GetIntefaceIntegrators() const
    { return fnfi; }
 
-   void AssembleInterfaceMatrixes(Array2D<SparseMatrix *> &mats) const;
+   void AssembleInterfaceMatrices(Array2D<SparseMatrix *> &mats) const;
 
    void AssembleInterfaceMatrixAtPort(const int p, Array<FiniteElementSpace *> &fes_comp, Array2D<SparseMatrix *> &mats_p) const;
 
@@ -127,7 +127,7 @@ class MixedInterfaceForm
    const Array<InterfaceNonlinearFormIntegrator*> &GetIntefaceIntegrators() const
    { return fnfi; }
 
-   void AssembleInterfaceMatrixes(Array2D<SparseMatrix *> &mats) const;
+   void AssembleInterfaceMatrices(Array2D<SparseMatrix *> &mats) const;
 
    void AssembleInterfaceMatrixAtPort(const int p, Array<FiniteElementSpace *> &trial_fes_comp, 
                                       Array<FiniteElementSpace *> &test_fes_comp, Array2D<SparseMatrix *> &mats_p) const;

diff --git a/include/multiblock_solver.hpp b/include/multiblock_solver.hpp
@@ -165,7 +165,7 @@ friend class ParameterizedProblem;
    virtual void AssembleOperator() = 0;
    // For bilinear case.
    // system-specific.
-   virtual void AssembleInterfaceMatrixes() = 0;
+   virtual void AssembleInterfaceMatrices() = 0;
 
    // Global ROM operator Loading.
    virtual void SaveROMOperator(const std::string input_prefix="")

diff --git a/include/poisson_solver.hpp b/include/poisson_solver.hpp
@@ -85,7 +85,7 @@ friend class ParameterizedProblem;
    virtual void AssembleOperator();
    // For bilinear case.
    // system-specific.
-   virtual void AssembleInterfaceMatrixes();
+   virtual void AssembleInterfaceMatrices();
 
    // Component-wise assembly
    virtual void BuildCompROMElement(Array<FiniteElementSpace *> &fes_comp);

diff --git a/include/stokes_solver.hpp b/include/stokes_solver.hpp
@@ -178,7 +178,7 @@ friend class ParameterizedProblem;
    virtual void AssembleOperatorBase();   // base function that NS solver inherits.
    // For bilinear case.
    // system-specific.
-   virtual void AssembleInterfaceMatrixes();
+   virtual void AssembleInterfaceMatrices();
    virtual void SetupMUMPSSolver();
    virtual void SetupPressureMassMatrix();
 

diff --git a/sketches/block_algebra.cpp b/sketches/block_algebra.cpp
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 // }
    }
 
-   // Set up block matrixes, based on domain offsets.
+   // Set up block matrices, based on domain offsets.
    Array2D<SparseMatrix*> mats(numSub, numSub);
    for (int i = 0; i < numSub; i++)
    {

diff --git a/src/interface_form.cpp b/src/interface_form.cpp
@@ -28,7 +28,7 @@ InterfaceForm::~InterfaceForm()
    DeletePointers(fnfi);
 }
 
-void InterfaceForm::AssembleInterfaceMatrixes(Array2D<SparseMatrix *> &mats) const
+void InterfaceForm::AssembleInterfaceMatrices(Array2D<SparseMatrix *> &mats) const
 {
    assert(mats.NumRows() == numSub);
    assert(mats.NumCols() == numSub);
@@ -341,7 +341,7 @@ MixedInterfaceForm::~MixedInterfaceForm()
    DeletePointers(fnfi);
 }
 
-void MixedInterfaceForm::AssembleInterfaceMatrixes(Array2D<SparseMatrix *> &mats) const
+void MixedInterfaceForm::AssembleInterfaceMatrices(Array2D<SparseMatrix *> &mats) const
 {
    const PortInfo *pInfo;
    Array<int> midx(2);

diff --git a/src/multiblock_solver.cpp b/src/multiblock_solver.cpp
@@ -270,10 +270,10 @@ void MultiBlockSolver::BuildROMElements()
 
    BuildCompROMElement(fes_comp);
 
-   // Boundary penalty matrixes
+   // Boundary penalty matrices
    BuildBdrROMElement(fes_comp);
 
-   // Port penalty matrixes
+   // Port penalty matrices
    BuildInterfaceROMElement(fes_comp);
 
    for (int k = 0 ; k < fes_comp.Size(); k++) delete fes_comp[k];
@@ -526,7 +526,7 @@ void MultiBlockSolver::AssembleROM()
       MatrixBlocks *comp_mat = comp_mats[c_type];
       AddToBlockMatrix(midx, midx, *comp_mat, *romMat);
 
-      // boundary matrixes of each component.
+      // boundary matrices of each component.
       Array<int> *bdr_c2g = topol_handler->GetBdrAttrComponentToGlobalMap(m);
 
       for (int b = 0; b < bdr_c2g->Size(); b++)
@@ -540,7 +540,7 @@ void MultiBlockSolver::AssembleROM()
       }  // for (int b = 0; b < bdr_c2g->Size(); b++)
    }  // for (int m = 0; m < numSub; m++)
 
-   // interface matrixes.
+   // interface matrices.
    for (int p = 0; p < topol_handler->GetNumPorts(); p++)
    {
       const PortInfo *pInfo = topol_handler->GetPortInfo(p);

diff --git a/src/poisson_solver.cpp b/src/poisson_solver.cpp
@@ -298,7 +298,7 @@ void PoissonSolver::AssembleOperator()
          }
       }
    }
-   AssembleInterfaceMatrixes();
+   AssembleInterfaceMatrices();
 
    for (int m = 0; m < numSub; m++)
       as[m]->Finalize();
@@ -334,10 +334,10 @@ void PoissonSolver::AssembleOperator()
    }
 }
 
-void PoissonSolver::AssembleInterfaceMatrixes()
+void PoissonSolver::AssembleInterfaceMatrices()
 {
    assert(a_itf);
-   a_itf->AssembleInterfaceMatrixes(mats);
+   a_itf->AssembleInterfaceMatrices(mats);
 }
 
 void PoissonSolver::BuildCompROMElement(Array<FiniteElementSpace *> &fes_comp)

diff --git a/src/stokes_solver.cpp b/src/stokes_solver.cpp
@@ -429,7 +429,7 @@ void StokesSolver::AssembleOperatorBase()
          }
       }
 
-   AssembleInterfaceMatrixes();
+   AssembleInterfaceMatrices();
 
    for (int m = 0; m < numSub; m++)
    {
@@ -508,10 +508,10 @@ void StokesSolver::SetupPressureMassMatrix()
    pM = pmMat->CreateMonolithic();
 }
 
-void StokesSolver::AssembleInterfaceMatrixes()
+void StokesSolver::AssembleInterfaceMatrices()
 {
-   m_itf->AssembleInterfaceMatrixes(m_mats);
-   b_itf->AssembleInterfaceMatrixes(b_mats);
+   m_itf->AssembleInterfaceMatrices(m_mats);
+   b_itf->AssembleInterfaceMatrices(b_mats);
 }
 
 void StokesSolver::BuildCompROMElement(Array<FiniteElementSpace *> &fes_comp)