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

Timestamp:

04/12/16 21:32:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20497

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/classes/Inputs/TransientInput.h (modified) (3 diffs)

issm/trunk

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad

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

@@ -37 +37 @@
                 int   ObjectEnum();
                 Object* copy();
+                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction);
                 /*}}}*/
                 /*TransientInput management: {{{*/
@@ -47 +48 @@
                 int  GetResultInterpolation(void);
                 int  GetResultNumberOfNodes(void);
+                int  GetResultArraySize(void);
                 void ResultToPatch(IssmDouble* values,int nodesperelement,int sid){_error_("not supported yet");};
                 void Configure(Parameters* parameters);
@@ -59 +61 @@
                 void GetInputDerivativeValue(IssmDouble* derivativevalues, IssmDouble* xyz_list,Gauss* gauss);
                 void GetInputAverage(IssmDouble* pvalue);
+                void GetInputDerivativeAverageValue(IssmDouble* derivativevalues, IssmDouble* xyz_list){_error_("not implemented yet");};
                 void GetInputAllTimeAverages(IssmDouble** pvalues,IssmDouble** ptimes, int* pnumtimes);
                 void GetInputUpToCurrentTimeAverages(IssmDouble** pvalues, IssmDouble** ptimes, int* pnumtimes, IssmDouble currenttime);

@@ +1 @@
+build-js
+build-esmf
+build-gcm
 build-fw
 build-ad