Created TPZMatrix::NewMatrix method

labmec · May 22, 2021 · edf4f62 · edf4f62
1 parent 22e3842
commit edf4f62
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 11 deletions.
diff --git a/Frontal/TPZFrontMatrix.h b/Frontal/TPZFrontMatrix.h
@@ -102,6 +102,7 @@ class TPZFrontMatrix : public TPZAbstractFrontMatrix<TVar> {
     }
 
   //  CLONEDEF(TPZFrontMatrix)
+  inline TPZFrontMatrix*NewMatrix() const override {return new TPZFrontMatrix{};}
 	virtual TPZMatrix<TVar>*Clone() const  override { return new TPZFrontMatrix(*this); }
     /** 
 	 * @brief Sends a message to decompose equations from lower_eq to upper_eq, according to destination index

diff --git a/Matrix/pzblockdiag.h b/Matrix/pzblockdiag.h
@@ -37,7 +37,8 @@ class TPZBlockDiagonal : public TPZMatrix<TVar>
 	TPZBlockDiagonal (const TPZVec<int> &blocksizes);
 	/** @brief Copy constructor */
 	TPZBlockDiagonal (const TPZBlockDiagonal & );
-
+
+  TPZBlockDiagonal* NewMatrix() const override{ return new TPZBlockDiagonal{};}
 	CLONEDEF(TPZBlockDiagonal)
 
 	/** @brief Creates a copy from another TPZBlockDiagonal*/

diff --git a/Matrix/pzbndmat.h b/Matrix/pzbndmat.h
@@ -44,6 +44,7 @@ class TPZFBMatrix : public TPZMatrix<TVar>
 	TPZFBMatrix (const TPZFBMatrix<TVar> & ) = default;
   /** @brief Move constructor */
 	TPZFBMatrix (TPZFBMatrix<TVar> && ) = default;
+  inline TPZFBMatrix<TVar>*NewMatrix() const override {return new TPZFBMatrix<TVar>{};}
 	CLONEDEF(TPZFBMatrix)
 	/** @brief Copy-assignment operator*/
   TPZFBMatrix &operator= (const TPZFBMatrix<TVar> & A ) = default;

diff --git a/Matrix/pzfmatrix.h b/Matrix/pzfmatrix.h
@@ -112,7 +112,7 @@ class TPZFMatrix: public TPZMatrix<TVar> {
     TPZFMatrix&operator= (const TPZFMatrix<TVar> &A );
     //!Move-assignment operator
     TPZFMatrix&operator= (TPZFMatrix<TVar> &&A );
-
+    inline TPZFMatrix<TVar>*NewMatrix() const override {return new TPZFMatrix<TVar>{};}
     CLONEDEF(TPZFMatrix<TVar>)
     TPZFMatrix(const TPZMatrix<TVar> & refmat);
 

diff --git a/Matrix/pzmatred.h b/Matrix/pzmatred.h
@@ -58,7 +58,7 @@ class TPZMatRed: public TPZMatrix<TVar>
 
 		if(cp.fK00) fK00 = cp.fK00;
 	}
-
+	inline TPZMatRed<TVar,TSideMatrix>*NewMatrix() const override {return new TPZMatRed<TVar,TSideMatrix>{};}
 	CLONEDEF(TPZMatRed)
 
   /** @brief Creates a copy from another TPZMatRed*/
@@ -233,7 +233,7 @@ class TPZMatRed: public TPZMatrix<TVar>
 
 	/** @brief Saveable methods */
 	public:
-int ClassId() const override;
+  int ClassId() const override;
 
 
 	void Write(TPZStream &buf, int withclassid) const override;

diff --git a/Matrix/pzmatrix.h b/Matrix/pzmatrix.h
@@ -50,7 +50,9 @@ class TPZMatrix: public TPZBaseMatrix
   TPZMatrix<TVar> &operator=(const TPZMatrix<TVar> &);
   /** @brief Move assignment operator*/
   TPZMatrix<TVar> &operator=(TPZMatrix<TVar> &&);
-
+  /** @brief To create a matrix of the same type */
+  virtual TPZMatrix<TVar>*NewMatrix() const = 0;
+  /** @brief To create clone matrix */
   virtual TPZMatrix<TVar>*Clone() const = 0;
 
 	/**
@@ -87,7 +89,7 @@ class TPZMatrix: public TPZBaseMatrix
   /** @brief Creates a copy from a given matrix of arbitrary storage format. 
       Every implementation should check for type compatibility */
   virtual void CopyFrom(const TPZMatrix<TVar> *mat) = 0;
-
+  
 	/** @brief Fill matrix storage with randomic values */
 	/** This method use GetVal and PutVal which are implemented by each type matrices */
 	void AutoFill(int64_t nrow, int64_t ncol, int symmetric) override;

diff --git a/Matrix/pzsbndmat.h b/Matrix/pzsbndmat.h
@@ -37,6 +37,7 @@ class TPZSBMatrix : public TPZMatrix<TVar>
     TPZSBMatrix(const int64_t dim,const int64_t band );
     TPZSBMatrix(const TPZSBMatrix<TVar> &A ) = default;
     TPZSBMatrix(TPZSBMatrix<TVar> &&A ) = default;
+    inline TPZSBMatrix<TVar>*NewMatrix() const override {return new TPZSBMatrix<TVar>{};}
     CLONEDEF(TPZSBMatrix)
     TPZSBMatrix &operator= (TPZSBMatrix<TVar> &&A ) = default;
     TPZSBMatrix &operator= (const TPZSBMatrix<TVar> &A ) = default;

