Changeset 21895

Timestamp:

07/28/17 10:37:14 (8 years ago)

Author:

Mathieu Morlighem

Message:

NEW: Enables iomodel to read patches

Location:

issm/trunk-jpl/src/c

Files:

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

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

@@ -313 +313 @@
                 ComputeBasalMeltingrate(element);
         }
+
+        /*extrude inputs*/
         femmodel->parameters->SetParam(BasalforcingsGroundediceMeltingRateEnum,InputToExtrudeEnum);
         extrudefrombase_core(femmodel);

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

@@ -1518 +1518 @@
             xDelete<IssmDouble>(times);
         }
-        else _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
+        else if(M==iomodel->numberofelements){
+
+                          /*This is a Patch!*/
+                          xDelete<IssmDouble>(values);
+                          values = xNew<IssmDouble>(N);
+                          for(int j=0;j<N;j++) values[j]=vector[this->Sid()*N+j];
+
+                          if     (N==this->GetNumberOfNodes(P1Enum)   ) this->AddInput(vector_enum,values,P1Enum);
+                          else if(N==this->GetNumberOfNodes(P1xP3Enum)) this->AddInput(vector_enum,values,P1xP3Enum);
+                          else _error_("Patch interpolation not supported yet");
+
+                  }
+                  else{
+                          _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
+                  }
         
         xDelete<IssmDouble>(values);