Changeset 320

Timestamp:

05/08/09 11:58:37 (16 years ago)

Author:

Mathieu Morlighem

Message:

First fixing in CM

File:

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

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

@@ -90 +90 @@
         femmodel.parameters->FindParam((void*)&mincontrolconstraint,"mincontrolconstraint");
         femmodel.parameters->FindParam((void*)&maxcontrolconstraint,"maxcontrolconstraint");
-        femmodel.parameters->FindParam((void*)&gsize,"gsize");
         femmodel.parameters->FindParam((void*)&p_g,"p_g");
         femmodel.parameters->FindParam((void*)&u_g_obs,"u_g_obs");
+        gsize=femmodel.nodes->NumberOfDofs();
 
         /*Initialize misfit: */
@@ -98 +98 @@
 
         /*Initialize inputs:*/
-        
         femmodel.parameters->FindParam((void*)&u_g_initial,"u_g");
         femmodel.parameters->FindParam((void*)&numberofnodes,"numberofnodes");
@@ -123 +122 @@
                 inputs->Add("fit",fit[n]);
 
+                /*Update parameters: */
+                UpdateFromInputsx(femmodel.elements,femmodel.nodes,femmodel.loads, femmodel.materials,inputs);
+
                 _printf_("%s\n","      computing gradJ...");
                 grad_g=GradJCompute(inputs,&femmodel,u_g_obs);
                 _printf_("%s\n","      done.");
                         
-                
                 _printf_("%s\n","      normalizing directions...");
                 Orthx(&new_grad_g,grad_g,grad_g_old);
@@ -134 +135 @@
                 VecToMPISerial(&grad_g_double,grad_g);
                 _printf_("%s\n","      done.");
-
         
                 _printf_("%s\n","      optimizing along gradient direction...");
@@ -170 +170 @@
         inputs->Add(control_type,p_g,2,numberofnodes);
         inputs->Add("fit",fit[n]);
+
+        /*Update parameters: */
+        UpdateFromInputsx(femmodel.elements,femmodel.nodes,femmodel.loads, femmodel.materials,inputs);
         
         diagnostic_core_nonlinear(&u_g,NULL,NULL,inputs,&femmodel);
@@ -188 +191 @@
         PetscFinalize(); 
 
-
         /*end module: */
         MODULEEND();