Many updates.

cyanray · cyanray · commit 8f77ddb5e0b7 · 2023-06-09T20:57:46.000+08:00
diff --git a/LibTrussSolver/CMakeLists.txt b/LibTrussSolver/CMakeLists.txt
@@ -58,7 +58,7 @@ set(SOURCES
         "src/Section_Beam.cpp"
         "src/Node.cpp"
         "src/BeamUniformLoad.cpp"
-        "src/CSTriangle.cpp" src/Section_CSTriangle.cpp include/Truss/Set/NodeSet.cpp include/Truss/Set/NodeSet.hpp include/Truss/Set/SetBase.hpp include/Truss/Load/NodeSetLoad.hpp include/Truss/Constraint/NodeSetConstraint.hpp include/Truss/Utils/GaussianQuadrature.hpp include/Truss/Element/CSQuad.hpp src/CSQuad.cpp include/Truss/Section/Section_CSQuad.hpp src/Section_CSQuad.cpp)
+        "src/CSTriangle.cpp" src/Section_CSTriangle.cpp include/Truss/Set/NodeSet.cpp include/Truss/Set/NodeSet.hpp include/Truss/Set/SetBase.hpp include/Truss/Load/NodeSetLoad.hpp include/Truss/Constraint/NodeSetConstraint.hpp include/Truss/Utils/GaussianQuadrature.hpp include/Truss/Element/Quad4.hpp src/Quad4.cpp include/Truss/Section/Section_CSQuad.hpp src/Section_CSQuad.cpp)
 
 
 option(LibTrussSolver_DOUBLE_PRECISION "Build LibTrussSolver As Double Precision Version" OFF)
diff --git a/LibTrussSolver/include/Truss/Element/Quad4.hpp b/LibTrussSolver/include/Truss/Element/Quad4.hpp
@@ -5,7 +5,7 @@
 
 namespace Truss::Element
 {
-    class CSQuad : public ElementBase
+    class Quad4 : public ElementBase
     {
     public:
         bool IsConstantStrainTriangle{false};
@@ -20,11 +20,11 @@ namespace Truss::Element
         Node* Node4{};
         Section::Section_CSQuad* Section{};
 
-        ~CSQuad() override = default;
+        ~Quad4() override = default;
 
         [[nodiscard]] constexpr std::string GetElementName() const noexcept override
         {
-            return "CSQuad";
+            return "Quad4";
         }
 
         void Build(Resources& resources) override;
@@ -46,7 +46,7 @@ namespace Truss::Element
 
         [[nodiscard]] std::vector<ID> GetNodeIds() const override;
 
-        [[nodiscard]] Eigen::Matrix<Numeric, 3, 24> GetBMatrix() const;
+        [[nodiscard]] Eigen::Matrix<Numeric, 3, 24> GetBMatrix(const VectorX<Numeric>& x, const VectorX<Numeric>& y) const;
 
         [[nodiscard]] Matrix3x3<Numeric> GetDMatrix() const;
 
diff --git a/LibTrussSolver/include/Truss/Utils/GaussianQuadrature.hpp b/LibTrussSolver/include/Truss/Utils/GaussianQuadrature.hpp
@@ -120,8 +120,8 @@ namespace Truss
     }
 
 
-    template<typename TScalar, typename TFuncRetrun = TScalar>
-    using IntegrateFunc = std::function<Eigen::VectorX<TFuncRetrun>(const Eigen::VectorX<TScalar>&, const Eigen::VectorX<TScalar>&)>;
+    template<typename TScalar, typename TFuncRetrun = TScalar, typename TFuncArg = const Eigen::VectorX<TScalar>&>
+    using IntegrateFunc = std::function<Eigen::VectorX<TFuncRetrun>(TFuncArg, TFuncArg)>;
 
     template<typename TScalar, typename TFuncRetrun = TScalar>
     inline TFuncRetrun GaussianQuadrature2D(const IntegrateFunc<TScalar, TFuncRetrun>& func,
diff --git a/LibTrussSolver/src/CSTriangle.cpp b/LibTrussSolver/src/CSTriangle.cpp
@@ -21,7 +21,6 @@ namespace Truss::Element
                            (LeftNode->X * (RightNode->Y - TopNode->Y) +
                             RightNode->X * (TopNode->Y - LeftNode->Y) +
                             TopNode->X * (LeftNode->Y - RightNode->Y)));
-        assert(area > 0);
         return area;
     }
 
