Changeset 25379 for issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h

Timestamp:

08/11/20 19:43:31 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving inputs2 back to inputs

Location:

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

Files:

• . (moved) (moved from issm/trunk-jpl/src/c/classes/Inputs2 )
• ControlInput.h (copied) (copied from issm/trunk-jpl/src/c/classes/Inputs2/ControlInput2.h ) (4 diffs)

issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h

@@ -1 @@
-/*! \file ControlInput2.h 
+/*! \file ControlInput.h 
  *  \brief: header file for triavertexinput object
  */
@@ -7 +7 @@
 
 /*Headers:*/
-#include "./Input2.h"
+#include "./Input.h"
 class Gauss;
-class ElementInput2;
+class ElementInput;
 
-class ControlInput2: public Input2{
+class ControlInput: public Input{
 
         public:
@@ -17 +17 @@
                 int            enum_type;
                 int            layout_enum;
-                ElementInput2 *gradient;
-                ElementInput2 *maxvalues;
-                ElementInput2 *minvalues;
-                ElementInput2 *savedvalues;
-                ElementInput2 *values;
+                ElementInput *gradient;
+                ElementInput *maxvalues;
+                ElementInput *minvalues;
+                ElementInput *savedvalues;
+                ElementInput *values;
 
-                /*ControlInput2 constructors, destructors: {{{*/
-                ControlInput2();
-                ControlInput2(int nbe, int nbv,int input_layout_enum,int interp,int id);
-                ~ControlInput2();
+                /*ControlInput constructors, destructors: {{{*/
+                ControlInput();
+                ControlInput(int nbe, int nbv,int input_layout_enum,int interp,int id);
+                ~ControlInput();
                 /*}}}*/
                 /*Object virtual functions definitions:{{{ */
-                Input2* copy();
+                Input* copy();
                 void    DeepEcho();
                 void    Echo();
@@ -36 +36 @@
                 int     ObjectEnum();
                 /*}}}*/
-                void SetInput(Input2* in_input){_error_("not impelemented");};
-                void SetInput(Input2* in_input,int timeoffset){_error_("not impelemented");};
-                ElementInput2* GetInput2(const char* data);
+                void SetInput(Input* in_input){_error_("not impelemented");};
+                void SetInput(Input* in_input,int timeoffset){_error_("not impelemented");};
+                ElementInput* GetInput(const char* data);
                 void SetControl(int interp,int numindices,int* indices,IssmDouble* values_in,IssmDouble* values_min,IssmDouble* values_max);
                 void SetGradient(int interp,int numindices,int* indices,IssmDouble* values_in);
                 void SetGradient(int interp,int numindices,int* indices,IssmDouble* values_in,int n);
-                TriaInput2* GetTriaInput();
-                PentaInput2* GetPentaInput();
+                TriaInput* GetTriaInput();
+                PentaInput* GetPentaInput();
 };
 #endif  /* _CONTROLINPUT_H */