Changeset 2217

Timestamp:

09/11/09 15:05:30 (16 years ago)

Author:

Mathieu Morlighem

Message:

removed steady state computation from objective functionC

File:

• issm/trunk/src/c/parallel/objectivefunctionC.cpp (modified) (1 diff)

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

@@ -90 +90 @@
         inputs->Add(control_type,param_g_copy,1,numberofnodes);
 
-        if (control_steady==0){
-                //Run diagnostic with updated parameters.
-                diagnostic_core_nonlinear(&u_g,NULL,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
-                VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
-                inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);
-        }
-        else{
-                //Run full steadystate solution with updated parameters.
-                results_steadystate=new DataSet(ResultsEnum());
-                steadystate_core(results_steadystate,model,inputs);
-                
-                //get u_g 
-                results_steadystate->FindResult(&u_g,"u_g");
-                delete results_steadystate;
+        /*Run diagnostic with updated parameters.*/
+        diagnostic_core_nonlinear(&u_g,NULL,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);
+        VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
+        inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);
 
-                VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
-                if(!isstokes){
-                        inputs->Add("velocity",u_g_double,3,numberofnodes);
-                }
-                else{
-                        inputs->Add("velocity",u_g_double,4,numberofnodes);
-                }
-                //extract the correct number of dofs (3 or 4)
-//              VecDuplicatePatch(&u_g_full,u_g);VecFree(&u_g);
-//              if(!isstokes){
-//                      xfree((void**)& dofset);
-//                      dofset=dofsetgen(2,dofs01,3,numberofnodes*3); 
-//                      VecPartition(&u_g, u_g_full, dofset, numberofnodes*2);
-//              }
-//              VecFree(&u_g_full);
-//              inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);
-        }
-
-        //Compute misfit for this velocity field. 
+        /*Compute misfit for this velocity field.*/
         inputs->Add("fit",fit[n]);
         Misfitx( &J, femmodel->elements,femmodel->nodes, femmodel->loads, femmodel->materials,