Merge pull request #345 from polyfem/FCR

Fixed Corotational Model
polyfem · Jun 6, 2024 · 5c6646e · 5c6646e
2 parents b4ce196 + bda9ec1
commit 5c6646e
Show file tree

Hide file tree

Showing 12 changed files with 2,358 additions and 6 deletions.
diff --git a/json-specs/input-spec.json b/json-specs/input-spec.json
@@ -1896,6 +1896,40 @@
         ],
         "doc": "Material Parameters including ID"
     },
+    {
+        "pointer": "/materials/*",
+        "type": "object",
+        "type_name": "FixedCorotational",
+        "required": [
+            "type",
+            "E",
+            "nu"
+        ],
+        "optional": [
+            "id",
+            "rho",
+            "phi",
+            "psi"
+        ],
+        "doc": "Material Parameters including ID"
+    },
+    {
+        "pointer": "/materials/*",
+        "type": "object",
+        "type_name": "FixedCorotational",
+        "required": [
+            "type",
+            "lambda",
+            "mu"
+        ],
+        "optional": [
+            "id",
+            "rho",
+            "phi",
+            "psi"
+        ],
+        "doc": "Material Parameters including ID"
+    },
     {
         "pointer": "/materials/*/type",
         "type": "string",
@@ -1916,7 +1950,8 @@
             "Laplacian",
             "Helmholtz",
             "Bilaplacian",
-            "AMIPS"
+            "AMIPS",
+            "FixedCorotational"
         ],
         "doc": "Type of material"
     },

diff --git a/src/polyfem/assembler/AssemblerUtils.cpp b/src/polyfem/assembler/AssemblerUtils.cpp
@@ -19,6 +19,7 @@
 #include <polyfem/assembler/SaintVenantElasticity.hpp>
 #include <polyfem/assembler/Stokes.hpp>
 #include <polyfem/assembler/ViscousDamping.hpp>
+#include <polyfem/assembler/FixedCorotational.hpp>
 
 #include <polyfem/utils/JSONUtils.hpp>
 #include <polyfem/utils/Logger.hpp>
@@ -93,6 +94,8 @@ namespace polyfem
 
 			else if (formulation == "AMIPS")
 				return std::make_shared<AMIPSEnergy>();
+			else if (formulation == "FixedCorotational")
+				return std::make_shared<FixedCorotational>();
 
 			log_and_throw_error("Inavalid assembler name {}", formulation);
 		}

diff --git a/src/polyfem/assembler/CMakeLists.txt b/src/polyfem/assembler/CMakeLists.txt
@@ -65,6 +65,8 @@ set(SOURCES
 	PressureAssembler.hpp
 	PeriodicBoundary.cpp
 	PeriodicBoundary.hpp
+	FixedCorotational.hpp
+	FixedCorotational.cpp
 )
 
 source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" PREFIX "Source Files" FILES ${SOURCES})