Changeset 16494

Timestamp:

10/21/13 18:22:18 (11 years ago)

Author:

Eric.Larour

Message:

CHG: fixed bad prototype.

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.h (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Seg.h (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• Tria.h (modified) (1 diff)

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

@@ -116 +116 @@
                 virtual void   ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index)=0;
                 virtual void   ControlInputScaleGradient(int enum_type, IssmDouble scale)=0;
-                virtual void   ControlToVectors(Vector<IssmDouble>* vector_control, Vector<IssmDouble>* vector_gradient,int control_enum)=0;
+                virtual void   ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum)=0;
                 virtual void   GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data)=0;
                 virtual void   SetControlInputsFromVector(IssmDouble* vector,int control_enum,int control_index)=0;

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

@@ -146 +146 @@
                 void   ControlInputScaleGradient(int enum_type,IssmDouble scale);
                 void   ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index);
-                void   ControlToVectors(Vector<IssmDouble>* vector_control, Vector<IssmDouble>* vector_gradient,int control_enum);
+                void   ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum);
                 IssmDouble RheologyBbarAbsGradient(void);
                 IssmDouble ThicknessAbsMisfit(void);

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -166 +166 @@
                 void       ControlInputScaleGradient(int enum_type,IssmDouble scale){_error_("not implemented yet");};
                 void       ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index){_error_("not implemented yet");};
-                void       ControlToVectors(Vector<IssmDouble>* vector_control, Vector<IssmDouble>* vector_gradient,int control_enum){_error_("not implemented yet");};
+                void       ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){_error_("not implemented yet");};
                 IssmDouble RheologyBbarAbsGradient(void){_error_("not implemented yet");};
                 IssmDouble ThicknessAbsMisfit(void){_error_("not implemented yet");};

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

@@ -4735 +4735 @@
 }/*}}}*/
 /*FUNCTION Tria::ControlToVectors{{{*/
-void Tria::ControlToVectors(Vector<IssmDouble>* vector_control, Vector<IssmDouble>* vector_gradient,int control_enum){
+void Tria::ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum){
 
         Input* input=NULL;

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

@@ -155 +155 @@
                 void       ControlInputScaleGradient(int enum_type,IssmDouble scale);
                 void       ControlInputSetGradient(IssmDouble* gradient,int enum_type,int control_index);
-                void       ControlToVectors(Vector<IssmDouble>* vector_control, Vector<IssmDouble>* vector_gradient,int control_enum);
+                void       ControlToVectors(Vector<IssmPDouble>* vector_control, Vector<IssmPDouble>* vector_gradient,int control_enum);
                 IssmDouble RheologyBbarAbsGradient(void);
                 IssmDouble ThicknessAbsMisfit(void);