Changeset 22758 for issm/trunk/src/c/classes/Inputs/TetraInput.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/TetraInput.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/TetraInput.h

@@ -41 +41 @@
                 int    GetResultNumberOfNodes(void);
                 int    InstanceEnum();
-                Input* PointwiseDivide(Input* inputB);
-                Input* PointwiseMax(Input* inputB);
-                Input* PointwiseMin(Input* inputB);
                 void   ResultToPatch(IssmDouble* values,int nodesperelement,int sid);
                 Input* SpawnSegInput(int index1,int index2){_error_("not supported yet");};
@@ -51 +48 @@
                 void AXPY(Input* xinput,IssmDouble scalar);
                 void ChangeEnum(int newenumtype);
-                void Constrain(IssmDouble cm_min, IssmDouble cm_max);
-                void ConstrainMin(IssmDouble minimum);
                 void Extrude(int start){_error_("not supported yet");};
                 void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes);
@@ -66 +61 @@
                 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime);
                 void GetVectorFromInputs(Vector<IssmDouble>* vector,int* doflist);
-                IssmDouble InfinityNorm(void);
+                int  GetInputInterpolationType(){_error_("not implemented yet!");};
                 IssmDouble Max(void);
                 IssmDouble MaxAbs(void);
@@ -73 +68 @@
                 void Scale(IssmDouble scale_factor);
                 void Set(IssmDouble setvalue);
-                void SquareMin(IssmDouble* psquaremin,Parameters* parameters);
-                void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");};
 
 };

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