source:
issm/oecreview/Archive/21724-22754/ISSM-22739-22740.diff
Last change on this file was 22755, checked in by , 7 years ago | |
---|---|
File size: 4.5 KB |
-
../trunk-jpl/src/c/modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp
14 14 /*Intermediaries*/ 15 15 int num_controls; 16 16 int *control_type = NULL; 17 int* M_all ;18 int* N_all ;17 int* M_all = NULL; 18 int* N_all = NULL; 19 19 20 20 /*Retrieve some parameters*/ 21 21 parameters->FindParam(&num_controls,InversionNumControlParametersEnum); -
../trunk-jpl/src/c/classes/Elements/Penta.cpp
1179 1179 1180 1180 int* idlist = NULL; 1181 1181 IssmDouble* values = NULL; 1182 int* M ;1182 int* M = NULL; 1183 1183 1184 1184 /*Get out if this is not an element input*/ 1185 1185 if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput"); … … 1219 1219 GradientIndexing(&idlist[0],control_index,true); 1220 1220 for(int i=0;i<NUMVERTICES;i++){ 1221 1221 values[i] = pentainput->values[i]; 1222 //if(this->Id()<=10)_printf_("index "<<idlist[i]<<"\n");1223 1222 } 1224 1223 vector->SetValues(NUMVERTICES,idlist,values,INS_VAL); 1225 1224 break; -
../trunk-jpl/src/c/classes/Elements/Element.cpp
1394 1394 /*Get number of vertices*/ 1395 1395 int numvertices = this->GetNumberOfVertices(); 1396 1396 if(isautodiff){ 1397 int* N ;1398 int* M ;1397 int* N=NULL; 1398 int* M=NULL; 1399 1399 int start = 0; 1400 1400 parameters->FindParam(&N,NULL,ControlInputSizeNEnum); 1401 1401 parameters->FindParam(&M,NULL,ControlInputSizeMEnum); … … 1678 1678 maxs_input->AddTimeInput(new TriaInput(ControlInputMaxsEnum,values_max,P1Enum)); 1679 1679 break; 1680 1680 case PentaEnum: 1681 printf("-------------- file: Element.cpp line: %i\n",__LINE__);1682 1681 values_input->AddTimeInput(new PentaInput(ControlInputValuesEnum,values,P1Enum)); 1683 1682 mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum)); 1684 1683 maxs_input->AddTimeInput(new PentaInput(ControlInputMaxsEnum,values_max,P1Enum)); -
../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp
82 82 void TransientInput::DeepEcho(void){/*{{{*/ 83 83 84 84 int i; 85 printf("-------------- file: TransientInput.cpp line: %i\n",__LINE__);86 85 87 86 _printf_("TransientInput:\n"); 88 87 _printf_(" enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n"); -
../trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp
191 191 iomodel->FetchData(&independent,&M,&N,iofieldname); 192 192 _assert_(independent); 193 193 _assert_(N==control_sizes[i]); 194 _printf_("N control size: "<<control_sizes[i]<<"\n");195 194 196 195 independents_min = NULL; independents_min = xNew<IssmDouble>(M*N); 197 196 independents_max = NULL; independents_max = xNew<IssmDouble>(M*N); -
../trunk-jpl/src/c/classes/Elements/Tria.cpp
1714 1714 1715 1715 int* idlist = NULL; 1716 1716 IssmDouble* values = NULL; 1717 int* M ;1717 int* M = NULL; 1718 1718 1719 1719 /*Get out if this is not an element input*/ 1720 1720 if(!IsInput(control_enum)) _error_("Enum "<<EnumToStringx(control_enum)<<" is not in IsInput"); … … 3297 3297 for(int i=0;i<NUMVERTICES;i++){ 3298 3298 idlist[i]=offset + this->vertices[i]->Sid()+n*M; 3299 3299 values[i]=vector[idlist[i]]; 3300 //_printf_("index: "<<idlist[i]<<" -- value: "<<values[i]<<"\n");3301 3300 } 3302 3301 if(input->ObjectEnum()==TriaInputEnum){ 3303 3302 Input* new_input = new TriaInput(control_enum,values,P1Enum);
Note:
See TracBrowser
for help on using the repository browser.