Changeset 27928

Timestamp:

09/29/23 08:53:29 (18 months ago)

Author:

Mathieu Morlighem

Message:

BUG: problem with one ParamControl, now fixed

Location:

issm/trunk-jpl/src/c/cores

Files:

• controladm1qn3_core.cpp (modified) (2 diffs)
• transient_core.cpp (modified) (2 diffs)

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

@@ -491 +491 @@
 
         /*Print info*/
-        _printf0_("f(x) = "<<setw(12)<<setprecision(7)<<*pf<<"  |  ");
-        _printf0_("       "<<setw(12)<<setprecision(7)<<Gnorm<<" |");
-        for(int i=0;i<num_responses;i++) _printf0_(" "<<setw(12)<<setprecision(7)<<Jlist[(*Jlisti)*JlistN+i]);
+        _printf0_(setw(4)<<*Jlisti<<" | ");
+        _printf0_("f(x) = "<<setw(8)<<setprecision(5)<<*pf<<" | ");
+        _printf0_("  "<<setw(8)<<setprecision(3)<<Gnorm<<" |");
+        for(int i=0;i<num_responses;i++) _printf0_(" "<<setw(10)<<setprecision(5)<<Jlist[(*Jlisti)*JlistN+i]);
         _printf0_("\n");
 
@@ -577 +578 @@
         if(VerboseControl())_printf0_("   Computing initial solution\n");
         _printf0_("\n");
-        _printf0_("Cost function f(x)   | Gradient norm |g(x)| |  List of contributions\n");
+        _printf0_("Iter |  Cost function  | Grad. norm |  List of contributions \n");
         _printf0_("____________________________________________________________________\n");
 

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

@@ -366 +366 @@
         /*Get X (control)*/
         IssmDouble *X = NULL; int Xsize;
-        if(IsParamEnum(control_enum[0])){
-                femmodel->parameters->FindControlParam(&X,NULL,control_enum[0],"value");
-                Xsize=M[0];
-        }
-        else{
-                GetVectorFromControlInputsx(&X,&Xsize,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value");
-        }
+        GetVectorFromControlInputsx(&X,&Xsize,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value");
+
         /*Initialize model state adjoint (Yb)*/
         double *Yb  = xNewZeroInit<double>(Ysize);
@@ -530 +525 @@
         xDelete<int>(Yin);
         xDelete<int>(control_enum);
-        xDelete<int>(M);
         return J.getValue();
 }/*}}}*/