diff --git a/NumLib/Fem/ShapeFunction/ShapeHex20.h b/NumLib/Fem/ShapeFunction/ShapeHex20.h
index c12d9c191274108fad00deccf4f8b639f04beb07..ef286f0391f3f29f58fea8be2b06a690828d9b47 100644
--- a/NumLib/Fem/ShapeFunction/ShapeHex20.h
+++ b/NumLib/Fem/ShapeFunction/ShapeHex20.h
@@ -41,8 +41,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Hex20;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeHex8.h b/NumLib/Fem/ShapeFunction/ShapeHex8.h
index c5687a8b4037d303b9fc8bee9477ec2d5639d7eb..af62371fc05ce6b84a2bc2e7e362d062c2048df8 100644
--- a/NumLib/Fem/ShapeFunction/ShapeHex8.h
+++ b/NumLib/Fem/ShapeFunction/ShapeHex8.h
@@ -59,8 +59,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Hex;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeLine2.h b/NumLib/Fem/ShapeFunction/ShapeLine2.h
index d7e6d1c99420c1a062a52149146c271c02b56c6d..03ca464a82a481de13f220f8cc1b51804ef6e465 100644
--- a/NumLib/Fem/ShapeFunction/ShapeLine2.h
+++ b/NumLib/Fem/ShapeFunction/ShapeLine2.h
@@ -45,8 +45,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Line;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeLine3.h b/NumLib/Fem/ShapeFunction/ShapeLine3.h
index 9ec778244b5be2b8dc8d274d34ed90bc7a253439..263eeb96f0ff923a54aa7d0780962094a99eb86c 100644
--- a/NumLib/Fem/ShapeFunction/ShapeLine3.h
+++ b/NumLib/Fem/ShapeFunction/ShapeLine3.h
@@ -40,8 +40,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Line3;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapePoint1.h b/NumLib/Fem/ShapeFunction/ShapePoint1.h
index 19fa28b72f3709a7b3a67e0b0d7397dcd4b02883..1244a19ac9cf1653b7e999b36b30c2682c49db8d 100644
--- a/NumLib/Fem/ShapeFunction/ShapePoint1.h
+++ b/NumLib/Fem/ShapeFunction/ShapePoint1.h
@@ -26,8 +26,8 @@ public:
     static void computeShapeFunction(const T_X& r, T_N& N);
 
     using MeshElement = MeshLib::Point;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 }
 
diff --git a/NumLib/Fem/ShapeFunction/ShapePrism15.h b/NumLib/Fem/ShapeFunction/ShapePrism15.h
index 74ca7670deb1d7b4400cb0f6d01f58e4d1b027d2..8a0bf6a09badc5e916fdab7876343f43fdc32c8f 100644
--- a/NumLib/Fem/ShapeFunction/ShapePrism15.h
+++ b/NumLib/Fem/ShapeFunction/ShapePrism15.h
@@ -41,8 +41,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Prism15;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapePrism6.h b/NumLib/Fem/ShapeFunction/ShapePrism6.h
index 42446668a238551bfea36b4f484fed1adaa6ea2b..8dd3adc498b94ff4a88ab65262873425213f5a73 100644
--- a/NumLib/Fem/ShapeFunction/ShapePrism6.h
+++ b/NumLib/Fem/ShapeFunction/ShapePrism6.h
@@ -41,8 +41,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Prism;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapePyra13.h b/NumLib/Fem/ShapeFunction/ShapePyra13.h
index 46bc13bea745f10c4863f97f026a1439c9ab846d..d2370d7d73f20a88d40ff0a7c908586da4e32f95 100644
--- a/NumLib/Fem/ShapeFunction/ShapePyra13.h
+++ b/NumLib/Fem/ShapeFunction/ShapePyra13.h
@@ -41,8 +41,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Pyramid13;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapePyra5.h b/NumLib/Fem/ShapeFunction/ShapePyra5.h
index 0238dfcc610d4a85dd02f5d3a60af42ac34a3629..5adb4d060edc94ff1239875486ee76f0038aa45e 100644
--- a/NumLib/Fem/ShapeFunction/ShapePyra5.h
+++ b/NumLib/Fem/ShapeFunction/ShapePyra5.h
@@ -41,8 +41,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Pyramid;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad4.h b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
index b35d3b755797a9f0363c14f6884fa19dc99fe9b3..3cc1e9f994faa24d6bde8ce572a2d1080954fd02 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad4.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad4.h
@@ -53,8 +53,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Quad;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad8.h b/NumLib/Fem/ShapeFunction/ShapeQuad8.h
index 626d1818fc51a3a6a782b52191c769620b1bf685..54e38f26b73b3b171900f9147b82e55e767f2ff0 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad8.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad8.h
@@ -40,8 +40,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Quad8;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeQuad9.h b/NumLib/Fem/ShapeFunction/ShapeQuad9.h
index f7d005583f694d929aeda9a4532ccdbb1ef0709c..8627b003c528608d85d5feed2679beb6b5ee6027 100644
--- a/NumLib/Fem/ShapeFunction/ShapeQuad9.h
+++ b/NumLib/Fem/ShapeFunction/ShapeQuad9.h
@@ -40,8 +40,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Quad9;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp b/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp
index 35e70b0b2c42535153aa4939701ed7d9d49c8bc9..9f1844694f6d6ddfe702b976e569c674b22417d0 100644
--- a/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp
+++ b/NumLib/Fem/ShapeFunction/ShapeStaticConsts.cpp
@@ -22,8 +22,8 @@
  * | sort \
  * | while read f; do
  *     c="${f%.h}";
