Changeset 8386

Timestamp:

05/21/11 12:13:08 (14 years ago)

Author:

Mathieu Morlighem

Message:

trunk: more flexible GetVectorFromInput (input could be in material)

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (1 diff)
• Elements/Tria.cpp (modified) (1 diff)
• FemModel.cpp (modified) (1 diff)
• Inputs/ControlInput.cpp (modified) (1 diff)
• Inputs/ControlInput.h (modified) (1 diff)
• Materials/Material.h (modified) (1 diff)
• Materials/Matice.cpp (modified) (1 diff)
• Materials/Matice.h (modified) (1 diff)
• Materials/Matpar.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -3617 +3617 @@
 /*}}}*/
 /*FUNCTION Penta::GetVectorFromInputs{{{1*/
-void  Penta::GetVectorFromInputs(Vec vector,int NameEnum){
-
-        int i;
+void  Penta::GetVectorFromInputs(Vec vector,int input_enum){
+
         int doflist1[NUMVERTICES];
 
-        /*Find NameEnum input in the inputs dataset, and get it to fill in the vector: */
-        for(i=0;i<this->inputs->Size();i++){
-                Input* input=(Input*)this->inputs->GetObjectByOffset(i);
-                if(input->EnumType()==NameEnum){
-                        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
-                        this->GetDofList1(&doflist1[0]);
-                        input->GetVectorFromInputs(vector,&doflist1[0]);
-                        break;
-                }
-        }
+        /*Get out if this is not an element input*/
+        if (!IsInput(input_enum)) return;
+
+        /*Prepare index list*/
+        this->GetDofList1(&doflist1[0]);
+
+        /*Get input (either in element or material)*/
+        Input* input=inputs->GetInput(input_enum);
+        if(!input) _error_("Input %s not found in element",EnumToStringx(input_enum));
+
+        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
+        input->GetVectorFromInputs(vector,&doflist1[0]);
 }
 /*}}}*/

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -3176 +3176 @@
 /*}}}*/
 /*FUNCTION Tria::GetVectorFromInputs{{{1*/
-void  Tria::GetVectorFromInputs(Vec vector,int NameEnum){
+void  Tria::GetVectorFromInputs(Vec vector,int input_enum){
 
         int doflist1[NUMVERTICES];
 
-        /*Find NameEnum input in the inputs dataset, and get it to fill in the vector: */
-        for(int i=0;i<this->inputs->Size();i++){
-                Input* input=(Input*)this->inputs->GetObjectByOffset(i);
-                if(input->EnumType()==NameEnum){
-                        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
-                        this->GetDofList1(&doflist1[0]);
-                        input->GetVectorFromInputs(vector,&doflist1[0]);
-                        break;
-                }
-        }
+        /*Get out if this is not an element input*/
+        if (!IsInput(input_enum)) return;
+
+        /*Prepare index list*/
+        this->GetDofList1(&doflist1[0]);
+
+        /*Get input (either in element or material)*/
+        Input* input=inputs->GetInput(input_enum);
+        if(!input) _error_("Input %s not found in element",EnumToStringx(input_enum));
+
+        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
+        input->GetVectorFromInputs(vector,&doflist1[0]);
 }
 /*}}}*/

issm/trunk/src/c/objects/FemModel.cpp

@@ -131 +131 @@
         printf("     %i: %s\n",analysis_counter,EnumToStringx(analysis_type_list[analysis_counter]));
 
-
 }
 /*}}}*/

issm/trunk/src/c/objects/Inputs/ControlInput.cpp

@@ -396 +396 @@
         return gradient->SpawnResult(step,time);
 }/*}}}*/
+/*FUNCTION ControlInput::GetParameterValue(bool* pvalue){{{1*/
+void ControlInput::GetVectorFromInputs(Vec vector,int* doflist){
+        values->GetVectorFromInputs(vector,doflist);
+}/*}}}*/
 /*FUNCTION ControlInput::GetParameterAverage(double* pvalue){{{1*/
 void ControlInput::GetParameterAverage(double* pvalue){

issm/trunk/src/c/objects/Inputs/ControlInput.h

@@ -82 +82 @@
                 void Extrude(void);
                 void VerticallyIntegrate(Input* thickness_input);
-                void GetVectorFromInputs(Vec vector,int* doflist){_error_("not implemented yet");};
+                void GetVectorFromInputs(Vec vector,int* doflist);
                 void GetValuesPtr(double** pvalues,int* pnum_values){_error_("not implemented yet");};
                 ElementResult* SpawnGradient(int step, double time);

issm/trunk/src/c/objects/Materials/Material.h

@@ -22 +22 @@
                 virtual void   InputDuplicate(int original_enum,int new_enum)=0;
                 virtual void   Configure(Elements* elements)=0;
+                virtual void   GetVectorFromInputs(Vec vector,int input_enum)=0;
 
 };

issm/trunk/src/c/objects/Materials/Matice.cpp

@@ -224 +224 @@
         inputs->GetParameterAverage(&n,RheologyNEnum);
         return n;
+}
+/*}}}*/
+/*FUNCTION Matice::GetVectorFromInputs{{{1*/
+void  Matice::GetVectorFromInputs(Vec vector,int input_enum){
+
+        /*Intermediaries*/
+        Element *element= NULL;
+
+        /*Recover element*/
+        element=(Element*)helement->delivers();
+
+        /*Check that input_enum is a material input*/
+        if (!IsInput(input_enum)) return;
+
+        switch(element->Enum()){
+
+                case TriaEnum:
+
+                        /*Prepare index list*/
+                        int doflist1[3];
+                        for(int i=0;i<3;i++) doflist1[i]=((Tria*)element)->nodes[i]->GetVertexDof();
+
+                        /*Get input (either in element or material)*/
+                        Input* input=inputs->GetInput(input_enum);
+                        if(!input) _error_("Input %s not found in material",EnumToStringx(input_enum));
+
+                        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
+                        input->GetVectorFromInputs(vector,&doflist1[0]);
+                        break;
+
+                default: _error_("element %s not implemented yet",EnumToStringx(element->Enum()));
+        }
 }
 /*}}}*/

issm/trunk/src/c/objects/Materials/Matice.h

@@ -57 +57 @@
                 void   InputDuplicate(int original_enum,int new_enum);
                 void   Configure(Elements* elements);
+                void   GetVectorFromInputs(Vec vector,int input_enum);
                 /*}}}*/
                 /*Matice Numerics: {{{1*/

issm/trunk/src/c/objects/Materials/Matpar.h

@@ -64 +64 @@
                 void   InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");};
                 void   Configure(Elements* elements);
+                void   GetVectorFromInputs(Vec vector,int input_enum){return;}
                 /*}}}*/
                 /*Numerics: {{{1*/