Changeset 27128

Timestamp:

07/01/22 13:38:19 (3 years ago)

Author:

caronlam

Message:

NEW: IntArrayInput class for int* inputs

Location:

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

Files:

• Inputs.cpp (modified) (4 diffs)
• Inputs.h (modified) (3 diffs)
• IntArrayInput.cpp (added)
• IntArrayInput.h (added)

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

@@ -24 +24 @@
 #include "./DatasetInput.h"
 #include "./ArrayInput.h"
+#include "./IntArrayInput.h"
 using namespace std;
 /*}}}*/
@@ -571 +572 @@
         input->GetArrayPtr(row,pvalues,pN);
 }/*}}}*/
+void Inputs::GetIntArrayPtr(int enum_in,int row,int** pvalues,int* pN){/*{{{*/
+
+        /*Get input id*/
+        int id = EnumToIndex(enum_in);
+
+        /*Create it if necessary*/
+        if(this->inputs[id]){
+                if(this->inputs[id]->ObjectEnum()!=IntArrayInputEnum) _error_(EnumToStringx(this->inputs[id]->ObjectEnum())<<" cannot return an int array");
+        }
+        else{
+                _error_("Input "<<EnumToStringx(enum_in)<<" not found");
+        }
+
+        /*Set input*/
+        IntArrayInput* input = xDynamicCast<IntArrayInput*>(this->inputs[id]);
+        input->GetArrayPtr(row,pvalues,pN);
+}/*}}}*/
 void Inputs::GetArray(int enum_in,int row,IssmDouble** pvalues,int* pN){/*{{{*/
 
@@ -586 +604 @@
         /*Set input*/
         ArrayInput* input = xDynamicCast<ArrayInput*>(this->inputs[id]);
+        input->GetArray(row,pvalues,pN);
+}/*}}}*/
+void Inputs::GetIntArray(int enum_in,int row,int** pvalues,int* pN){/*{{{*/
+
+        /*Get input id*/
+        int id = EnumToIndex(enum_in);
+
+        /*Create it if necessary*/
+        if(this->inputs[id]){
+                if(this->inputs[id]->ObjectEnum()!=IntArrayInputEnum) _error_(EnumToStringx(this->inputs[id]->ObjectEnum())<<" cannot return an int array");
+        }
+        else{
+                _error_("Input "<<EnumToStringx(enum_in)<<" not found");
+        }
+
+        /*Set input*/
+        IntArrayInput* input = xDynamicCast<IntArrayInput*>(this->inputs[id]);
         input->GetArray(row,pvalues,pN);
 }/*}}}*/
@@ -735 +770 @@
         input->SetInput(row,numlayers,values);
 }/*}}}*/
+void Inputs::SetIntArrayInput(int enum_in,int row,int* values,int numlayers){/*{{{*/
+
+        bool recreate = false;
+
+        /*Get input id*/
+        int id = EnumToIndex(enum_in);
+
+        /*Create it if necessary*/
+        if(this->inputs[id]){
+                if(this->inputs[id]->ObjectEnum()!=IntArrayInputEnum){
+                        delete this->inputs[id];
+                        recreate = true;
+                }
+        }
+        else{
+                recreate = true;
+        }
+
+        if(recreate){
+                this->inputs[id] = new IntArrayInput(this->numberofelements_local);
+        }
+
+        /*Set input*/
+        IntArrayInput* input = xDynamicCast<IntArrayInput*>(this->inputs[id]);
+        input->SetInput(row,numlayers,values);
+}/*}}}*/
 TransientInput* Inputs::SetDatasetTransientInput(int enum_in,int dataset_id,IssmDouble* times,int numtimes){/*{{{*/
 

issm/trunk-jpl/src/c/classes/Inputs/Inputs.h

@@ -11 +11 @@
 class DatasetInput;
 class ArrayInput;
+class IntArrayInput;
 class ControlInput;
 class Parameters;
@@ -56 +57 @@
                 void     GetInputsInterpolations(int* pnuminputs,int** pinterpolations,int** penum);
                 void             GetArray(int enum_in,int row,IssmDouble** pvalues,int* pN);
+                void             GetIntArray(int enum_in,int row,int** pvalues,int* pN);
                 void             GetArrayPtr(int enum_in,int row,IssmDouble** pvalues,int* pN);
+                void             GetIntArrayPtr(int enum_in,int row,int** pvalues,int* pN);
                 SegInput*       GetSegInput(int enum_type);
                 TriaInput*      GetTriaInput(int enum_type);
@@ -82 +85 @@
                 TransientInput* SetDatasetTransientInput(int enum_in,int id,IssmDouble* times,int numtimes);
                 void  SetArrayInput(int enum_in,int row,IssmDouble* layers,int numlayers);
+                void  SetIntArrayInput(int enum_in,int row,int* layers,int numlayers);
                 void  SetTriaControlInputGradient(int enum_in,int interpolation,int numindices,int* indices,IssmDouble* values);
                 void  SetTriaControlInputGradient(int enum_in,int interpolation,int numindices,int* indices,IssmDouble* values,int n);