diff --git a/LibTrussSolver/src/Quad4.cpp b/LibTrussSolver/src/Quad4.cpp
@@ -1,10 +1,10 @@
-#include "Truss/Element/CSQuad.hpp"
+#include "Truss/Element/Quad4.hpp"
 #include "Truss/Common/Resources.hpp"
 #include "Truss/Utils/GaussianQuadrature.hpp"
 
 namespace Truss::Element
 {
-    void CSQuad::Build(Resources& resources)
+    void Quad4::Build(Resources& resources)
     {
         Node1 = &resources.Nodes.at(Node1Key);
         Node2 = &resources.Nodes.at(Node2Key);
@@ -14,34 +14,35 @@ namespace Truss::Element
         Section = std::static_pointer_cast<Section::Section_CSQuad>(section).get();
     }
 
-    std::vector<ID> CSQuad::GetNodeIds() const
+    std::vector<ID> Quad4::GetNodeIds() const
     {
         return {Node1->Id, Node2->Id, Node3->Id, Node4->Id};
     }
 
-    MatrixX<Numeric> CSQuad::GetStiffnessGlobal() const
+    MatrixX<Numeric> Quad4::GetStiffnessGlobal() const
     {
         return {};
     }
 
-    StressVector CSQuad::CalculateStress(const VectorX<Numeric>& displacement) const
+    StressVector Quad4::CalculateStress(const VectorX<Numeric>& displacement) const
     {
         return {};
     }
 
-    MatrixX<Numeric> CSQuad::GetStiffnessLocal() const
+    MatrixX<Numeric> Quad4::GetStiffnessLocal() const
     {
         // TODO: integrate B^TScalar D B
         return {};
     }
 
-    Eigen::Matrix<Numeric, 3, 24> CSQuad::GetBMatrix() const
+    Eigen::Matrix<Numeric, 3, 24> Quad4::GetBMatrix(const VectorX<Numeric>& x, const VectorX<Numeric>& y) const
     {
-        // TODO: is a function about x,y
+        Eigen::Matrix<Numeric, 3, 24> result = Eigen::Matrix<Numeric, 3, 24>::Zero();
+        //result(Eigen::all, {0, 1}) <<
         return {};
     }
 
-    Matrix3x3<Numeric> CSQuad::GetDMatrix() const
+    Matrix3x3<Numeric> Quad4::GetDMatrix() const
     {
         Numeric v = Section->Mat->PoissonRation;
         Numeric E = Section->Mat->YoungsModules;
diff --git a/Tools/K2TrussConverter/K2Truss.cpp b/Tools/K2TrussConverter/K2Truss.cpp
@@ -18,9 +18,9 @@ using namespace Truss::Tools;
 
 int main(int argc, char* argv[])
 {
-    if (argc < 2)
+    if (argc < 3)
     {
-        cout << "Usage: " << argv[0] << " <kdoc file>" << endl;
+        cout << "Usage: K2Truss <input.k> <output.truss>" << endl;
         return 1;
     }
 
@@ -32,21 +32,35 @@ int main(int argc, char* argv[])
             cout << "Failed to open file: " << argv[1] << endl;
             return 1;
         }
+        ofstream ofs(argv[2]);
+        if (!ofs.is_open())
+        {
+            cout << "Failed to open file: " << argv[2] << endl;
+            return 1;
+        }
+
         string kdoc((istreambuf_iterator<char>(ifs)), istreambuf_iterator<char>());
         auto result = KDoc::Parse(kdoc);
+
+        auto tdoc = TrussDocument::Object();
+
         for (auto& doc: result)
         {
             if (doc.Keyword == "NODE")
             {
                 auto nodes = GetNodes(doc);
-                cout << nodes.ToString() << endl;
+                tdoc.Add("Node", nodes);
             }
             else if (doc.Keyword == "ELEMENT_SHELL")
             {
                 auto triangles = GetTriangles(doc);
-                cout << triangles.ToString() << endl;
+                tdoc.Add("Element", triangles);
             }
         }
+
+        ofs << tdoc.ToString() << endl;
+        cout << "Done." << endl;
+
     }
     catch (exception& e)
     {
diff --git a/TrussCLI/CMakeLists.txt b/TrussCLI/CMakeLists.txt
@@ -4,6 +4,7 @@ set(CMAKE_CXX_STANDARD 20)
 
 add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
 add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/bigobj>")
 
 ## FetchContent
 include(FetchContent)
diff --git a/TrussCLI/src/TrussCLI.cpp b/TrussCLI/src/TrussCLI.cpp
@@ -8,7 +8,7 @@
 #include "csv_to_string.hpp"
 #include "Csv/CsvWriter.hpp"
 #include <Eigen/Dense>
-#include <Truss/Element/CSTriangle.hpp>
+
 #include <Truss/Solver.hpp>
 #include <TrussDocument/TrussDocument.hpp>
 #include <backward.hpp>
@@ -86,7 +86,9 @@ int main(int argc, char* argv[])
         basic_output_file << K << endl;
         basic_output_file << "{F} = " << endl;
         basic_output_file << F << endl;
-        VectorXf D = K.colPivHouseholderQr().solve(F);
+        // VectorXf D = K.colPivHouseholderQr().solve(F);
+        // VectorXf D = K.fullPivLu().solve(F);
+        VectorXf D = K.bdcSvd(ComputeThinU | ComputeThinV).solve(F);
         basic_output_file << "{D} = " << endl;
         basic_output_file << D << endl;
 
@@ -124,6 +126,8 @@ int main(int argc, char* argv[])
             node_keys.segment(node_count, 8 - node_count).fill(-1);
             elements_csv_file << std::make_tuple(element->Key, element->GetElementName(), node_count, node_keys, stress);
         }
+
+        cout << "Done." << endl;
     }
     catch (const exception& exception)
     {
diff --git a/UnitTest/LibTrussSolver/test.cpp b/UnitTest/LibTrussSolver/test.cpp
@@ -279,7 +279,7 @@ TEST_CASE("Utils", "[Utils]")
         Eigen::Matrix<float, 4, 2> vertices;
         vertices << 0, 0, 5, -1, 4, 5, 1, 4;
         auto result1 = GaussianQuadrature2D(func, vertices, GaussianPoint2D::One);
-        // requires all element of result1 is 20
+
         for (float element: Eigen::Vector<float, 9>(result1.reshaped(9, 1)))
         {
             REQUIRE(element == Catch::Approx(20.0f));

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace Truss::Element`
`7`	`7`	`{`
`8`		`- class CSQuad : public ElementBase`
	`8`	`+ class Quad4 : public ElementBase`
`9`	`9`	`{`
`10`	`10`	`public:`
`11`	`11`	`bool IsConstantStrainTriangle{false};`
`@@ -20,11 +20,11 @@ namespace Truss::Element`
`20`	`20`	`Node* Node4{};`
`21`	`21`	`Section::Section_CSQuad* Section{};`
`22`	`22`
`23`		`- ~CSQuad() override = default;`
	`23`	`+ ~Quad4() override = default;`
`24`	`24`
`25`	`25`	`[[nodiscard]] constexpr std::string GetElementName() const noexcept override`
`26`	`26`	`{`
`27`		`- return "CSQuad";`
	`27`	`+ return "Quad4";`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`void Build(Resources& resources) override;`
`@@ -46,7 +46,7 @@ namespace Truss::Element`
`46`	`46`
`47`	`47`	`[[nodiscard]] std::vector<ID> GetNodeIds() const override;`
`48`	`48`
`49`		`- [[nodiscard]] Eigen::Matrix<Numeric, 3, 24> GetBMatrix() const;`
	`49`	`+ [[nodiscard]] Eigen::Matrix<Numeric, 3, 24> GetBMatrix(const VectorX<Numeric>& x, const VectorX<Numeric>& y) const;`
`50`	`50`
`51`	`51`	`[[nodiscard]] Matrix3x3<Numeric> GetDMatrix() const;`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ namespace Truss`
`120`	`120`	`}`
`121`	`121`
`122`	`122`
`123`		`- template<typename TScalar, typename TFuncRetrun = TScalar>`
`124`		`- using IntegrateFunc = std::function<Eigen::VectorX<TFuncRetrun>(const Eigen::VectorX<TScalar>&, const Eigen::VectorX<TScalar>&)>;`
	`123`	`+ template<typename TScalar, typename TFuncRetrun = TScalar, typename TFuncArg = const Eigen::VectorX<TScalar>&>`
	`124`	`+ using IntegrateFunc = std::function<Eigen::VectorX<TFuncRetrun>(TFuncArg, TFuncArg)>;`
`125`	`125`
`126`	`126`	`template<typename TScalar, typename TFuncRetrun = TScalar>`
`127`	`127`	`inline TFuncRetrun GaussianQuadrature2D(const IntegrateFunc<TScalar, TFuncRetrun>& func,`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ namespace Truss::Element`
`21`	`21`	`(LeftNode->X * (RightNode->Y - TopNode->Y) +`
`22`	`22`	`RightNode->X * (TopNode->Y - LeftNode->Y) +`
`23`	`23`	`TopNode->X * (LeftNode->Y - RightNode->Y)));`
`24`		`- assert(area > 0);`
`25`	`24`	`return area;`
`26`	`25`	`}`
`27`	`26`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-#include "Truss/Element/CSQuad.hpp"`
	`1`	`+#include "Truss/Element/Quad4.hpp"`
`2`	`2`	`#include "Truss/Common/Resources.hpp"`
`3`	`3`	`#include "Truss/Utils/GaussianQuadrature.hpp"`
`4`	`4`
`5`	`5`	`namespace Truss::Element`
`6`	`6`	`{`
`7`		`- void CSQuad::Build(Resources& resources)`
	`7`	`+ void Quad4::Build(Resources& resources)`
`8`	`8`	`{`
`9`	`9`	`Node1 = &resources.Nodes.at(Node1Key);`
`10`	`10`	`Node2 = &resources.Nodes.at(Node2Key);`
`@@ -14,34 +14,35 @@ namespace Truss::Element`
`14`	`14`	`Section = std::static_pointer_cast<Section::Section_CSQuad>(section).get();`
`15`	`15`	`}`
`16`	`16`
`17`		`- std::vector<ID> CSQuad::GetNodeIds() const`
	`17`	`+ std::vector<ID> Quad4::GetNodeIds() const`
`18`	`18`	`{`
`19`	`19`	`return {Node1->Id, Node2->Id, Node3->Id, Node4->Id};`
`20`	`20`	`}`
`21`	`21`
`22`		`- MatrixX<Numeric> CSQuad::GetStiffnessGlobal() const`
	`22`	`+ MatrixX<Numeric> Quad4::GetStiffnessGlobal() const`
`23`	`23`	`{`
`24`	`24`	`return {};`
`25`	`25`	`}`
`26`	`26`
`27`		`- StressVector CSQuad::CalculateStress(const VectorX<Numeric>& displacement) const`
	`27`	`+ StressVector Quad4::CalculateStress(const VectorX<Numeric>& displacement) const`
`28`	`28`	`{`
`29`	`29`	`return {};`
`30`	`30`	`}`
`31`	`31`
`32`		`- MatrixX<Numeric> CSQuad::GetStiffnessLocal() const`
	`32`	`+ MatrixX<Numeric> Quad4::GetStiffnessLocal() const`
`33`	`33`	`{`
`34`	`34`	`// TODO: integrate B^TScalar D B`
`35`	`35`	`return {};`
`36`	`36`	`}`
`37`	`37`
`38`		`- Eigen::Matrix<Numeric, 3, 24> CSQuad::GetBMatrix() const`
	`38`	`+ Eigen::Matrix<Numeric, 3, 24> Quad4::GetBMatrix(const VectorX<Numeric>& x, const VectorX<Numeric>& y) const`
`39`	`39`	`{`
`40`		`- // TODO: is a function about x,y`
	`40`	`+ Eigen::Matrix<Numeric, 3, 24> result = Eigen::Matrix<Numeric, 3, 24>::Zero();`
	`41`	`+ //result(Eigen::all, {0, 1}) <<`
`41`	`42`	`return {};`
`42`	`43`	`}`
`43`	`44`
`44`		`- Matrix3x3<Numeric> CSQuad::GetDMatrix() const`
	`45`	`+ Matrix3x3<Numeric> Quad4::GetDMatrix() const`
`45`	`46`	`{`
`46`	`47`	`Numeric v = Section->Mat->PoissonRation;`
`47`	`48`	`Numeric E = Section->Mat->YoungsModules;`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ using namespace Truss::Tools;`
`18`	`18`
`19`	`19`	`int main(int argc, char* argv[])`
`20`	`20`	`{`
`21`		`- if (argc < 2)`
	`21`	`+ if (argc < 3)`
`22`	`22`	`{`
`23`		`- cout << "Usage: " << argv[0] << " <kdoc file>" << endl;`
	`23`	`+ cout << "Usage: K2Truss <input.k> <output.truss>" << endl;`
`24`	`24`	`return 1;`
`25`	`25`	`}`
`26`	`26`
`@@ -32,21 +32,35 @@ int main(int argc, char* argv[])`
`32`	`32`	`cout << "Failed to open file: " << argv[1] << endl;`
`33`	`33`	`return 1;`
`34`	`34`	`}`
	`35`	`+ ofstream ofs(argv[2]);`
	`36`	`+ if (!ofs.is_open())`
	`37`	`+ {`
	`38`	`+ cout << "Failed to open file: " << argv[2] << endl;`
	`39`	`+ return 1;`
	`40`	`+ }`
	`41`	`+`
`35`	`42`	`string kdoc((istreambuf_iterator<char>(ifs)), istreambuf_iterator<char>());`
`36`	`43`	`auto result = KDoc::Parse(kdoc);`
	`44`	`+`
	`45`	`+ auto tdoc = TrussDocument::Object();`
	`46`	`+`
`37`	`47`	`for (auto& doc: result)`
`38`	`48`	`{`
`39`	`49`	`if (doc.Keyword == "NODE")`
`40`	`50`	`{`
`41`	`51`	`auto nodes = GetNodes(doc);`
`42`		`- cout << nodes.ToString() << endl;`
	`52`	`+ tdoc.Add("Node", nodes);`
`43`	`53`	`}`
`44`	`54`	`else if (doc.Keyword == "ELEMENT_SHELL")`
`45`	`55`	`{`
`46`	`56`	`auto triangles = GetTriangles(doc);`
`47`		`- cout << triangles.ToString() << endl;`
	`57`	`+ tdoc.Add("Element", triangles);`
`48`	`58`	`}`
`49`	`59`	`}`
	`60`	`+`
	`61`	`+ ofs << tdoc.ToString() << endl;`
	`62`	`+ cout << "Done." << endl;`
	`63`	`+`
`50`	`64`	`}`
`51`	`65`	`catch (exception& e)`
`52`	`66`	`{`
Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ TEST_CASE("Utils", "[Utils]")`
`279`	`279`	`Eigen::Matrix<float, 4, 2> vertices;`
`280`	`280`	`vertices << 0, 0, 5, -1, 4, 5, 1, 4;`
`281`	`281`	`auto result1 = GaussianQuadrature2D(func, vertices, GaussianPoint2D::One);`
`282`		`- // requires all element of result1 is 20`
	`282`	`+`
`283`	`283`	`for (float element: Eigen::Vector<float, 9>(result1.reshaped(9, 1)))`
`284`	`284`	`{`
`285`	`285`	`REQUIRE(element == Catch::Approx(20.0f));`