Changeset 61

Timestamp:

04/27/09 10:48:29 (16 years ago)

Author:

Eric.Larour

Message:

Wrong solver_string instead of solverstring

File:

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

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

@@ -20 +20 @@
         /*intermediary: */
         int analysis_type;
-        char* solver_string=NULL;
+        char* solverstring=NULL;
         char* control_type=NULL;
         
@@ -42 +42 @@
         /*some parameters:*/
         femmodel->parameters->FindParam((void*)&analysis_type,"analysis_type");
-        femmodel->parameters->FindParam((void*)&solver_string,"solver_string");
+        femmodel->parameters->FindParam((void*)&solverstring,"solverstring");
         femmodel->parameters->FindParam((void*)&control_type,"control_type");
 
-        _printf_("%s\n","   Recover solution for this stiffness and right hand side: \n");
+        _printf_("%s\n","      recover solution for this stiffness and right hand side:");
         diagnostic_core_nonlinear(&u_g,&K_ff0,&K_fs0,inputs,femmodel);
         VecToMPISerial(&u_g_double,u_g); VecFree(&u_g);
 
-        _printf_("%s\n","   Buid Du, difference between observed velocity and model velocity:\n");
+        _printf_("%s\n","      buid Du, difference between observed velocity and model velocity:");
         Dux( &du_g, femmodel->elements,femmodel->nodes,femmodel->loads,femmodel->materials,u_g_double,u_g_obs, inputs,analysis_type);
 
-        _printf_("%s\n","   Reduce adjoint load from g-set to f-set:\n");
+        _printf_("%s\n","      reduce adjoint load from g-set to f-set:");
         Reduceloadfromgtofx(&du_f, du_g, femmodel->Gmn, K_fs0, femmodel->ys0, femmodel->nodesets);
         VecFree(&du_g);MatFree(&K_fs0);
 
-        _printf_("%s\n","   Solve for adjoint vector: \n");
-        Solverx(&lambda_f, K_ff0, du_f, NULL, solver_string);
+        _printf_("%s\n","      solve for adjoint vector:");
+        Solverx(&lambda_f, K_ff0, du_f, NULL, solverstring);
         VecFree(&du_f); MatFree(&K_ff0);
         
-        _printf_("%s\n","   Merge back to g set:\n");
+        _printf_("%s\n","      merge back to g set:");
         Mergesolutionfromftogx(&lambda_g, lambda_f,femmodel->Gmn,femmodel->ys0,femmodel->nodesets);
         VecFree(&lambda_f);
 
-        _printf_("%s\n","   Compute gradJ:\n");
+        _printf_("%s\n","      compute gradJ:");
         VecToMPISerial(&lambda_g_double,lambda_g);VecFree(&lambda_g);
 
@@ -71 +71 @@
         
         /*Free ressources:*/
-        xfree((void**)&solver_string);
+        xfree((void**)&solverstring);
         xfree((void**)&control_type);
         xfree((void**)&u_g_double);