Changeset 12704 for issm/trunk-jpl/src/c/objects/Elements/Element.h

Timestamp:

07/24/12 10:25:08 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• src/c/objects/Elements/Element.h (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Elements/Element.h

@@ -63 +63 @@
                 virtual void   InputScale(int enum_type,IssmDouble scale_factor)=0;
                 virtual void   GetVectorFromInputs(Vector* vector, int name_enum)=0;
-                virtual void   GetVectorFromResults(Vector* vector,int id,int interp)=0;
+                virtual void   GetVectorFromResults(Vector* vector,int id,int enum_in,int interp)=0;
                 virtual void   InputArtificialNoise(int enum_type,IssmDouble min,IssmDouble max)=0;
                 virtual bool   InputConvergence(IssmDouble* eps, int* enums,int num_enums,int* criterionenums,IssmDouble* criterionvalues,int num_criterionenums)=0;