Changeset 11317 for issm/trunk-jpl/src/c/objects/Elements/Penta.cpp

Timestamp:

02/03/12 13:50:06 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added 2 modules to make TAO work

File:

• issm/trunk-jpl/src/c/objects/Elements/Penta.cpp (modified) (2 diffs)

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

@@ -1607 +1607 @@
         this->results->AddObject((Object*)input->SpawnResult(step,time));
         #ifdef _HAVE_CONTROL_
-        if(input->ObjectEnum()==ControlInputEnum) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time));
+        if(input->ObjectEnum()==ControlInputEnum){
+                if(((ControlInput*)input)->gradient!=NULL) this->results->AddObject((Object*)((ControlInput*)input)->SpawnGradient(step,time));
+        }
         #endif
 
@@ -5129 +5131 @@
 }
 /*}}}*/
+/*FUNCTION Penta::GetVectorFromControlInputs{{{1*/
+void  Penta::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index){
+
+        int doflist1[NUMVERTICES];
+
+        /*Get out if this is not an element input*/
+        if(!IsInput(control_enum)) return;
+
+        /*Prepare index list*/
+        GradientIndexing(&doflist1[0],control_index);
+
+        /*Get input (either in element or material)*/
+        Input* input=inputs->GetInput(control_enum);
+        if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum));
+
+        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
+        input->GetVectorFromInputs(vector,&doflist1[0]);
+}
+/*}}}*/
+/*FUNCTION Penta::SetControlInputsFromVector{{{1*/
+void  Penta::SetControlInputsFromVector(double* vector,int control_enum,int control_index){
+
+        double  values[NUMVERTICES];
+        int     doflist1[NUMVERTICES];
+        Input  *input     = NULL;
+        Input  *new_input = NULL;
+
+        /*Get out if this is not an element input*/
+        if(!IsInput(control_enum)) return;
+
+        /*Prepare index list*/
+        GradientIndexing(&doflist1[0],control_index);
+
+        /*Get values on vertices*/
+        for (int i=0;i<NUMVERTICES;i++){
+                values[i]=vector[doflist1[i]];
+        }
+        new_input = new PentaP1Input(control_enum,values);
+
+
+        if(control_enum==MaterialsRheologyBbarEnum){
+                input=(Input*)matice->inputs->GetInput(control_enum); _assert_(input);
+        }
+        else{
+                input=(Input*)this->inputs->GetInput(control_enum);   _assert_(input);
+        }
+
+        if (input->ObjectEnum()!=ControlInputEnum){
+                _error_("input %s is not a ControlInput",EnumToStringx(control_enum));
+        }
+
+        ((ControlInput*)input)->SetInput(new_input);
+}
+/*}}}*/
 #endif