Changeset 4388

Timestamp:

07/01/10 11:17:36 (15 years ago)

Author:

Mathieu Morlighem

Message:

forgot to cast fit to an integer

Location:

issm/trunk/src/c/solutions

Files:

• control_core.cpp (modified) (1 diff)
• objectivefunctionC.cpp (modified) (3 diffs)

issm/trunk/src/c/solutions/control_core.cpp

@@ -90 +90 @@
                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
 
-                _printf_("%s","      updating parameter using optimized search scalar...");
+                _printf_("%s\n","      updating parameter using optimized search scalar...");
                 InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
 
-                _printf_("%s","      constraining the new distribution...");    
+                _printf_("%s\n","      constraining the new distribution...");    
                 InputControlConstrainx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,cm_min,cm_max);
                 
-                _printf_("%s","      save new parameter...");
+                _printf_("%s\n","      save new parameter...");
                 InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,ControlParameterEnum);
                 

issm/trunk/src/c/solutions/objectivefunctionC.cpp

@@ -37 +37 @@
         int     analysis_type;
         bool    control_steady;
+        bool  isstokes=false;
         bool    conserve_loads=true;
         
@@ -49 +50 @@
         femmodel->parameters->FindParam(&cm_min,CmMinEnum);
         femmodel->parameters->FindParam(&cm_max,CmMaxEnum);
+        femmodel->parameters->FindParam(&isstokes,IsStokesEnum);
         femmodel->parameters->FindParam(&control_type,ControlTypeEnum);
         femmodel->parameters->FindParam(&control_steady,ControlSteadyEnum);
         femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+
+        /*set analysis type to compute velocity: */
+        if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum);
+        else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
 
         /*Use ControlParameterEnum input to  reinitialize our input parameter: */
@@ -67 +73 @@
 
         /*Compute misfit for this velocity field.*/
-        InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,fit[n],FitEnum);
+        InputUpdateFromConstantx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,(int)fit[n],FitEnum);
         CostFunctionx( &J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters);