Changeset 24240 for issm/trunk-jpl/src/c/classes/Inputs/Input.h

Timestamp:

10/17/19 06:03:43 (5 years ago)

Author:

bdef

Message:

Adding a substeping framework in hydro and part of smb

File:

• issm/trunk-jpl/src/c/classes/Inputs/Input.h (modified) (6 diffs)

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

@@ -1 +1 @@
 /*!\file:  Input.h
  * \brief abstract class for Input object
- */ 
+ */
 
 #ifndef _INPUT_H_
@@ -21 +21 @@
 class Input: public Object{
 
-        public: 
+        public:
 
                 virtual        ~Input(){};
@@ -27 +27 @@
                 virtual void ChangeEnum(int newenumtype)=0;
                 virtual void Configure(Parameters* parameters)=0;
-                virtual void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes)=0;
+                virtual void GetInputAveragesOnAllTime(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes)=0;
                 virtual void GetInputAverage(IssmDouble* pvalue)=0;
                 virtual void GetInputDerivativeAverageValue(IssmDouble* derivativevalues, IssmDouble* xyz_list)=0;
@@ -38 +38 @@
                 virtual void GetInputValue(IssmDouble* pvalue,Gauss* gauss,int index)=0;
                 virtual int  GetInputInterpolationType()=0;
-                virtual void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime)=0;
-                virtual int  InstanceEnum()=0; 
+                virtual void GetInputAveragesUpToCurrentTime(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime)=0;
+                virtual int  InstanceEnum()=0;
 
                 virtual void   AXPY(Input* xinput,IssmDouble scalar)=0;
@@ -48 +48 @@
                 virtual IssmDouble Min(void)=0;
                 virtual IssmDouble MinAbs(void)=0;
+                virtual void   PointwiseMult(Input* xinput)=0;
+                virtual void   Pow(IssmDouble exponent)=0;
                 virtual void   Scale(IssmDouble scale_factor)=0;
 
@@ -56 +58 @@
                 virtual Input* SpawnTriaInput(int index1,int index2,int index3)=0;
                 virtual void ResultToMatrix(IssmDouble* values,int ncols,int sid){_error_("not supported yet");};
-                virtual void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");}; 
+                virtual void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");};
 };
 #endif