Changeset 22740

Timestamp:

05/03/18 14:14:33 (7 years ago)

Author:

erobo

Message:

CHG: clean up code

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (2 diffs)
• classes/Elements/Penta.cpp (modified) (2 diffs)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• classes/Inputs/TransientInput.cpp (modified) (1 diff)
• modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp (modified) (1 diff)
• modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1395 +1395 @@
         int numvertices = this->GetNumberOfVertices();
         if(isautodiff){
-                int* N;
-                int* M;
+                int* N=NULL;
+                int* M=NULL;
                 int start = 0;
                 parameters->FindParam(&N,NULL,ControlInputSizeNEnum);
@@ -1679 +1679 @@
                                                                 break;
                     case PentaEnum:
-                                                                printf("-------------- file: Element.cpp line: %i\n",__LINE__); 
                                                                         values_input->AddTimeInput(new PentaInput(ControlInputValuesEnum,values,P1Enum)); 
                                                                         mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum)); 

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1180 +1180 @@
         int* idlist = NULL;
         IssmDouble* values = NULL;
-        int* M;
+        int* M = NULL;
 
         /*Get out if this is not an element input*/
@@ -1220 +1220 @@
                                         for(int i=0;i<NUMVERTICES;i++){
                                                 values[i] = pentainput->values[i];
-                                                //if(this->Id()<=10)_printf_("index "<<idlist[i]<<"\n");
                                         }
                                         vector->SetValues(NUMVERTICES,idlist,values,INS_VAL);

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -1715 +1715 @@
         int* idlist = NULL;
         IssmDouble* values = NULL;
-        int* M;
+        int* M = NULL;
 
         /*Get out if this is not an element input*/
@@ -3298 +3298 @@
                         idlist[i]=offset + this->vertices[i]->Sid()+n*M;
                         values[i]=vector[idlist[i]];
-                        //_printf_("index: "<<idlist[i]<<" -- value: "<<values[i]<<"\n");
                 }
                 if(input->ObjectEnum()==TriaInputEnum){

issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

@@ -83 +83 @@
 
         int i;
-        printf("-------------- file: TransientInput.cpp line: %i\n",__LINE__); 
 
         _printf_("TransientInput:\n");

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

@@ -15 +15 @@
                 int  num_controls;
                 int *control_type = NULL;
-                int* M_all;
-                int* N_all;
+                int* M_all = NULL;
+                int* N_all = NULL;
 
                 /*Retrieve some parameters*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -192 +192 @@
                         _assert_(independent);
                         _assert_(N==control_sizes[i]);
-                        _printf_("N control size: "<<control_sizes[i]<<"\n");
                 
                         independents_min = NULL; independents_min = xNew<IssmDouble>(M*N);