Changeset 22758 for issm/trunk/src/c/classes/Inputs/TransientInput.h

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Inputs/TransientInput.h (modified) (4 diffs)

issm/trunk/src/c ¶

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/src/c/classes/Inputs/TransientInput.h ¶

@@ -45 +45 @@
                 int  GetResultNumberOfNodes(void);
                 int    InstanceEnum();
-                Input* PointwiseDivide(Input* input_in){_error_("not implemented yet");};
-                Input* PointwiseMax(Input* input_in){_error_("not implemented yet");};
-                Input* PointwiseMin(Input* input_in){_error_("not implemented yet");};
                 void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");};
                 Input* SpawnSegInput(int index1,int index2);
@@ -55 +52 @@
                 void AXPY(Input* xforcing,IssmDouble scalar){_error_("not implemented yet");};
                 void ChangeEnum(int newenumtype);
-                void Constrain(IssmDouble cm_min, IssmDouble cm_max){_error_("not implemented yet");};
-                void ConstrainMin(IssmDouble minimum){_error_("not implemented yet");};
                 void Extrude(int start);
                 void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes);
@@ -69 +64 @@
                 void GetInputValue(IssmDouble* pvalue,Gauss* gauss ,int index){_error_("not implemented yet");};
                 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime);
+                void GetInputAverageOnTimes(IssmDouble** pvalues, IssmDouble init_time);
+                int  GetInputInterpolationType(){_error_("not implemented yet!");};
+                IssmDouble  GetTimeByOffset(int offset);
                 Input* GetTimeInput(IssmDouble time);
+                int  GetTimeInputOffset(IssmDouble time);
                 void GetTimeValues(IssmDouble* values,IssmDouble time){_error_("not implemented yet");};
                 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
-                IssmDouble InfinityNorm(void);
                 IssmDouble Max(void);
                 IssmDouble MaxAbs(void);
@@ -79 +77 @@
                 void Scale(IssmDouble scale_factor){_error_("not implemented yet");};
                 void Set(IssmDouble setvalue){_error_("Set not implemented yet");};
-                void SquareMin(IssmDouble* psquaremin,Parameters* parameters);
-                void VerticallyIntegrate(Input* thickness_forcing){_error_("not supported yet");};
                 /*}}}*/
 

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod