Changeset 13301 for issm/trunk-jpl/src/c/modules/AutodiffDriversx/AutodiffDriversx.cpp

Timestamp:

09/07/12 16:40:22 (13 years ago)

Author:

Eric.Larour

Message:

CHG: some reformatting, minor

File:

• issm/trunk-jpl/src/c/modules/AutodiffDriversx/AutodiffDriversx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/AutodiffDriversx/AutodiffDriversx.cpp

@@ -24 +24 @@
         double     **J    = NULL;
         double      *xp   = NULL;
+                
+        /*diverse: */
+        int configuration_type;
+        int solveSize;
+        int edf_n,edf_m;
 
         /*AD mode on?: */
@@ -48 +53 @@
                 }
 
-                // get the dimension for the solverx arguments
-                int configuration_type;
+                /* get the dimension for the solverx arguments*/
                 parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-                int solveSize=nodes->NumberOfDofs(configuration_type,FsetEnum);
-                int edf_n=solveSize*(solveSize+1), edf_m=solveSize;
-                // get the EDF pointer:
+                solveSize=nodes->NumberOfDofs(configuration_type,FsetEnum);
+                edf_n=solveSize*(solveSize+1), edf_m=solveSize;
+
+                /*get the EDF pointer:*/
                 ext_diff_fct *anEDF_for_solverx_p=dynamic_cast<GenericParam<Adolc_edf> * >(parameters->FindParamObject(AdolcParamEnum))->GetParameterValue().myEDF_for_solverx_p;
-                // set the forward method function pointers
+                
+                /*set the forward method function pointers: */
                 anEDF_for_solverx_p->fos_forward=EDF_fos_forward_for_solverx;
-                anEDF_for_solverx_p->fov_forward=EDF_fov_forward_for_solverx;
-                // allocate the space for the parameters to invoke the forward methods
+                anEDF_for_solverx_p->fov_forward=EDF_fov_forward_for_solverx;
+
+                /*allocate the space for the parameters to invoke the forward methods:*/
                 anEDF_for_solverx_p->dp_x=xNew<double>(edf_n);
-                anEDF_for_solverx_p->dp_X=xNew<double>(edf_n);
-                anEDF_for_solverx_p->dpp_X=xNew<double>(edf_n, num_independents);
-                anEDF_for_solverx_p->dp_y=xNew<double>(edf_m);
-                anEDF_for_solverx_p->dp_Y=xNew<double>(edf_m);
-                anEDF_for_solverx_p->dpp_Y=xNew<double>(edf_m, num_independents);
-                // Call AD driver:
+                anEDF_for_solverx_p->dp_X=xNew<double>(edf_n);
+                anEDF_for_solverx_p->dpp_X=xNew<double>(edf_n, num_independents);
+                anEDF_for_solverx_p->dp_y=xNew<double>(edf_m);
+                anEDF_for_solverx_p->dp_Y=xNew<double>(edf_m);
+                anEDF_for_solverx_p->dpp_Y=xNew<double>(edf_m, num_independents);
+
+                /* Call AD driver:*/
                 jacobian(1,num_dependents,num_independents,xp,J);
-                // delete the allocated space for the parameters
+
+                /* delete the allocated space for the parameters:*/
                 xDelete(anEDF_for_solverx_p->dp_x);
-                xDelete(anEDF_for_solverx_p->dp_X);
-                xDelete(anEDF_for_solverx_p->dpp_X,edf_n);
-                xDelete(anEDF_for_solverx_p->dp_y);
-                xDelete(anEDF_for_solverx_p->dp_Y);
-                xDelete(anEDF_for_solverx_p->dpp_Y,edf_m);
+                xDelete(anEDF_for_solverx_p->dp_X);
+                xDelete(anEDF_for_solverx_p->dpp_X,edf_n);
+                xDelete(anEDF_for_solverx_p->dp_y);
+                xDelete(anEDF_for_solverx_p->dp_Y);
+                xDelete(anEDF_for_solverx_p->dpp_Y,edf_m);
+                
                 /*Add jacobian matrix to results: */
                 matJ=xNew<IssmDouble>(num_dependents*num_independents);