changed: mark readPatches const and public

src/SIM/SIM1D.C

@@ -494,7 +494,7 @@ ASMbase* SIM1D::readPatch (std::istream& isp, int pchInd,
 
 
 bool SIM1D::readPatches (std::istream& isp, PatchVec& patches,
-                         const char* whiteSpace)
+                         const char* whiteSpace) const
 {
   ASMbase* pch = nullptr;
   for (int pchInd = 1; isp.good(); pchInd++)

src/SIM/SIM1D.h

@@ -50,6 +50,13 @@ public:
   virtual ASMbase* readPatch(std::istream& isp, int pchInd,
                              const CharVec& unf) const;
 
+  //! \brief Reads patches from given input stream.
+  //! \param[in] isp The input stream to read from
+  //! \param[out] patches Array of patches that were read
+  //! \param[in] whiteSpace For message formatting
+  virtual bool readPatches(std::istream& isp, PatchVec& patches,
+                           const char* whiteSpace) const;
+
   //! \brief Evaluates the primary solution at the given point.
   //! \param[in] psol Primary solution vector
   //! \param[in] u Parameter of the point to evaluate at
@@ -84,13 +91,6 @@ protected:
   //! \param is The file stream to read from
   virtual bool parse(char* keyWord, std::istream& is);
 
-  //! \brief Reads patches from given input stream.
-  //! \param[in] isp The input stream to read from
-  //! \param[out] patches Array of patches that were read
-  //! \param[in] whiteSpace For message formatting
-  virtual bool readPatches(std::istream& isp, PatchVec& patches,
-                           const char* whiteSpace);
-
   //! \brief Preprocesses a user-defined Dirichlet boundary property.
   //! \param[in] patch 1-based index of the patch to receive the property
   //! \param[in] lndx Local index of the boundary item to receive the property

src/SIM/SIM2D.C

@@ -689,7 +689,7 @@ ASMbase* SIM2D::readPatch (std::istream& isp, int pchInd,
 
 
 bool SIM2D::readPatches (std::istream& isp, PatchVec& patches,
-                         const char* whiteSpace)
+                         const char* whiteSpace) const
 {
   ASMbase* pch = nullptr;
   for (int pchInd = 1; isp.good(); pchInd++)

src/SIM/SIM2D.h

@@ -63,6 +63,13 @@ public:
   virtual ASMbase* readPatch(std::istream& isp, int pchInd,
                              const CharVec& unf) const;
 
+  //! \brief Reads patches from given input stream.
+  //! \param[in] isp The input stream to read from
+  //! \param[out] patches Array of patches that were read
+  //! \param[in] whiteSpace For message formatting
+  virtual bool readPatches(std::istream& isp, PatchVec& patches,
+                           const char* whiteSpace) const;
+
   //! \brief Evaluates the primary solution at the given point.
   //! \param[in] psol Primary solution vector
   //! \param[in] u First parameter of the point to evaluate at
@@ -89,12 +96,6 @@ protected:
   //! \param is The file stream to read from
   virtual bool parse(char* keyWord, std::istream& is);
 
-  //! \brief Reads patches from given input stream.
-  //! \param[in] isp The input stream to read from
-  //! \param[out] patches Array of patches that were read
-  //! \param[in] whiteSpace For message formatting
-  virtual bool readPatches(std::istream& isp, PatchVec& patches,
-                           const char* whiteSpace);
   //! \brief Reads global node data for a patch from given input stream.
   //! \param[in] isn The input stream to read from
   //! \param[in] pchInd 0-based index of the patch to read node data for

src/SIM/SIM3D.C

@@ -703,7 +703,7 @@ ASMbase* SIM3D::readPatch (std::istream& isp, int pchInd,
 
 
 bool SIM3D::readPatches (std::istream& isp, PatchVec& patches,
-                         const char* whiteSpace)
+                         const char* whiteSpace) const
 {
   ASMbase* pch = nullptr;
   for (int pchInd = 1; isp.good(); pchInd++)

src/SIM/SIM3D.h

@@ -58,6 +58,13 @@ public:
   virtual ASMbase* readPatch(std::istream& isp, int pchInd,
                              const CharVec& unf) const;
 
+  //! \brief Reads patches from given input stream.
+  //! \param[in] isp The input stream to read from
+  //! \param[out] patches Array of patches that were read
+  //! \param[in] whiteSpace For message formatting
+  virtual bool readPatches(std::istream& isp, PatchVec& patches,
+                           const char* whiteSpace) const;
+
   //! \brief Evaluates the primary solution at the given point.
   //! \param[in] psol Primary solution vector
   //! \param[in] u First parameter of the point to evaluate at
@@ -85,12 +92,6 @@ protected:
   //! \param is The file stream to read from
   virtual bool parse(char* keyWord, std::istream& is);
 
-  //! \brief Reads patches from given input stream.
-  //! \param[in] isp The input stream to read from
-  //! \param[out] patches Array of patches that were read
-  //! \param[in] whiteSpace For message formatting
-  virtual bool readPatches(std::istream& isp, PatchVec& patches,
-                           const char* whiteSpace);
   //! \brief Reads global node data for a patch from given input stream.
   //! \param[in] isn The input stream to read from
   //! \param[in] pchInd 0-based index of the patch to read node data for

src/SIM/SIMbase.h

@@ -651,6 +651,13 @@ public:
   virtual ASMbase* readPatch(std::istream& isp, int pchInd,
                              const CharVec& unf = CharVec()) const = 0;
 
+  //! \brief Reads patches from given input stream.
+  //! \param[in] isp The input stream to read from
+  //! \param[out] patches Array of patches that were read
+  //! \param[in] whiteSpace For message formatting
+  virtual bool readPatches(std::istream& isp, PatchVec& patches,
+                           const char* whiteSpace = "") const = 0;
+
   //! \brief Returns a scalar function associated with \a code.
   RealFunc* getSclFunc(int code) const;
 
@@ -666,12 +673,6 @@ protected:
   //! \brief Initializes for integration of Neumann terms for a given property.
   virtual bool initNeumann(size_t) { return true; }
 
-  //! \brief Reads patches from given input stream.
-  //! \param[in] isp The input stream to read from
-  //! \param[out] patches Array of patches that were read
-  //! \param[in] whiteSpace For message formatting
-  virtual bool readPatches(std::istream& isp, PatchVec& patches,
-                           const char* whiteSpace = "") = 0;
   //! \brief Reads global node data for a patch from given input stream.
   //! \param[in] isn The input stream to read from
   //! \param[in] pchInd 0-based index of the patch to read node data for

src/SIM/SIMdummy.h

@@ -38,7 +38,7 @@ public:
   { return nullptr; }
 protected:
   //! \brief Reads patches from given input stream.
-  virtual bool readPatches(std::istream&,SIMdependency::PatchVec&,const char*)
+  virtual bool readPatches(std::istream&,SIMdependency::PatchVec&,const char*) const
   { return false; }
   //! \brief Preprocesses a user-defined Dirichlet boundary property.
   virtual bool addConstraint(int,int,int,int,int,int&,char)