Changeset 2033 for issm/trunk/src/c/parallel/objectivefunctionC.cpp

Timestamp:

08/27/09 17:15:17 (16 years ago)

Author:

seroussi

Message:

fixed control stedy, but stokes not working yet

File:

• issm/trunk/src/c/parallel/objectivefunctionC.cpp (modified) (4 diffs)

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

@@ -41 +41 @@
         int     analysis_type;
         int     sub_analysis_type;
+        int     control_steady;
         Vec     u_g=NULL;
         Vec     u_g_full=NULL;
@@ -71 +72 @@
         femmodel->parameters->FindParam((void*)&analysis_type,"analysis_type");
         femmodel->parameters->FindParam((void*)&sub_analysis_type,"sub_analysis_type");
+        femmodel->parameters->FindParam((void*)&control_steady,"control_steady");
         femmodel->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
         femmodel->parameters->FindParam((void*)&numberofdofspernode,"numberofdofspernode");
@@ -88 +90 @@
         inputs->Add(control_type,param_g_copy,1,numberofnodes);
 
-        if (analysis_type==DiagnosticAnalysisEnum()){
+        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{
@@ -102 +105 @@
                 delete results_steadystate;
 
+                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);
+//              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);
         }
-
-        inputs->Add("velocity",u_g_double,numberofdofspernode,numberofnodes);
 
         //Compute misfit for this velocity field.