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

Timestamp:

05/15/10 19:36:18 (15 years ago)

Author:

Eric.Larour

Message:

Final build that compiles in serial and parallel model

File:

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

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

@@ -5 +5 @@
 #include "../modules.h"
 #include "./parallel.h"
+#include "../EnumDefinitions/EnumDefinitions.h"
 
 #ifdef HAVE_CONFIG_H
@@ -25 +26 @@
         double* param_g=NULL;
         double* grad_g=NULL;
-        ParameterInputs* inputs=NULL;
         int numberofdofspernode;
         int n;
@@ -35 +35 @@
         double  cm_min;
         double  cm_max;
-        char*   control_type=NULL;
+        int   control_type;
         double* param_g_copy=NULL;
         int     analysis_type;
@@ -43 +43 @@
         Vec     u_g_full=NULL;
         double* u_g_double=NULL;
+        double* vx=NULL;
+        double* vy=NULL;
+        double* vz=NULL;
         int     numberofnodes;
                 
@@ -59 +62 @@
         param_g=optargs->param_g;
         grad_g=optargs->grad_g;
-        inputs=optargs->inputs;
         n=optargs->n;
 
         gsize=femmodel->nodesets->GetGSize();
         femmodel->parameters->FindParam(&optscal,NULL,NULL,OptScalEnum);
-        femmodel->parameters->FindParam(&control_type,ControlTypeEnum);
         femmodel->parameters->FindParam(&fit,NULL,NULL,FitEnum);
         femmodel->parameters->FindParam(&cm_min,CmMinEnum);
@@ -87 +88 @@
 
         /*Add new parameter to inputs: */
-        inputs->Add(control_type,param_g_copy,1,numberofnodes);
+        femmodel->UpdateInputsFromVector(param_g_copy,control_type,VertexEnum);
 
         /*Run diagnostic with updated parameters.*/
         if(!control_steady){
-                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);
+                diagnostic_core_nonlinear(&u_g,NULL,NULL,NULL,femmodel,DiagnosticAnalysisEnum,sub_analysis_type); 
+                femmodel->UpdateInputsFromSolution(u_g,DiagnosticAnalysisEnum,sub_analysis_type);
+                VecFree(&u_g);
         }
         else{
                 //We need a 3D velocity!! (vz is required for the next thermal run)
                 diagnostic_results=new DataSet(ResultsEnum); 
-                diagnostic_core(diagnostic_results,model, inputs);
+                diagnostic_core(diagnostic_results,model);
 
                 //extract u_g and add it to input (3d velocity needed by thermal_core)
                 diagnostic_results->FindResult(&u_g,"u_g");
-                inputs->Add("velocity",u_g,3,numberofnodes);
+                
+                SplitSolutionVector(u_g,numberofnodes,3,&vx,&vy,&vz);
+                femmodel->UpdateInputsFromVector(vx,VxEnum,VertexEnum);
+                femmodel->UpdateInputsFromVector(vy,VxEnum,VertexEnum);
+                femmodel->UpdateInputsFromVector(vz,VxEnum,VertexEnum);
+                
                 delete diagnostic_results;
         }
 
         /*Compute misfit for this velocity field.*/
-        inputs->Add("fit",fit[n]);
-        CostFunctionx( &J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters,inputs,analysis_type,sub_analysis_type);
+        femmodel->UpdateInputsFromConstant(fit[n],FitEnum);
+        CostFunctionx( &J, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters,analysis_type,sub_analysis_type);
 
         /*Free ressources:*/
         xfree((void**)&fit);
         xfree((void**)&optscal);
-        xfree((void**)&control_type);
         xfree((void**)&param_g_copy);
-        xfree((void**)&u_g_double);
         xfree((void**)&dofset);
+        xfree((void**)&vx);
+        xfree((void**)&vy);
+        xfree((void**)&vz);
 
         return J;