source: issm/oecreview/Archive/24307-24683/ISSM-24343-24344.diff@ 24684

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

@@ -43 +43 @@
 /*}}}*/
 void BoolInput2::DeepEcho(void){/*{{{*/
 
-        //_printf_(setw(15)<<"   BoolInput2 "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<(value?"true":"false") << "\n");
-        _error_("Not implemented");
+        _printf_("BoolInput2 Echo:\n");
+        _printf_("   Size:          "<<size<<"\n");
+        printarray(this->values,this->size);
 }
 /*}}}*/
 void BoolInput2::Echo(void){/*{{{*/

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

@@ -245 +245 @@
         return false;
 }
 /*}}}*/
+int Inputs2::GetInputObjectEnum(int enum_in){/*{{{*/
+
+        _assert_(this);
+
+        int index = EnumToIndex(enum_in);
+        if(!this->inputs[index]) _error_("Input "<<EnumToStringx(enum_in)<<" not found");
+        return this->inputs[index]->ObjectEnum();
+}
+/*}}}*/
 void Inputs2::GetInputsInterpolations(int* pnuminputs,int** pinterpolations,int** pinputenums){/*{{{*/
 
         /*First count number of inputs*/

../trunk-jpl/src/c/classes/Inputs2/Inputs2.h

@@ -59 +59 @@
                 DatasetInput2*   GetDatasetInput2(int enum_type);
                 ControlInput2*   GetControlInput2(int enum_type);
                 void  Marshall(char** pmarshalled_data, int* pmarshalled_data_size, int marshall_direction);
+                int   GetInputObjectEnum(int enum_type);
                 void  GetInputValue(bool* pvalue,int enum_in,int index);
                 void  GetInputValue(int*  pvalue,int enum_in,int index);
                 void  ResultInterpolation(int* pinterpolation,int*nodesperelement,int* parray_size, int output_enum);

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

@@ -3281 +3281 @@
         }
 
         /*If this input is not already in Inputs, maybe it needs to be computed?*/
-        Input2* input2 = this->GetInput2(output_enum);
-        if(!input2) _error_("input "<<EnumToStringx(output_enum)<<" not found in element");
+        switch(this->inputs2->GetInputObjectEnum(output_enum)){
+                case TriaInput2Enum:
+                case PentaInput2Enum:{
+                        Input2* input2 = this->GetInput2(output_enum);
+                        if(!input2) _error_("input "<<EnumToStringx(output_enum)<<" not found in element");
+                        *pinterpolation   = input2->GetResultInterpolation();
+                        *pnodesperelement = input2->GetResultNumberOfNodes();
+                        *parray_size      = input2->GetResultArraySize();
+                        }
+                        break;
+                case BoolInput2Enum:
+                        *pinterpolation   = P0Enum;
+                        *pnodesperelement = 1;
+                        *parray_size      = 1;
+                        break;
+                default:
+                        _error_("Input type \""<<EnumToStringx(this->inputs2->GetInputObjectEnum(output_enum))<<"\" not supported yet");
+        }
 
+
         /*Assign output pointer*/
