Undid last commit and implemented better way of storing domain materi…

…al axes.

FEBioLib/input.cpp

@@ -96,12 +96,6 @@ void FEBioModel::print_parameter(FEParam& p, int level)
 				feLog("%s : %lg,%lg,%lg,%lg,%lg,%lg,%lg,%lg,%lg\n", sz, m(0,0), m(0,1), m(0,2), m(1,0), m(1,1), m(1,2), m(2,0), m(2,1), m(2,2));
 			}
 			break;
-		case FE_PARAM_QUAT:
-			{
-				quatd v = p.value<quatd>();
-				feLog("%s : %lg,%lg,%lg,%lg\n", sz, v.x, v.y, v.z, v.w);
-			}
-			break;
 		case FE_PARAM_TENS3DRS:
 			{
 				tens3drs m = p.value<tens3drs>();

FEBioXML/FileImport.cpp

@@ -671,41 +671,6 @@ bool FEFileSection::ReadParameter(XMLTag& tag, FEParameterList& pl, const char*
 		case FE_PARAM_TENS3DRS: value(tag, pp->value<tens3drs>()); break;
 		case FE_PARAM_STRING: value(tag, pp->cvalue()); break;
 		case FE_PARAM_STD_STRING: value(tag, pp->value<string>()); break;
-		case FE_PARAM_QUAT:
-		{
-			const char* sztype = tag.AttributeValue("type", true);
-			if (sztype == nullptr) sztype = "vector";
-			if (strcmp(sztype, "vector") == 0)
-			{
-				vec3d a(1,0,0), d(0,1,0);
-				if (tag.isleaf()) throw XMLReader::InvalidValue(tag);
-
-				++tag;
-				do {
-					if      (tag == "a") value(tag, a);
-					else if (tag == "d") value(tag, d);
-					++tag;
-				} while (!tag.isend());
-
-				mat3d Q(a, d);
-				pp->value<quatd>() = quatd(Q);
-			}
-			else if (strcmp(sztype, "mat3") == 0)
-			{
-				mat3d Q;
-				value(tag, Q);
-				pp->value<quatd>() = quatd(Q);
-			}
-			else if (strcmp(sztype, "quat") == 0)
-			{
-				double v[4] = { 0,0,0,1 };
-				int nr = tag.value(v, 4);
-				if (nr != 4) throw XMLReader::InvalidValue(tag);
-				pp->value<quatd>() = quatd(v[0], v[1], v[2], v[3]);
-			}
-			else throw XMLReader::InvalidAttributeValue(tag, "type");
-		}
-		break;
 		case FE_PARAM_DATA_ARRAY:
 		{
 			// get the surface map

FECore/FEDomain.cpp

@@ -33,7 +33,7 @@ SOFTWARE.*/
 //-----------------------------------------------------------------------------
 FEDomain::FEDomain(int nclass, FEModel* fem) : FEMeshPartition(nclass, fem)
 {
-
+	m_matAxis = nullptr;
 }
 
 //-----------------------------------------------------------------------------
@@ -55,6 +55,10 @@ void FEDomain::SetMatID(int mid)
 // determines how many integration points an element gets). 
 void FEDomain::CreateMaterialPointData()
 {
+	// This function is called before Init is called, so we need to do the 
+	// initialization of the mat_axis here.
+	if (m_matAxis) m_matAxis->Init();
+
 	FEMaterial* pmat = GetMaterial();
 	FEMesh* mesh = GetMesh();
 	if (pmat) ForEachElement([=](FEElement& el) {
@@ -66,7 +70,7 @@ void FEDomain::CreateMaterialPointData()
 		for (int k = 0; k < el.GaussPoints(); ++k)
 		{
 			FEMaterialPoint* mp = new FEMaterialPoint(pmat->CreateMaterialPointData());
-			mp->m_Q = m_matAxis;
+			mp->m_Q = (m_matAxis ? m_matAxis->operator()(*mp) : mat3d::identity());
 			mp->m_r0 = el.Evaluate(r, k);
 			mp->m_index = k;
 			el.SetMaterialPointData(mp, k);

FECore/FEDomain.h

@@ -28,6 +28,7 @@ SOFTWARE.*/
 
 #pragma once
 #include "FEMeshPartition.h"
+#include "FEMat3dValuator.h"
 
 // forward declaration of material class
 class FEMaterial;
@@ -90,5 +91,5 @@ class FECORE_API FEDomain : public FEMeshPartition
 	void UnpackLM(FEElement& el, const FEDofList& dof, vector<int>& lm);
 
 protected:
-	quatd	m_matAxis; // initial material axis
+	FEMat3dValuator* m_matAxis; // initial material axis
 };

FECore/FEParam.h

@@ -64,7 +64,6 @@ enum FEParamType {
 	FE_PARAM_MAT3D_MAPPED,
 	FE_PARAM_MAT3DS_MAPPED,
 	FE_PARAM_MATERIALPOINT,
-	FE_PARAM_QUAT
 };
 
 //-----------------------------------------------------------------------------

FECore/FEParameterList.cpp

@@ -369,7 +369,6 @@ FEParam* FEParamContainer::AddParameter(vec2d&                    v, const char*
 FEParam* FEParamContainer::AddParameter(vec3d&                    v, const char* sz) { return AddParameter(&v, FE_PARAM_VEC3D, 1, sz); }
 FEParam* FEParamContainer::AddParameter(mat3d&                    v, const char* sz) { return AddParameter(&v, FE_PARAM_MAT3D, 1, sz); }
 FEParam* FEParamContainer::AddParameter(mat3ds&                   v, const char* sz) { return AddParameter(&v, FE_PARAM_MAT3DS, 1, sz); }
-FEParam* FEParamContainer::AddParameter(quatd&                    v, const char* sz) { return AddParameter(&v, FE_PARAM_QUAT, 1, sz); }
 FEParam* FEParamContainer::AddParameter(FEParamDouble&            v, const char* sz) { return AddParameter(&v, FE_PARAM_DOUBLE_MAPPED, 1, sz); }
 FEParam* FEParamContainer::AddParameter(FEParamVec3&              v, const char* sz) { return AddParameter(&v, FE_PARAM_VEC3D_MAPPED, 1, sz); }
 FEParam* FEParamContainer::AddParameter(FEParamMat3d&             v, const char* sz) { return AddParameter(&v, FE_PARAM_MAT3D_MAPPED, 1, sz); }

FECore/FEParameterList.h

@@ -30,7 +30,6 @@ SOFTWARE.*/
 #include "vec2d.h"
 #include "vec3d.h"
 #include "mat3d.h"
-#include "quatd.h"
 #include <assert.h>
 #include <list>
 #include <memory>
@@ -167,7 +166,6 @@ class FECORE_API FEParamContainer
 	FEParam* AddParameter(vec3d&               v, const char* sz);
 	FEParam* AddParameter(mat3d&               v, const char* sz);
 	FEParam* AddParameter(mat3ds&              v, const char* sz);
-	FEParam* AddParameter(quatd&               v, const char* sz);
 	FEParam* AddParameter(FEParamDouble&       v, const char* sz);
 	FEParam* AddParameter(FEParamVec3&         v, const char* sz);
 	FEParam* AddParameter(FEParamMat3d&        v, const char* sz);

FECore/FEShellDomain.cpp

@@ -31,6 +31,10 @@ SOFTWARE.*/
 #include "FEMesh.h"
 #include "FEMaterial.h"
 
+BEGIN_FECORE_CLASS(FEShellDomain, FEDomain)
+	ADD_PROPERTY(m_matAxis, "mat_axis");
+END_FECORE_CLASS();
+
 //-----------------------------------------------------------------------------
 //! constructor
 FEShellDomain::FEShellDomain(FEModel* fem) : FEDomain(FE_DOMAIN_SHELL, fem)

FECore/FEShellDomain.h

@@ -75,6 +75,8 @@ class FECORE_API FEShellDomain : public FEDomain
 
 public:
 	void ForEachShellElement(std::function<void(FEShellElement& el)> f);
+
+	DECLARE_FECORE_CLASS();
 };
 
 //-----------------------------------------------------------------------------

FECore/FESolidDomain.cpp

@@ -34,7 +34,7 @@ SOFTWARE.*/
 #include "FEModel.h"
 
 BEGIN_FECORE_CLASS(FESolidDomain, FEDomain)
-	ADD_PARAMETER(m_matAxis, "mat_axis");
+	ADD_PROPERTY(m_matAxis, "mat_axis");
 END_FECORE_CLASS();
 
 //-----------------------------------------------------------------------------