Changeset 18650

Timestamp:

10/15/14 15:21:34 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix balancethickness2

Location:

issm/trunk-jpl/src/c

Files:

• analyses/Balancethickness2Analysis.cpp (modified) (1 diff)
• cores/controlm1qn3_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp

@@ -82 +82 @@
         Input* omega_input = element->GetInput(BalancethicknessOmegaEnum); _assert_(omega_input);
         Input* D0_input    = element->GetInput(BalancethicknessD0Enum);
-        //if(!D0_input){
+        if(!D0_input){
                 this->CreateD0(element);
                 D0_input = element->GetInput(BalancethicknessD0Enum); _assert_(D0_input);
-        //}
+        }
 
         /* Start  looping on the number of gaussian points: */

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp

@@ -113 +113 @@
         }
 
-        /*Get solution*/
+        /*Constrain solution vector*/
+        IssmDouble  *XL = NULL;
+        IssmDouble  *XU = NULL;
+        GetVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
+        GetVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
+        if(num_controls!=1) _error_("not supported yet");
+        for(long i=0;i<n;i++){
+                X[i] = X[i]*scaling_factors[0];
+                if(X[i]>XU[i]) X[i]=XU[i];
+                if(X[i]<XL[i]) X[i]=XL[i];
+        }
         SetControlInputsFromVectorx(femmodel,X);
         ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);
@@ -130 +140 @@
         xDelete<double>(X);
         xDelete<double>(dz);
+        xDelete<double>(XU);
+        xDelete<double>(XL);
 }