Changeset 872

Timestamp:

06/09/09 16:37:18 (16 years ago)

Author:

Eric.Larour

Message:

Fixed parameter bug in control

Location:

issm/trunk/src/c/parallel

Files:

• OutputControl.cpp (modified) (2 diffs)
• control.cpp (modified) (2 diffs)

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

@@ -22 +22 @@
         Result*  result=NULL;
         int numberofnodes;
+        int gsize;
 
         /*recover numberofnodes: */
         fem->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
+        gsize=fem->nodesets->GetGSize();
 
         /*Initialize results*/
@@ -33 +35 @@
         results->AddObject(result);
 
-        result=new Result(results->Size()+1,0,1,"param_g",param_g,numberofnodes);
+        result=new Result(results->Size()+1,0,1,"param_g",param_g,gsize);
         results->AddObject(result);
 

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

@@ -151 +151 @@
                 ControlConstrainx( param_g,gsize,mincontrolconstraint,maxcontrolconstraint,control_type);
                 _printf_("%s\n","      done.");
-        
+
                 //some temporary saving 
                 if (((n+1)%5)==0){
@@ -157 +157 @@
                         inputs->Add(control_type,param_g,2,numberofnodes);
                         inputs->Add("fit",fit[n]);
+                        UpdateFromInputsx(femmodel.elements,femmodel.nodes,femmodel.loads, femmodel.materials,inputs);
                         diagnostic_core_nonlinear(&u_g,NULL,NULL,&femmodel,inputs,analysis_type,sub_analysis_type);
                         OutputControl(u_g,param_g,J,nsteps,&femmodel,outputfilename);