Changeset 27722

Timestamp:

05/04/23 10:53:45 (23 months ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing upper and lower bounds

Location:

issm/trunk-jpl/src/c

Files:

• classes/Params/ControlParam.cpp (modified) (1 diff)
• cores/controladm1qn3_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Params/ControlParam.cpp ¶

@@ -214 +214 @@
         /*Get list of ids for this element and this control*/
         _assert_(N==this->M); //FIXME
-        int*        idlist = xNew<int>(this->M);
+        int* idlist = xNew<int>(this->M);
+        for(int i=0;i<this->M;i++) idlist[i] = offset+i;
+
+        /*Get data*/
         IssmDouble* values = xNew<IssmDouble>(this->M);
-
-        for(int i=0;i<this->M;i++){
-                idlist[i] = offset+i;
-                values[i] = this->value[i];
-        }
-
+        GetParameterValue(&values, NULL, data);
+
+        /*Enter data in vector*/
         vector->SetValues(this->M,idlist,values,INS_VAL);
 

issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp ¶

@@ -234 +234 @@
         double  *XL = NULL;
         double  *XU = NULL;
-        if(IsParamEnum(control_enum[0])){
-                femmodel->parameters->FindControlParamAndMakePassive(&XL,NULL,control_enum[0],"lowerbound");
-                femmodel->parameters->FindControlParamAndMakePassive(&XU,NULL,control_enum[0],"upperbound");
-        }
-        else{
-                GetPassiveVectorFromControlInputsx(&XL,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
-                GetPassiveVectorFromControlInputsx(&XU,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
-        }
+        GetPassiveVectorFromControlInputsx(&XL,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
+        GetPassiveVectorFromControlInputsx(&XU,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
 
         int offset = 0;
@@ -656 +650 @@
         double  *XL = NULL;
         double  *XU = NULL;
-        if(IsParamEnum(control_enum[0])){
-                femmodel->parameters->FindControlParamAndMakePassive(&XL,NULL,control_enum[0],"lowerbound");
-                femmodel->parameters->FindControlParamAndMakePassive(&XU,NULL,control_enum[0],"upperbound");
-        }
-        else{
-                GetPassiveVectorFromControlInputsx(&XL,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
-                GetPassiveVectorFromControlInputsx(&XU,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
-        }
+        GetPassiveVectorFromControlInputsx(&XL,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
+        GetPassiveVectorFromControlInputsx(&XU,NULL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
 
    offset = 0;