corrections to hanging node

Author: githubgrasp

src/oofemlib/hangingnode.C

@@ -41,7 +41,7 @@
 //@{
 #define _IFT_HangingNode_Name "hangingnode"
 #define _IFT_HangingNode_masterElement "masterelement"
-//#define _IFT_HangingNode_masterElement "masterelementrot"
+#define _IFT_HangingNode_masterElementRot "masterelementrot"
 #define _IFT_HangingNode_masterRegion "masterregion"
 //@}
 
@@ -81,24 +81,25 @@ class OOFEM_EXPORT HangingNode : public Node
      * @param n Node number in domain aDomain.
      * @param aDomain Domain to which node belongs.
      */
-    HangingNode(int n, Domain * aDomain);
+    HangingNode(int n, Domain *aDomain);
     /// Destructor.
     virtual ~HangingNode(void) { }
 
-    void initializeFrom(InputRecord &ir) override;    
-    FloatArray computeTriangleRotations( DofIDItem id, FloatArray &hangingNodeCoords, const IntArray &hexaNodes, const FloatArray &translationContribution, Element *e );
+    void initializeFrom(InputRecord &ir) override;
+    FloatArray computeTriangleRotations(DofIDItem id, FloatArray &hangingNodeCoords, const IntArray &hexaNodes, const FloatArray &translationContribution, Element *e);
     void postInitialize() override;
     int checkConsistency() override;
-    std::tuple<int, int, double> findMasterNodesWithAlignedCoordinates( const IntArray &masterNodes, FloatArray localLcoords, Element *e ) const;
-    FloatArray computeMasterContributionForRv( const IntArray &masterNodes, const FloatArray &translationContribution, const FloatArray &lcoords, Element *e ) const;
-    static double computeDistance( const FloatArray &masterGlobalCoords1, const FloatArray &masterGlobalCoords2 );
-    static double distance( const std::array<double, 3> &a, const std::array<double, 3> &b );
-    std::vector<int> findThreeClosestNodes( FloatArray &hangingNodeCoords, const IntArray &hexaNodes );
-    int findNormalDirection( const FloatArray &localLcoords1, const FloatArray &localLcoords2, const FloatArray &localLcoords3 );
+    std::tuple< int, int, double >findMasterNodesWithAlignedCoordinates(const IntArray &masterNodes, FloatArray localLcoords, Element *e) const;
+    FloatArray computeMasterContributionForRv(const IntArray &masterNodes, const FloatArray &translationContribution, const FloatArray &lcoords, Element *e) const;
+    static double computeDistance(const FloatArray &masterGlobalCoords1, const FloatArray &masterGlobalCoords2);
+    static double distance(const std::array< double, 3 > &a, const std::array< double, 3 > &b);
+    std::vector< int >findThreeClosestNodes(FloatArray &hangingNodeCoords, const IntArray &hexaNodes);
+    int findNormalDirection(const FloatArray &localLcoords1, const FloatArray &localLcoords2, const FloatArray &localLcoords3);
     bool isDofTypeCompatible(dofType type) const override { return ( type == DT_master || type == DT_slave ); }
 
     const char *giveClassName() const override { return "HangingNode"; }
     const char *giveInputRecordName() const override { return _IFT_HangingNode_Name; }
+    int giveMasterElementRot() const { return masterElementRot; }
 };
 } // end namespace oofem
 #endif // hangingnode_h