Changeset 24487

Timestamp:

12/19/19 15:46:27 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allow results to patch again

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (2 diffs)
• classes/Elements/Penta.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -507 +507 @@
                 element->AddInput2(WatercolumnEnum,watercolumns,finite_element);
         }
-        element->AddInput2(BasalforcingsGroundediceMeltingRateEnum,basalmeltingrates,finite_element);
+        element->AddInput2(BasalforcingsGroundediceMeltingRateEnum,basalmeltingrates,P1Enum);
 
         /*Clean up and return*/

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

@@ -3199 +3199 @@
                         break;
                 default:
-                        _error_("Input type \""<<EnumToStringx(this->inputs2->GetInputObjectEnum(output_enum))<<"\" not supported yet");
+                        _error_("Input type \""<<EnumToStringx(this->inputs2->GetInputObjectEnum(output_enum))<<"\" not supported yet (While trying to return "<<EnumToStringx(output_enum)<<")");
         }
 
@@ -3209 +3209 @@
 void       Element::ResultToPatch(IssmDouble* values,int nodesperelement,int output_enum){/*{{{*/
 
+        /*Find input*/
         Input2* input=this->GetInput2(output_enum);
         if(!input) _error_("input "<<EnumToStringx(output_enum)<<" not found in element");
 
-        _error_("not implemented yet ");
-        //input->ResultToPatch(values,nodesperelement,this->Sid());
+        /*Cast to ElementInput*/
+        if(input->ObjectEnum()!=TriaInput2Enum && input->ObjectEnum()!=PentaInput2Enum){
+                _error_("Input "<<EnumToStringx(output_enum)<<" is not an ElementInput2");
+        }
+        ElementInput2* element_input = xDynamicCast<ElementInput2*>(input);
+
+        /*Get Number of nodes and make sure that it is the same as the one provided*/
+        int numnodes = this->GetNumberOfNodes(element_input->GetInputInterpolationType());
+        _assert_(numnodes==nodesperelement);
+
+        /*Fill in arrays*/
+        for(int i=0;i<numnodes;i++) values[this->sid*numnodes + i] = element_input->element_values[i];
 
 } /*}}}*/

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

@@ -2491 +2491 @@
         }
         else{
-                _error_("interpolation "<<EnumToStringx(pentainput->GetInterpolation())<<" not implemented yet");
+                _error_("interpolation "<<EnumToStringx(pentainput->GetInterpolation())<<" not implemented yet (while trying to extrude "<<EnumToStringx(enum_type)<<")");
         }
 }