diff --git a/Matrix/pzsfulmat.h b/Matrix/pzsfulmat.h
@@ -34,6 +34,7 @@ class TPZSFMatrix : public TPZMatrix<TVar> {
 	TPZSFMatrix (const TPZMatrix<TVar> & );
 	TPZSFMatrix &operator= (const TPZSFMatrix<TVar> &A );
   TPZSFMatrix &operator= (TPZSFMatrix<TVar> &&A );
+  inline TPZSFMatrix<TVar>*NewMatrix() const override {return new TPZSFMatrix<TVar>{};}
 	CLONEDEF(TPZSFMatrix)
 
 	~TPZSFMatrix();

diff --git a/Matrix/pzskylmat.h b/Matrix/pzskylmat.h
@@ -45,7 +45,8 @@ class TPZSkylMatrix : public TPZMatrix<TVar>
   TPZSkylMatrix &operator= (TPZSkylMatrix<TVar> &&A ) = default;
     /** @brief destructor of the skyline matrix */
 	virtual ~TPZSkylMatrix() { Clear(); }
-
+
+  inline TPZSkylMatrix<TVar>*NewMatrix() const override {return new TPZSkylMatrix<TVar>{};}
 	CLONEDEF(TPZSkylMatrix)
 
 	virtual int64_t MemoryFootprint() const  override {

diff --git a/Matrix/pzskylnsymmat.h b/Matrix/pzskylnsymmat.h
@@ -49,6 +49,10 @@ class TPZSkylNSymMatrix : public TPZMatrix<TVar>
         Copy(A); 
     }
   TPZSkylNSymMatrix(TPZSkylNSymMatrix &&A ) = default;
+  inline TPZSkylNSymMatrix<TVar>*NewMatrix() const override
+  {
+    return new TPZSkylNSymMatrix<TVar>{};
+  }
   CLONEDEF(TPZSkylNSymMatrix)
   TPZSkylNSymMatrix& operator=(const TPZSkylNSymMatrix&A);
   TPZSkylNSymMatrix& operator=(TPZSkylNSymMatrix&&A) = default;

diff --git a/Matrix/pzsysmp.h b/Matrix/pzsysmp.h
@@ -35,7 +35,7 @@ public :
   TPZSYsmpMatrix &operator=(const TPZSYsmpMatrix<TVar> &copy) = default;
   /** @brief Move-assignment operator*/
   TPZSYsmpMatrix &operator=(TPZSYsmpMatrix<TVar> &&copy) = default;
-    
+  inline TPZSYsmpMatrix<TVar>*NewMatrix() const override {return new TPZSYsmpMatrix<TVar>{};}
   CLONEDEF(TPZSYsmpMatrix)
 	/** @brief Destructor */
 	virtual ~TPZSYsmpMatrix();

diff --git a/Matrix/pzysmp.h b/Matrix/pzysmp.h
@@ -59,7 +59,7 @@ class TPZFYsmpMatrix : public TPZMatrix<TVar> {
   TPZFYsmpMatrix &operator=(TPZFYsmpMatrix<TVar> &&copy) = default;
 
 	TPZFYsmpMatrix &operator=(const TPZVerySparseMatrix<TVar> &cp);
-    
+  inline TPZFYsmpMatrix<TVar>*NewMatrix() const override {return new TPZFYsmpMatrix<TVar>{};}
 	CLONEDEF(TPZFYsmpMatrix)
 
 	virtual ~TPZFYsmpMatrix();	

diff --git a/Matrix/tpzverysparsematrix.h b/Matrix/tpzverysparsematrix.h
@@ -78,7 +78,8 @@ class TPZVerySparseMatrix: public TPZMatrix<TVar>
 #endif
 		return fExtraSparseData[std::pair<int64_t, int64_t>(row, col)];
 	}
-
+	inline TPZVerySparseMatrix<TVar>*NewMatrix() const override
+  {return new TPZVerySparseMatrix<TVar>{};}
 	CLONEDEF(TPZVerySparseMatrix)
 
 	/** @brief Creates a copy from another TPZVerySparseMatrix*/

diff --git a/Solvers/Multigrid/pztransfer.h b/Solvers/Multigrid/pztransfer.h
@@ -44,7 +44,7 @@ public :
 	fDoubleValLastUsed(cp.fDoubleValLastUsed)
 	{
 	}
-
+	inline TPZTransfer*NewMatrix() const override {return new TPZTransfer{};}
 	virtual TPZMatrix<TVar> *Clone() const  override { return new TPZTransfer(*this); }
 
 	/** @brief Creates a copy from another TPZTransfer*/

diff --git a/SubStruct/tpzdohrmatrix.h b/SubStruct/tpzdohrmatrix.h
@@ -60,6 +60,7 @@ class TPZDohrMatrix : public TPZMatrix<TVar>
 	}
 
 	//	CLONEDEF(TPZDohrMatrix)
+	inline TPZDohrMatrix*NewMatrix() const override {return new TPZDohrMatrix{};}
 	virtual TPZMatrix<TVar>*Clone() const  override { return new TPZDohrMatrix(*this); }
 
 	~TPZDohrMatrix();

diff --git a/SubStruct/tpzdohrprecond.h b/SubStruct/tpzdohrprecond.h
@@ -57,6 +57,7 @@ class TPZDohrPrecond : public TPZMatrix<TVar>
     ~TPZDohrPrecond();
 
 	// CLONEDEF(TPZDohrPrecond)
+  inline TPZDohrPrecond*NewMatrix() const override {return new TPZDohrPrecond{};}
 	virtual TPZMatrix<TVar>*Clone() const  override { return new TPZDohrPrecond(*this); }
 
     /** @brief The matrix class is a placeholder for a list of substructures */