source: issm/oecreview/Archive/21724-22754/ISSM-22739-22740.diff@ 22755

Last change on this file since 22755 was 22755, checked in by Mathieu Morlighem, 7 years ago

CHG: added 21724-22754
File size: 4.5 KB
RevLine 
[22755]1Index: ../trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp
2===================================================================
3--- ../trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (revision 22739)
4+++ ../trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (revision 22740)
5@@ -14,8 +14,8 @@
6 /*Intermediaries*/
7 int num_controls;
8 int *control_type = NULL;
9- int* M_all;
10- int* N_all;
11+ int* M_all = NULL;
12+ int* N_all = NULL;
13
14 /*Retrieve some parameters*/
15 parameters->FindParam(&num_controls,InversionNumControlParametersEnum);
16Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
17===================================================================
18--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 22739)
19+++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 22740)
20@@ -1179,7 +1179,7 @@
21
22 int* idlist = NULL;
23 IssmDouble* values = NULL;
24- int* M;
25+ int* M = NULL;
26
27 /*Get out if this is not an element input*/
28 if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
29@@ -1219,7 +1219,6 @@
30 GradientIndexing(&idlist[0],control_index,true);
31 for(int i=0;i<NUMVERTICES;i++){
32 values[i] = pentainput->values[i];
33- //if(this->Id()<=10)_printf_("index "<<idlist[i]<<"\n");
34 }
35 vector->SetValues(NUMVERTICES,idlist,values,INS_VAL);
36 break;
37Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
38===================================================================
39--- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22739)
40+++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 22740)
41@@ -1394,8 +1394,8 @@
42 /*Get number of vertices*/
43 int numvertices = this->GetNumberOfVertices();
44 if(isautodiff){
45- int* N;
46- int* M;
47+ int* N=NULL;
48+ int* M=NULL;
49 int start = 0;
50 parameters->FindParam(&N,NULL,ControlInputSizeNEnum);
51 parameters->FindParam(&M,NULL,ControlInputSizeMEnum);
52@@ -1678,7 +1678,6 @@
53 maxs_input->AddTimeInput(new TriaInput(ControlInputMaxsEnum,values_max,P1Enum));
54 break;
55 case PentaEnum:
56- printf("-------------- file: Element.cpp line: %i\n",__LINE__);
57 values_input->AddTimeInput(new PentaInput(ControlInputValuesEnum,values,P1Enum));
58 mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum));
59 maxs_input->AddTimeInput(new PentaInput(ControlInputMaxsEnum,values_max,P1Enum));
60Index: ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp
61===================================================================
62--- ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 22739)
63+++ ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 22740)
64@@ -82,7 +82,6 @@
65 void TransientInput::DeepEcho(void){/*{{{*/
66
67 int i;
68- printf("-------------- file: TransientInput.cpp line: %i\n",__LINE__);
69
70 _printf_("TransientInput:\n");
71 _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
72Index: ../trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp
73===================================================================
74--- ../trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 22739)
75+++ ../trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 22740)
76@@ -191,7 +191,6 @@
77 iomodel->FetchData(&independent,&M,&N,iofieldname);
78 _assert_(independent);
79 _assert_(N==control_sizes[i]);
80- _printf_("N control size: "<<control_sizes[i]<<"\n");
81
82 independents_min = NULL; independents_min = xNew<IssmDouble>(M*N);
83 independents_max = NULL; independents_max = xNew<IssmDouble>(M*N);
84Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
85===================================================================
86--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 22739)
87+++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 22740)
88@@ -1714,7 +1714,7 @@
89
90 int* idlist = NULL;
91 IssmDouble* values = NULL;
92- int* M;
93+ int* M = NULL;
94
95 /*Get out if this is not an element input*/
96 if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput");
97@@ -3297,7 +3297,6 @@
98 for(int i=0;i<NUMVERTICES;i++){
99 idlist[i]=offset + this->vertices[i]->Sid()+n*M;
100 values[i]=vector[idlist[i]];
101- //_printf_("index: "<<idlist[i]<<" -- value: "<<values[i]<<"\n");
102 }
103 if(input->ObjectEnum()==TriaInputEnum){
104 Input* new_input = new TriaInput(control_enum,values,P1Enum);
Note: See TracBrowser for help on using the repository browser.