Changeset 24357

Timestamp:

11/19/19 14:15:23 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing tria input serve for higher order interpolation

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.cpp (modified) (1 diff)
• Tria.cpp (modified) (1 diff)

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

@@ -4020 +4020 @@
 
         /*Save generated inputs: */
-        _error_("Fix this mess");
-        this->AddInput(new DoubleArrayInput(SmbDzEnum,dz,m));
-        this->AddInput(new DoubleArrayInput(SmbDEnum,d,m));
-        this->AddInput(new DoubleArrayInput(SmbReEnum,re,m));
-        this->AddInput(new DoubleArrayInput(SmbGdnEnum,gdn,m));
-        this->AddInput(new DoubleArrayInput(SmbGspEnum,gsp,m));
-        this->AddInput(new DoubleArrayInput(SmbTEnum,T,m));
-        this->AddInput(new DoubleInput(SmbECEnum,sumEC/dt/rho_ice));
-        this->AddInput(new DoubleArrayInput(SmbWEnum,W,m));
-        this->AddInput(new DoubleArrayInput(SmbAEnum,a,m));
+        this->inputs2->SetArrayInput(SmbDzEnum,this->lid,dz,m);
+        this->inputs2->SetArrayInput(SmbDEnum,this->lid,d,m);
+        this->inputs2->SetArrayInput(SmbReEnum,this->lid,re,m);
+        this->inputs2->SetArrayInput(SmbGdnEnum,this->lid,gdn,m);
+        this->inputs2->SetArrayInput(SmbGspEnum,this->lid,gsp,m);
+        this->inputs2->SetArrayInput(SmbTEnum,this->lid,T,m);
+        this->inputs2->SetArrayInput(SmbWEnum,this->lid,W,m);
+        this->inputs2->SetArrayInput(SmbAEnum,this->lid,a,m);
+        this->inputs2->SetArrayInput(SmbAEnum,this->lid,a,m);
+        this->SetElementInput(SmbECEnum,sumEC/dt/rho_ice);
         this->SetElementInput(SmbMassBalanceEnum,(sumP + sumEC -sumR)/dt/rho_ice);
         this->SetElementInput(SmbMeltEnum,sumM/dt/rho_ice);

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

@@ -2021 +2021 @@
                                 input->Serve(this->lid,numindices);
                                 break;
-                        default: _error_("interpolation "<<EnumToStringx(interpolation)<<" not supported");
+                        default:
+                                input->Serve(this->lid,this->GetNumberOfNodes(interpolation));
+                                break;
                 }
                 return;