Changeset 24483

Timestamp:

12/19/19 15:02:18 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allow patches to be read in ModelProcessor

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (1 diff)

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

@@ -1686 +1686 @@
                         for(int j=0;j<N;j++) values[j]=vector[this->Sid()*N+j];
 
-                        if     (N==this->GetNumberOfNodes(P1Enum)   ) this->AddInput2(vector_enum,values,P1Enum);
-                        else if(N==this->GetNumberOfNodes(P0Enum)   ) this->AddInput2(vector_enum,values,P0Enum);
-                        else if(N==this->GetNumberOfNodes(P1xP2Enum)) this->AddInput2(vector_enum,values,P1xP2Enum);
-                        else if(N==this->GetNumberOfNodes(P1xP3Enum)) this->AddInput2(vector_enum,values,P1xP3Enum);
-                        else _error_("Patch interpolation not supported yet");
+                        if (N==this->GetNumberOfNodes(P1Enum)){
+                                this->SetElementInput(inputs2,NUM_VERTICES,vertexlids,values,vector_enum);
+                        }
+                        else if(N==this->GetNumberOfNodes(P0Enum)){
+                                this->SetElementInput(inputs2,vector_enum,values[0]);
+                        }
+                        else if(N==this->GetNumberOfNodes(P1xP2Enum)){ _assert_(this->ObjectEnum()==PentaEnum);
+                                inputs2->SetPentaInput(vector_enum,P1xP2Enum,this->lid,N,values);
+                        }
+                        else if(N==this->GetNumberOfNodes(P1xP3Enum)){ _assert_(this->ObjectEnum()==PentaEnum);
+                                inputs2->SetPentaInput(vector_enum,P1xP3Enum,this->lid,N,values);
+                        }
+                        else{
+                                _error_("Patch interpolation not supported yet");
+                        }
 
                 }