Changeset 1212

Timestamp:

07/02/09 10:41:07 (16 years ago)

Author:

Mathieu Morlighem

Message:

cosmetics

File:

• issm/trunk/src/c/parallel/control_core.cpp (modified) (3 diffs)

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

@@ -100 +100 @@
 
         /*take care of Stokes: compute slope and get spc once for all*/
-        if (isstokes){
-                ControlPrepareStokes(fems,inputs);
-        }
+        if (isstokes) ControlPrepareStokes(fems,inputs);
 
         /*Start looping: */
@@ -112 +110 @@
 
                 /*Update parameters: */
-                if (isstokes){
-                        UpdateFromInputsx(fem_ds->elements,fem_ds->nodes,fem_ds->loads, fem_ds->materials,inputs);
-                }
-                else{
-                        UpdateFromInputsx(fem_dh->elements,fem_dh->nodes,fem_dh->loads, fem_dh->materials,inputs);
-                }
+                if (isstokes) UpdateFromInputsx(fem_ds->elements,fem_ds->nodes,fem_ds->loads, fem_ds->materials,inputs);
+                else UpdateFromInputsx(fem_dh->elements,fem_dh->nodes,fem_dh->loads, fem_dh->materials,inputs);
 
                 _printf_("%s\n","      computing gradJ...");
-                if (isstokes){
-                        grad_g=GradJCompute(inputs,fem_ds);
-                }
-                else{
-                        grad_g=GradJCompute(inputs,fem_dh);
-                }
+                if (isstokes) grad_g=GradJCompute(inputs,fem_ds);
+                else grad_g=GradJCompute(inputs,fem_dh);
                 _printf_("%s\n","      done.");
 
@@ -136 +126 @@
 
                 _printf_("%s\n","      optimizing along gradient direction...");
-                if (isstokes){
-                        optargs.femmodel=fem_ds;
-                }
-                else{
-                        optargs.femmodel=fem_dh;
-                }
+                if (isstokes) optargs.femmodel=fem_ds;
+                else optargs.femmodel=fem_dh;
                 optargs.param_g=param_g; optargs.grad_g=grad_g_double; optargs.inputs=inputs;optargs.n=n;
                 optpars.xmin=0; optpars.xmax=1; optpars.tolerance=tolx; optpars.maxiter=(int)maxiter[n];