Changeset 13975 for issm/trunk/src/c/classes/objects/Inputs/ControlInput.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/objects/Inputs/ControlInput.cpp (modified) (5 diffs)

issm/trunk/src/c/classes/objects/Inputs/ControlInput.cpp

@@ -84 +84 @@
 int    ControlInput::Id(void){ return -1; }
 /*}}}*/
-/*FUNCTION ControlInput::MyRank{{{*/
-int    ControlInput::MyRank(void){ 
-        extern int my_rank;
-        return my_rank; 
-}
-/*}}}*/
 /*FUNCTION ControlInput::ObjectEnum{{{*/
 int ControlInput::ObjectEnum(void){
@@ -99 +93 @@
 /*FUNCTION ControlInput::copy{{{*/
 Object* ControlInput::copy() {
-        
+
         ControlInput* output=NULL;
 
@@ -106 +100 @@
         output->control_id=this->control_id;
 
-        if(values)      output->values=(Input*)this->values->copy();
-        if(savedvalues) output->savedvalues=(Input*)this->savedvalues->copy();
-        if(minvalues)   output->minvalues=(Input*)this->minvalues->copy();
-        if(maxvalues)   output->maxvalues=(Input*)this->maxvalues->copy();
-        if(gradient)    output->gradient=(Input*)this->gradient->copy();
+        if(values)      output->values      = dynamic_cast<Input*>(this->values->copy());
+        if(savedvalues) output->savedvalues = dynamic_cast<Input*>(this->savedvalues->copy());
+        if(minvalues)   output->minvalues   = dynamic_cast<Input*>(this->minvalues->copy());
+        if(maxvalues)   output->maxvalues   = dynamic_cast<Input*>(this->maxvalues->copy());
+        if(gradient)    output->gradient    = dynamic_cast<Input*>(this->gradient->copy());
 
         return output;
 }
 /*}}}*/
-        
+
 /*ControlInput management*/
 /*FUNCTION ControlInput::InstanceEnum{{{*/
@@ -261 +255 @@
 
         if(savedvalues) delete this->savedvalues;
-        this->savedvalues=(Input*)this->values->copy();
+        this->savedvalues=dynamic_cast<Input*>(this->values->copy());
 }/*}}}*/
 /*FUNCTION ControlInput::UpdateValue{{{*/
@@ -269 +263 @@
 
         if(values) delete this->values;
-        this->values=(Input*)this->savedvalues->copy();
+        this->values=dynamic_cast<Input*>(this->savedvalues->copy());
         this->values->AXPY(gradient,scalar);
 }/*}}}*/