source: issm/oecreview/Archive/13393-13976/ISSM-13445-13446.diff

Last change on this file was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 2.6 KB
RevLine 
[13980]1Index: ../trunk-jpl/src/c/modules/AutodiffDriversx/AutodiffDriversx.cpp
2===================================================================
3--- ../trunk-jpl/src/c/modules/AutodiffDriversx/AutodiffDriversx.cpp (revision 13445)
4+++ ../trunk-jpl/src/c/modules/AutodiffDriversx/AutodiffDriversx.cpp (revision 13446)
5@@ -19,9 +19,6 @@
6 int num_dependents;
7 int num_independents;
8 IssmDouble *axp = NULL;
9- int configuration_type;
10- int solveSize;
11- int edf_n ,edf_m;
12 double *xp = NULL;
13 int anIndepNum;
14
15@@ -47,12 +44,6 @@
16 xp[i]=reCast<double,IssmDouble>(axp[i]);
17 }
18
19- /* get the dimension for the solverx arguments*/
20- parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
21- solveSize=nodes->NumberOfDofs(configuration_type,FsetEnum);
22- edf_n=solveSize*(solveSize+1);
23- edf_m=solveSize;
24-
25 /*get the EDF pointer:*/
26 ext_diff_fct *anEDF_for_solverx_p=dynamic_cast<GenericParam<Adolc_edf> * >(parameters->FindParamObject(AdolcParamEnum))->GetParameterValue().myEDF_for_solverx_p;
27
28@@ -64,16 +55,16 @@
29 // anEDF_for_solverx_p->fov_reverse=EDF_fov_reverse_for_solverx;
30
31 /*allocate the space for the parameters to invoke the forward methods:*/
32- anEDF_for_solverx_p->dp_x=xNew<double>(edf_n);
33- anEDF_for_solverx_p->dp_X=xNew<double>(edf_n);
34- anEDF_for_solverx_p->dpp_X=xNew<double>(edf_n, num_independents);
35- anEDF_for_solverx_p->dp_y=xNew<double>(edf_m);
36- anEDF_for_solverx_p->dp_Y=xNew<double>(edf_m);
37- anEDF_for_solverx_p->dpp_Y=xNew<double>(edf_m, num_independents);
38- anEDF_for_solverx_p->dp_U=xNew<double>(edf_m);
39- anEDF_for_solverx_p->dpp_U=xNew<double>(num_dependents,edf_m);
40- anEDF_for_solverx_p->dp_Z=xNew<double>(edf_n);
41- anEDF_for_solverx_p->dpp_Z=xNew<double>(num_dependents,edf_n);
42+ anEDF_for_solverx_p->dp_x=xNew<double>(anEDF_for_solverx_p->max_n);
43+ anEDF_for_solverx_p->dp_X=xNew<double>(anEDF_for_solverx_p->max_n);
44+ anEDF_for_solverx_p->dpp_X=xNew<double>(anEDF_for_solverx_p->max_n, num_independents);
45+ anEDF_for_solverx_p->dp_y=xNew<double>(anEDF_for_solverx_p->max_m);
46+ anEDF_for_solverx_p->dp_Y=xNew<double>(anEDF_for_solverx_p->max_m);
47+ anEDF_for_solverx_p->dpp_Y=xNew<double>(anEDF_for_solverx_p->max_m, num_independents);
48+ anEDF_for_solverx_p->dp_U=xNew<double>(anEDF_for_solverx_p->max_m);
49+ anEDF_for_solverx_p->dpp_U=xNew<double>(num_dependents,anEDF_for_solverx_p->max_m);
50+ anEDF_for_solverx_p->dp_Z=xNew<double>(anEDF_for_solverx_p->max_n);
51+ anEDF_for_solverx_p->dpp_Z=xNew<double>(num_dependents,anEDF_for_solverx_p->max_n);
52
53 /* Call AD driver:*/
54 // single direction:
Note: See TracBrowser for help on using the repository browser.