Changeset 1935

Timestamp:

08/26/09 13:44:04 (16 years ago)

Author:

Eric.Larour

Message:

FemModel is now derived from Object. It should be, as it is included in femmodels, a dataset :)

Location:

issm/trunk/src/c/objects

Files:

• FemModel.cpp (modified) (4 diffs)
• FemModel.h (modified) (3 diffs)

issm/trunk/src/c/objects/FemModel.cpp

@@ -11 +11 @@
 #include "./FemModel.h"
 #include "stdio.h"
+#include "../shared/shared.h"
 
 FemModel::FemModel(){
@@ -60 +61 @@
         delete nodes;
         delete loads;
+        delete constraints;
         delete materials;
         delete parameters;
@@ -131 +133 @@
 
 }
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::GetId"
+int   FemModel::GetId(void){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
+
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::MyRank"
+int   FemModel::MyRank(void){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
+
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::Marshall"
+void  FemModel::Marshall(char** pmarshalled_dataset){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
+
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::MarshallSize"
+int   FemModel::MarshallSize(void){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::GetName"
+char*   FemModel::GetName(void){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::Demarshall"
+void  FemModel::Demarshall(char** pmarshalled_dataset){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::Enum"
+int   FemModel::Enum(void){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
+#undef __FUNCT__
+#define __FUNCT__ "FemModel::copy"
+Object* FemModel::copy(void){
+        throw ErrorException(__FUNCT__,exprintf("%s%s",__FUNCT__," error message: not implemented yet!"));
+}
 
 #undef __FUNCT__
 #define __FUNCT__ "FemModel::FindParam"
-                
 int FemModel::FindParam(void* pparameter,char* parametername){
         
@@ -140 +184 @@
 
 }
-
 
 /*access to internal data: */

issm/trunk/src/c/objects/FemModel.h

@@ -13 +13 @@
 struct OptArgs;
 
-class FemModel{
+class FemModel: public Object{
 
         /*no private members, as we need access to these datasets quite often!:*/
@@ -39 +39 @@
                 FemModel(DataSet* elements,DataSet* nodes,DataSet* constraints,DataSet* loads,DataSet* materials,DataSet* parameters,
                                       Vec partition,Vec tpartition,Vec yg,Mat Rmg,Mat Gmn,NodeSets* nodesets,Vec ys,Vec ys0);
-      
+     
+                /*virtual resolves: */
                 void  Echo();
                 void  DeepEcho();
+                int   GetId();
+                int   MyRank();
+                void  Marshall(char** pmarshalled_dataset);
+                int   MarshallSize();
+                char* GetName();
+                void  Demarshall(char** pmarshalled_dataset);
+                int   Enum();
+                Object* copy();
                 
                 int FindParam(void* pparameter,char* parametername);
@@ -59 +68 @@
                 Mat      get_Gmn(void);
 
+