-        *pinterpolation   = input2->GetResultInterpolation();
-        *pnodesperelement = input2->GetResultNumberOfNodes();
-        *parray_size      = input2->GetResultArraySize();
+
         return;
 }/*}}}*/
 void       Element::ResultToPatch(IssmDouble* values,int nodesperelement,int output_enum){/*{{{*/
@@ -3310 +3325 @@
 } /*}}}*/
 void       Element::ResultToVector(Vector<IssmDouble>* vector,int output_enum){/*{{{*/
 
+        switch(this->inputs2->GetInputObjectEnum(output_enum)){
+                case TriaInput2Enum:
+                case PentaInput2Enum:{
 
-                Input2* input2=this->GetInput2(output_enum);
-                if(!input2) _error_("input "<<EnumToStringx(output_enum)<<" not found in element");
+                        Input2* input2 = this->GetInput2(output_enum);
+                        if(!input2) _error_("input "<<EnumToStringx(output_enum)<<" not found in element");
 
-                switch(input2->GetResultInterpolation()){
-                        case P0Enum:{
-                                                                IssmDouble  value;
-                                                                bool        bvalue;
-                                                                switch(input2->ObjectEnum()){
-                                                                        case BoolInputEnum:
-                                                                                (xDynamicCast<BoolInput2*>(input2))->GetInput(&bvalue,this->lid);
-                                                                                value=reCast<IssmDouble>(bvalue);
-                                                                                break;
-                                                                        default:
-                                                                                Gauss* gauss = this->NewGauss();
-                                                                                input2->GetInputValue(&value,gauss);
-                                                                                delete gauss;
-                                                                }
-                                                                vector->SetValue(this->Sid(),value,INS_VAL);
-                                                                break;
-                                                        }
-                        case P1Enum:{
-                                                                const int NUM_VERTICES = this->GetNumberOfVertices();
+                        switch(input2->GetResultInterpolation()){
+                                case P0Enum:{
+                                        IssmDouble  value;
+                                        bool        bvalue;
+                                        Gauss* gauss = this->NewGauss();
+                                        input2->GetInputValue(&value,gauss);
+                                        delete gauss;
+                                        vector->SetValue(this->Sid(),value,INS_VAL);
+                                        break;
+                                        }
+                                case P1Enum:{
+                                        const int NUM_VERTICES = this->GetNumberOfVertices();
 
-                                                                IssmDouble *values      = xNew<IssmDouble>(NUM_VERTICES);
-                                                                int        *connectivity= xNew<int>(NUM_VERTICES);
-                                                                int        *sidlist     = xNew<int>(NUM_VERTICES);
+                                        IssmDouble *values      = xNew<IssmDouble>(NUM_VERTICES);
+                                        int        *connectivity= xNew<int>(NUM_VERTICES);
+                                        int        *sidlist     = xNew<int>(NUM_VERTICES);
 
-                                                                this->GetVerticesSidList(sidlist);
-                                                                this->GetVerticesConnectivityList(connectivity);
-                                                                this->GetInputListOnVertices(values,output_enum);
-                                                                for(int i=0;i<NUM_VERTICES;i++) values[i] = values[i]/reCast<IssmDouble>(connectivity[i]);
+                                        this->GetVerticesSidList(sidlist);
+                                        this->GetVerticesConnectivityList(connectivity);
+                                        this->GetInputListOnVertices(values,output_enum);
+                                        for(int i=0;i<NUM_VERTICES;i++) values[i] = values[i]/reCast<IssmDouble>(connectivity[i]);
 
-                                                                vector->SetValues(NUM_VERTICES,sidlist,values,ADD_VAL);
+                                        vector->SetValues(NUM_VERTICES,sidlist,values,ADD_VAL);
 
-                                                                xDelete<IssmDouble>(values);
-                                                                xDelete<int>(connectivity);
-                                                                xDelete<int>(sidlist);
-                                                                break;
-                                                        }
-                        default:
-                                                 _error_("interpolation "<<EnumToStringx(input2->GetResultInterpolation())<<" not supported yet");
-                }
+                                        xDelete<IssmDouble>(values);
+                                        xDelete<int>(connectivity);
+                                        xDelete<int>(sidlist);
+                                        break;
+                                        }
+                                default:
+                                        _error_("interpolation "<<EnumToStringx(input2->GetResultInterpolation())<<" not supported yet");
+                                }
+                        }
+                        break;
+                case BoolInput2Enum:
+                        bool bvalue;
+                        this->GetInput2Value(&bvalue,output_enum);
+                        vector->SetValue(this->Sid(),reCast<IssmDouble>(bvalue),INS_VAL);
+                        break;
+                default:
+                        _error_("Input type \""<<EnumToStringx(this->inputs2->GetInputObjectEnum(output_enum))<<"\" not supported yet");
+        }
+
 } /*}}}*/
 void       Element::SetBoolInput(Inputs2* inputs2,int enum_in,bool value){/*{{{*/
 

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

@@ -193 +193 @@
         /*Call inputs method*/
         if(!this->inputs2){
                 int* temp = xNew<int>(3);
+                _error_("inputs2 not set");
         }
         _assert_(this->inputs2);
         switch(interpolation_enum){

../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -688 +688 @@
                         }
                 }
         }
-        basalelement->AddInput2(HydrologydcEplThicknessSubstepEnum,epl_thickness,basalelement->GetElementType());
+        element->AddBasalInput2(HydrologydcEplThicknessSubstepEnum,epl_thickness,basalelement->GetElementType());
 
         if(domaintype!=Domain2DhorizontalEnum){
                 basalelement->DeleteMaterials();