- Timestamp:
- 11/16/12 08:10:16 (12 years ago)
- Location:
- issm/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk
- Property svn:mergeinfo changed
/issm/trunk-jpl merged: 13397-13398,13401,13407-13582,13584-13974
- Property svn:mergeinfo changed
-
issm/trunk/src
- Property svn:mergeinfo changed
-
issm/trunk/src/c/classes/objects/Inputs/ControlInput.cpp
r13395 r13975 84 84 int ControlInput::Id(void){ return -1; } 85 85 /*}}}*/ 86 /*FUNCTION ControlInput::MyRank{{{*/87 int ControlInput::MyRank(void){88 extern int my_rank;89 return my_rank;90 }91 /*}}}*/92 86 /*FUNCTION ControlInput::ObjectEnum{{{*/ 93 87 int ControlInput::ObjectEnum(void){ … … 99 93 /*FUNCTION ControlInput::copy{{{*/ 100 94 Object* ControlInput::copy() { 101 95 102 96 ControlInput* output=NULL; 103 97 … … 106 100 output->control_id=this->control_id; 107 101 108 if(values) output->values =(Input*)this->values->copy();109 if(savedvalues) output->savedvalues =(Input*)this->savedvalues->copy();110 if(minvalues) output->minvalues =(Input*)this->minvalues->copy();111 if(maxvalues) output->maxvalues =(Input*)this->maxvalues->copy();112 if(gradient) output->gradient =(Input*)this->gradient->copy();102 if(values) output->values = dynamic_cast<Input*>(this->values->copy()); 103 if(savedvalues) output->savedvalues = dynamic_cast<Input*>(this->savedvalues->copy()); 104 if(minvalues) output->minvalues = dynamic_cast<Input*>(this->minvalues->copy()); 105 if(maxvalues) output->maxvalues = dynamic_cast<Input*>(this->maxvalues->copy()); 106 if(gradient) output->gradient = dynamic_cast<Input*>(this->gradient->copy()); 113 107 114 108 return output; 115 109 } 116 110 /*}}}*/ 117 111 118 112 /*ControlInput management*/ 119 113 /*FUNCTION ControlInput::InstanceEnum{{{*/ … … 261 255 262 256 if(savedvalues) delete this->savedvalues; 263 this->savedvalues= (Input*)this->values->copy();257 this->savedvalues=dynamic_cast<Input*>(this->values->copy()); 264 258 }/*}}}*/ 265 259 /*FUNCTION ControlInput::UpdateValue{{{*/ … … 269 263 270 264 if(values) delete this->values; 271 this->values= (Input*)this->savedvalues->copy();265 this->values=dynamic_cast<Input*>(this->savedvalues->copy()); 272 266 this->values->AXPY(gradient,scalar); 273 267 }/*}}}*/
Note:
See TracChangeset
for help on using the changeset viewer.