OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused patch member, the parent class has it now

Browse Source
This commit is contained in:
Knut Morten Okstad 2020-02-27 14:55:42 +01:00
parent 487f865683
commit ecdf515e3e
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ASM/SAMpatchPETSc.C
View File

@ -17,15 +17,15 @@
#include "ProcessAdm.h"
SAMpatchPETSc::SAMpatchPETSc(const std::map<int,int>& g2ln,
const ProcessAdm& padm) : adm(padm)
SAMpatchPETSc::SAMpatchPETSc (const std::map<int,int>& g2ln,
const ProcessAdm& padm) : adm(padm)
{
nProc = adm.getNoProcs();
LinAlgInit::increfs();
}
SAMpatchPETSc::~SAMpatchPETSc()
SAMpatchPETSc::~SAMpatchPETSc ()
{
#ifdef HAVE_MPI
for (auto& it : dofIS) {
@ -42,14 +42,6 @@ SAMpatchPETSc::~SAMpatchPETSc()
}
bool SAMpatchPETSc::init (const std::vector<ASMbase*>& model, int numNod,
const std::vector<char>& dTypes)
{
patch = model;
return this->SAMpatch::init(model,numNod,dTypes);
}
Real SAMpatchPETSc::dot (const Vector& x, const Vector& y, char dofType) const
{
#ifdef HAVE_MPI
@ -181,8 +173,8 @@ SAMpatchPETSc::DofIS& SAMpatchPETSc::getIS (char dofType) const
#endif
bool SAMpatchPETSc::expandSolution(const SystemVector& solVec,
Vector& dofVec, Real scaleSD) const
bool SAMpatchPETSc::expandSolution (const SystemVector& solVec,
Vector& dofVec, Real scaleSD) const
{
PETScVector* Bptr = const_cast<PETScVector*>(dynamic_cast<const PETScVector*>(&solVec));
if (!Bptr)

17
src/ASM/SAMpatchPETSc.h
View File

@ -35,13 +35,6 @@ public:
//! \brief The destructor destroys the index set arrays.
virtual ~SAMpatchPETSc();
//! \brief Allocates the dynamic arrays and populates them with data.
//! \param[in] model All spline patches in the model
//! \param[in] numNod Total number of unique nodes in the model
//! \param[in] dTypes Nodal DOF type flags
virtual bool init(const std::vector<ASMbase*>& model, int numNod,
const std::vector<char>& dTypes);
//! \brief Computes the dot-product of two vectors.
//! \param[in] x First vector in dot-product
//! \param[in] y Second vector in dot-product
@ -71,9 +64,6 @@ public:
//! for parallel vectors the ghost entries are also included.
virtual Real normInf(const Vector& x, size_t& comp, char dofType = 'D') const;
//! \brief Returns the patch vector.
const std::vector<ASMbase*> getPatches() const { return patch; }
//! \brief Expands a solution vector from equation-ordering to DOF-ordering.
//! \param[in] solVec Solution vector, length = NEQ
//! \param[out] dofVec Degrees of freedom vector, length = NDOF
@ -85,8 +75,8 @@ public:
//! That is, all fixed or constrained (slave) DOFs are not present.
//! Before we can compute derived element quantities we therefore need to
//! extract the resulting solution values also for the constrained DOFs.
virtual bool expandSolution(const SystemVector& solVec, Vector& dofVec,
Real scaleSD = 1.0) const;
virtual bool expandSolution(const SystemVector& solVec,
Vector& dofVec, Real scaleSD) const;
private:
// Parameters for parallel computing
@ -96,9 +86,6 @@ private:
const ProcessAdm& adm; //!< Parallel process administrator
// For domain decomposition preconditioner
std::vector<ASMbase*> patch; //!< The spline patches
#ifdef HAVE_MPI
mutable IS glob2LocEq = nullptr; //!< Index set for global-to-local equations