Changeset 27964

Timestamp:

10/12/23 10:02:15 (17 months ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing Josh's problem by initializing vector

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Penta.cpp (modified) (1 diff)
• Elements/Penta.h (modified) (1 diff)
• FemModel.cpp (modified) (1 diff)

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

@@ -3392 +3392 @@
         inputs->SetPentaInput(enum_in,P1Enum,numindices,indices,values);
 
+}
+/*}}}*/
+void       Penta::SetElementInput(int enum_in,IssmDouble value,int type){/*{{{*/
+
+        if(type==P0Enum){
+                this->inputs->SetPentaInput(enum_in,P0Enum,this->lid,value);
+        }
+        else if(type==P1Enum){
+                IssmDouble values[6]; 
+                for(int i=0;i<6;i++)values[i]=value;
+                int lidlist[6];
+                this->GetVerticesLidList(&lidlist[0]);
+                this->inputs->SetPentaInput(enum_in,P1Enum,6,&lidlist[0],&values[0]);
+        }
+        else _error_("interpolation type not supported yet");
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -176 +176 @@
                 void           ResetHooks();
                 void           SetElementInput(int enum_in,IssmDouble value);
-                void           SetElementInput(int enum_in,IssmDouble value,int type){_error_("not implemented yet");};
+                void           SetElementInput(int enum_in,IssmDouble value,int type);
                 void           SetElementInput(Inputs* inputs,int enum_in,IssmDouble value);
                 void           SetElementInput(Inputs* inputs,int enum_in,IssmDouble value,int type){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -2546 +2546 @@
                                                         InputDuplicatex(this,DamageDbarEnum,DamageDbarOldEnum);
                                                         this->ElementOperationx(&Element::ComputeNewDamage);
+                                                }
+                                                else if(output_enum==FrictionAlpha2Enum){
+                                                        for(Object* & object : this->elements->objects){
+                                                                Element* element=xDynamicCast<Element*>(object);
+                                                                element->SetElementInput(FrictionAlpha2Enum,0.,P1Enum);
+                                                        }
+                                                        this->ElementOperationx(&Element::FrictionAlpha2CreateInput);
                                                 }