Changeset 24360 for issm/trunk-jpl/src/c/classes/Inputs2/Inputs2.cpp

Timestamp:

11/19/19 16:40:16 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: almost done with Gemb

File:

• issm/trunk-jpl/src/c/classes/Inputs2/Inputs2.cpp (modified) (2 diffs)

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

@@ -232 +232 @@
         /*Make sure this parameter is at the right place*/
         #ifdef _ISSM_DEBUG_
-        if(enum_in<=InputsSTARTEnum) _error_("Enum "<<EnumToStringx(enum_in)<<" should appear after InputsSTARTEnum");
-        if(enum_in>=InputsENDEnum)   _error_("Enum "<<EnumToStringx(enum_in)<<" should appear before InputsENDEnum");
+        if(enum_in<=InputsSTARTEnum){
+                //int* temp = xNew<int>(3);
+                _error_("Enum "<<EnumToStringx(enum_in)<<" should appear after InputsSTARTEnum");
+        }
+        if(enum_in>=InputsENDEnum){
+                _error_("Enum "<<EnumToStringx(enum_in)<<" should appear before InputsENDEnum");
+        }
         #endif
         return enum_in - InputsSTARTEnum -1;
@@ -428 +433 @@
         return xDynamicCast<ControlInput2*>(input);
 }/*}}}*/
+void Inputs2::GetArray(int enum_in,int row,IssmDouble** pvalues,int* pN){/*{{{*/
+
+        /*Get input id*/
+        int id = EnumToIndex(enum_in);
+
+        /*Create it if necessary*/
+        if(this->inputs[id]){
+                if(this->inputs[id]->ObjectEnum()!=ArrayInput2Enum) _error_(EnumToStringx(this->inputs[id]->ObjectEnum())<<" cannot return an array");
+        }
+        else{
+                _error_("Input "<<EnumToStringx(enum_in)<<" not found");
+        }
+
+        /*Set input*/
+        ArrayInput2* input = xDynamicCast<ArrayInput2*>(this->inputs[id]);
+        input->GetArray(row,pvalues,pN);
+}/*}}}*/
 void Inputs2::GetInputValue(bool* pvalue,int enum_in,int index){/*{{{*/