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

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

@@ -1 @@
-/*! \file DatasetInput2.h 
+/*! \file DatasetInput.h 
  *  \brief: header file for datasetinput object
  */
@@ -7 +7 @@
 
 /*Headers:*/
-#include "./Input2.h"
-class TriaInput2;
-class PentaInput2;
-class TransientInput2;
+#include "./Input.h"
+class TriaInput;
+class PentaInput;
+class TransientInput;
 
-class DatasetInput2: public Input2{
+class DatasetInput: public Input{
 
         private:
                 int             numids;
-                Input2        **inputs;
+                Input        **inputs;
                 int            *ids;
                 int             numberofelements_local;
@@ -24 +24 @@
                 int GetNumIds() const {return this->numids;};
                 /*DatasetInput constructors, destructors: {{{*/
-                DatasetInput2();
-                DatasetInput2(int nbe, int nbv);
-                ~DatasetInput2();
+                DatasetInput();
+                DatasetInput(int nbe, int nbv);
+                ~DatasetInput();
                 /*}}}*/
                 /*Object virtual functions definitions:{{{ */
-                Input2* copy();
+                Input* copy();
                 void    Configure(Parameters* params);
                 void    DeepEcho();
@@ -41 +41 @@
                 void SetTriaInput(int id,int interp_in,int numinds,int* rows,IssmDouble* values_in);
                 void SetPentaInput(int id,int interp_in,int numinds,int* rows,IssmDouble* values_in);
-                TransientInput2* SetTransientInput(int id,IssmDouble* times,int numtimes);
-                PentaInput2* GetPentaInputByOffset(int i);
-                TriaInput2*  GetTriaInput(void);
-                TriaInput2*  GetTriaInputByOffset(int i);
-                TransientInput2* GetTransientInputByOffset(int offset);
+                TransientInput* SetTransientInput(int id,IssmDouble* times,int numtimes);
+                PentaInput* GetPentaInputByOffset(int i);
+                TriaInput*  GetTriaInput(void);
+                TriaInput*  GetTriaInputByOffset(int i);
+                TransientInput* GetTransientInputByOffset(int offset);
                 void GetInputValue(IssmDouble* pvalue,Gauss* gauss,int index);
 };