Changeset 25836 for issm/trunk/src/c/classes/DependentObject.h

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/DependentObject.h (modified) (1 diff)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

issm/trunk/src/c/classes/DependentObject.h

@@ -18 +18 @@
 
                 char* name;
-                int type;  /*0: scalar, 1: vertex*/
-                int index;  /*0: scalar, 1: vertex*/
+                int   index;  /*0: scalar, 1: vertex*/
                 IssmDouble response_value;
 
                 /*DependentObject constructors, destructors */
                 DependentObject();
-                DependentObject(char* name, int type,int index);
-                DependentObject(char* name, int type,int index,IssmDouble in_response);
+                DependentObject(char* name,int index);
+                DependentObject(char* name,int index,IssmDouble in_response);
                 ~DependentObject();
 
                 /*Object virtual functions definitions*/
-                Object* copy(void);
-                void  DeepEcho();
-                void  Echo();
-                int   Id(); 
-                int   ObjectEnum();
-                void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){_error_("not implemented yet!"); };
+                Object *copy(void);
+                void    DeepEcho();
+                void    Echo();
+                int     Id();
+                int     ObjectEnum();
+                void    Marshall(MarshallHandle  *marshallhandle);
 
                 /*DependentObject methods: */
-                int  NumDependents(void);
-                void Responsex(IssmDouble* poutput_value,FemModel* femmodel);
+                void       Responsex(IssmDouble *poutput_value,FemModel*femmodel);
                 IssmDouble GetValue(void);
-                void AddValue(IssmDouble in_value);
-                void ResetResponseValue(void);
+                void       AddValue(IssmDouble in_value);
+                void       ResetResponseValue(void);
 
 };

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post