Changeset 1120

Timestamp:

06/26/09 10:43:55 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed control output velocity

Location:

issm/trunk/src/c

Files:

• ModelProcessorx/CreateDataSets.cpp (modified) (3 diffs)
• parallel/control.cpp (modified) (1 diff)
• parallel/control_core.cpp (modified) (2 diffs)
• shared/Dofs/DistributeNumDofs.cpp (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/CreateDataSets.cpp

@@ -39 +39 @@
                         CreateConstraintsDiagnosticVert(pconstraints,model,model_handle);
                         CreateLoadsDiagnosticVert(ploads,model,model_handle);
-                        CreateParametersControl(pparameters,model,model_handle);
 
                 }
@@ -97 +96 @@
                 CreateConstraintsSlopeCompute(pconstraints,model,model_handle);
                 CreateLoadsSlopeCompute(ploads,model,model_handle);
-                        
         
         }
@@ -127 +125 @@
         }
                         
-
-
-
-
-
 }

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

@@ -37 +37 @@
         double* u_g_initial=NULL;
         Param*  param=NULL;
-
 
         MODULEBOOT();

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

@@ -20 +20 @@
 
         /*Intermediary: */
+        DataSet* diagnostic_results=NULL;
         Vec     u_g=NULL;
         double  search_scalar;
@@ -138 +139 @@
         /*Write results to disk: */
         _printf_("%s\n","      preparing final velocity solution...");
+
+        /*Launch diagnostic with the last parameter distribution*/
         inputs->Add(control_type,param_g,1,numberofnodes);
-        inputs->Add("fit",fit[n]);
+        diagnostic_results=new DataSet(ResultsEnum()); 
+        diagnostic_core(diagnostic_results,fems, inputs);
 
-        /*Update parameters: */
-        UpdateFromInputsx(fem_dh->elements,fem_dh->nodes,fem_dh->loads, fem_dh->materials,inputs);
-
-        diagnostic_core_nonlinear(&u_g,NULL,NULL,fem_dh,inputs,analysis_type,sub_analysis_type);
+        //extract u_g from diagnostic_results, and erase diagnostic_results;
+        diagnostic_results->FindResult(&u_g,"u_g");
+        delete diagnostic_results;
 
         /*Plug results into output dataset: */

issm/trunk/src/c/shared/Dofs/DistributeNumDofs.cpp

@@ -17 +17 @@
         /*ok, according to analysis type: */
         if (analysis_type==ControlAnalysisEnum()){
-                numdofs=2;
+                if (sub_analysis_type==HorizAnalysisEnum()){
+                        numdofs=2;
+                }
+                else if (sub_analysis_type==VertAnalysisEnum()){
+                        numdofs=1;
+                }
+                else if (sub_analysis_type==StokesAnalysisEnum()){
+                        numdofs=4;
+                }
+                else if (sub_analysis_type==HutterAnalysisEnum()){
+                        numdofs=2;
+                }
         }
         else if (analysis_type==DiagnosticAnalysisEnum()){