Merge branch 'master' into PfemFluid/add-constitutive-laws

BobCFD · Mar 3, 2020 · 041ca95 · 041ca95
2 parents b0cad68 + 9b29998
commit 041ca95
Show file tree

Hide file tree

Showing 147 changed files with 4,946 additions and 5,026 deletions.
diff --git a/...ntialFlowApplication/custom_elements/compressible_perturbation_potential_flow_element.cpp b/...ntialFlowApplication/custom_elements/compressible_perturbation_potential_flow_element.cpp
diff --git a/...tentialFlowApplication/custom_elements/compressible_perturbation_potential_flow_element.h b/...tentialFlowApplication/custom_elements/compressible_perturbation_potential_flow_element.h
@@ -227,47 +227,52 @@ class CompressiblePerturbationPotentialFlowElement : public Element
 
     void GetDofListWakeElement(DofsVectorType& rElementalDofList) const;
 
-    void CalculateLocalSystemNormalElement(MatrixType& rLeftHandSideMatrix,
-                                           VectorType& rRightHandSideVector,
+    void CalculateLeftHandSideNormalElement(MatrixType& rLeftHandSideMatrix,
                                            const ProcessInfo& rCurrentProcessInfo);
 
-    void CalculateLocalSystemWakeElement(MatrixType& rLeftHandSideMatrix,
-                                         VectorType& rRightHandSideVector,
+    void CalculateRightHandSideNormalElement(VectorType& rRightHandSideVector,
+                                           const ProcessInfo& rCurrentProcessInfo);
+
+    void CalculateLeftHandSideWakeElement(MatrixType& rLeftHandSideMatrix,
+                                         const ProcessInfo& rCurrentProcessInfo);
+
+    void CalculateRightHandSideWakeElement(VectorType& rRightHandSideVector,
                                          const ProcessInfo& rCurrentProcessInfo);
 
-    void CalculateLocalSystemSubdividedElement(Matrix& lhs_positive,
+    void CalculateLeftHandSideSubdividedElement(Matrix& lhs_positive,
                                                Matrix& lhs_negative,
-                                               Matrix& laplacian_positive,
-                                               Matrix& laplacian_negative,
                                                const ProcessInfo& rCurrentProcessInfo);
+    void CalculateVolumesSubdividedElement(double& rUpper_vol,
+                                           double& rLower_vol,
+                                           const ProcessInfo& rCurrentProcessInfo);
 
     void ComputeLHSGaussPointContribution(const double weight,
                                           Matrix& lhs,
                                           const ElementalData<NumNodes, Dim>& data) const;
 
-    void AssignLocalSystemSubdividedElement(
-        Matrix& rLeftHandSideMatrix,
-        Matrix& lhs_positive,
-        Matrix& lhs_negative,
-        const BoundedMatrix<double, NumNodes, NumNodes>& lhs_total,
-        MatrixType& rLaplacianMatrix,
-        Matrix& laplacian_positive,
-        Matrix& laplacian_negative,
-        const BoundedMatrix<double, NumNodes, NumNodes>& laplacian_total,
-        const ElementalData<NumNodes, Dim>& data) const;
-
-    void AssignLocalSystemWakeElement(MatrixType& rLeftHandSideMatrix,
+    void AssignLeftHandSideSubdividedElement(Matrix& rLeftHandSideMatrix,
+                                             Matrix& lhs_positive,
+                                             Matrix& lhs_negative,
+                                             const BoundedMatrix<double, NumNodes, NumNodes>& lhs_total,
+                                             const ElementalData<NumNodes, Dim>& data) const;
+
+    void AssignLeftHandSideWakeElement(MatrixType& rLeftHandSideMatrix,
                                       const BoundedMatrix<double, NumNodes, NumNodes>& lhs_total,
                                       const ElementalData<NumNodes, Dim>& data) const;
 
-    void AssignLocalSystemWakeNode(MatrixType& rLeftHandSideMatrix,
+    void AssignLeftHandSideWakeNode(MatrixType& rLeftHandSideMatrix,
                                    const BoundedMatrix<double, NumNodes, NumNodes>& lhs_total,
                                    const ElementalData<NumNodes, Dim>& data,
                                    unsigned int& row) const;
 
-    void ComputePotentialJump(const ProcessInfo& rCurrentProcessInfo);
+    void AssignRightHandSideWakeNode(VectorType& rRightHandSideVector,
+                                   const BoundedVector<double, NumNodes>& rUpper_rhs,
+                                   const BoundedVector<double, NumNodes>& rLower_rhs,
+                                   const BoundedVector<double, NumNodes>& rWake_rhs,
+                                   const ElementalData<NumNodes, Dim>& rData,
+                                   unsigned int& rRow) const;
 
-    void ComputeElementInternalEnergy();
+    void ComputePotentialJump(const ProcessInfo& rCurrentProcessInfo);
 
     ///@}
     ///@name Private Operations