- *     echo "const std::size_t $c::DIM;";
- *     echo "const std::size_t $c::NPOINTS;";
+ *     echo "const unsigned $c::DIM;";
+ *     echo "const unsigned $c::NPOINTS;";
  * done >ShapeStaticConsts.cpp
  * \endcode
  */
@@ -48,44 +48,44 @@
 namespace NumLib
 {
 
-const std::size_t ShapeHex20::DIM;
-const std::size_t ShapeHex20::NPOINTS;
-const std::size_t ShapeHex8::DIM;
-const std::size_t ShapeHex8::NPOINTS;
+const unsigned ShapeHex20::DIM;
+const unsigned ShapeHex20::NPOINTS;
+const unsigned ShapeHex8::DIM;
+const unsigned ShapeHex8::NPOINTS;
 
-const std::size_t ShapeLine2::DIM;
-const std::size_t ShapeLine2::NPOINTS;
-const std::size_t ShapeLine3::DIM;
-const std::size_t ShapeLine3::NPOINTS;
+const unsigned ShapeLine2::DIM;
+const unsigned ShapeLine2::NPOINTS;
+const unsigned ShapeLine3::DIM;
+const unsigned ShapeLine3::NPOINTS;
 
-const std::size_t ShapePoint1::DIM;
-const std::size_t ShapePoint1::NPOINTS;
+const unsigned ShapePoint1::DIM;
+const unsigned ShapePoint1::NPOINTS;
 
-const std::size_t ShapePrism15::DIM;
-const std::size_t ShapePrism15::NPOINTS;
-const std::size_t ShapePrism6::DIM;
-const std::size_t ShapePrism6::NPOINTS;
+const unsigned ShapePrism15::DIM;
+const unsigned ShapePrism15::NPOINTS;
+const unsigned ShapePrism6::DIM;
+const unsigned ShapePrism6::NPOINTS;
 
-const std::size_t ShapePyra13::DIM;
-const std::size_t ShapePyra13::NPOINTS;
-const std::size_t ShapePyra5::DIM;
-const std::size_t ShapePyra5::NPOINTS;
+const unsigned ShapePyra13::DIM;
+const unsigned ShapePyra13::NPOINTS;
+const unsigned ShapePyra5::DIM;
+const unsigned ShapePyra5::NPOINTS;
 
-const std::size_t ShapeQuad4::DIM;
-const std::size_t ShapeQuad4::NPOINTS;
-const std::size_t ShapeQuad8::DIM;
-const std::size_t ShapeQuad8::NPOINTS;
-const std::size_t ShapeQuad9::DIM;
-const std::size_t ShapeQuad9::NPOINTS;
+const unsigned ShapeQuad4::DIM;
+const unsigned ShapeQuad4::NPOINTS;
+const unsigned ShapeQuad8::DIM;
+const unsigned ShapeQuad8::NPOINTS;
+const unsigned ShapeQuad9::DIM;
+const unsigned ShapeQuad9::NPOINTS;
 
-const std::size_t ShapeTet10::DIM;
-const std::size_t ShapeTet10::NPOINTS;
-const std::size_t ShapeTet4::DIM;
-const std::size_t ShapeTet4::NPOINTS;
+const unsigned ShapeTet10::DIM;
+const unsigned ShapeTet10::NPOINTS;
+const unsigned ShapeTet4::DIM;
+const unsigned ShapeTet4::NPOINTS;
 
-const std::size_t ShapeTri3::DIM;
-const std::size_t ShapeTri3::NPOINTS;
-const std::size_t ShapeTri6::DIM;
-const std::size_t ShapeTri6::NPOINTS;
+const unsigned ShapeTri3::DIM;
+const unsigned ShapeTri3::NPOINTS;
+const unsigned ShapeTri6::DIM;
+const unsigned ShapeTri6::NPOINTS;
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeTet10.h b/NumLib/Fem/ShapeFunction/ShapeTet10.h
index 7d6a0634db1e8c8d394f0c4788a5cf9fc2f3ddfc..05d911f6d560e1501c534264a0eaeddddd23f961 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTet10.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTet10.h
@@ -41,8 +41,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Tet10;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeTet4.h b/NumLib/Fem/ShapeFunction/ShapeTet4.h
index 9de25cb74acbb4e5570bda2b7691dbd6af9c7c19..5e98d9cda97d1de772d3a27b7b26da9652528702 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTet4.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTet4.h
@@ -41,8 +41,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Tet;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeTri3.h b/NumLib/Fem/ShapeFunction/ShapeTri3.h
index adce859cde759eb96ea392b7e775b60f7adf5f28..b6ff40932ef9f8154db0a4e0f2811e5b40a5d6e7 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTri3.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTri3.h
@@ -54,8 +54,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Tri;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }
diff --git a/NumLib/Fem/ShapeFunction/ShapeTri6.h b/NumLib/Fem/ShapeFunction/ShapeTri6.h
index a72e991875d3f69ce56bcd6532b7d5e77e2c7f97..85cf009e91c7065252f58d2479799a3f05357b33 100644
--- a/NumLib/Fem/ShapeFunction/ShapeTri6.h
+++ b/NumLib/Fem/ShapeFunction/ShapeTri6.h
@@ -42,8 +42,8 @@ public:
     static void computeGradShapeFunction(const T_X &r, T_N &dN);
 
     using MeshElement = MeshLib::Tri6;
-    static const std::size_t DIM = MeshElement::dimension;
-    static const std::size_t NPOINTS = MeshElement::n_all_nodes;
+    static const unsigned DIM = MeshElement::dimension;
+    static const unsigned NPOINTS = MeshElement::n_all_nodes;
 };
 
 }