Changeset 25379 for issm/trunk-jpl/src/c/classes/Inputs/PentaInput.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 )
• PentaInput.h (copied) (copied from issm/trunk-jpl/src/c/classes/Inputs2/PentaInput2.h ) (3 diffs)

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

@@ -3 +3 @@
 
 /*Headers:*/
-#include "./ElementInput2.h"
+#include "./ElementInput.h"
 #include "../Elements/PentaRef.h"
 
-class PentaInput2: public ElementInput2, public PentaRef{
+class PentaInput: public ElementInput, public PentaRef{
 
         private:
                 int isserved_collapsed;
         public:
-                /*PentaInput2 constructors, destructors: {{{*/
-                PentaInput2();
-                PentaInput2(int nbe_in,int nbv_in,int interp_in);
-                ~PentaInput2();
+                /*PentaInput constructors, destructors: {{{*/
+                PentaInput();
+                PentaInput(int nbe_in,int nbv_in,int interp_in);
+                ~PentaInput();
                 /*}}}*/
                 /*Object virtual functions definitions:{{{ */
-                Input2 *copy();
+                Input *copy();
                 void    DeepEcho();
                 void    Echo();
@@ -24 +24 @@
                 int     ObjectEnum();
                 /*}}}*/
-                /*PentaInput2 management: {{{*/
+                /*PentaInput management: {{{*/
                 void SetInput(int interp_in,int row,IssmDouble value_in);
                 void SetInput(int interp_in,int numinds,int* rows,IssmDouble* values_in);
@@ -34 +34 @@
                 IssmDouble GetInputMax();
                 IssmDouble GetInputMaxAbs();
-                PentaInput2* GetPentaInput(){return this;};
+                PentaInput* GetPentaInput(){return this;};
                 void GetInputValue(IssmDouble* pvalue,Gauss* gauss);
                 void Scale(IssmDouble scalar);
                 void Pow(IssmDouble scalar);
-                void AXPY(Input2* xinput,IssmDouble scalar);
-                void PointWiseMult(Input2* xinput);
+                void AXPY(Input* xinput,IssmDouble scalar);
+                void PointWiseMult(Input* xinput);
                 void Serve(int numindices,int* indices);
                 void Serve(int row,int numindices);