Changeset 334 for trunk/src

Timestamp:

Mar 12, 2006 8:29:56 PM (18 years ago)

Author:

cxsong

Message:

added linkage to mesh and handling, addValue etc.

Location:

trunk/src/mesh

Files:

• field.cc (modified) (1 diff)
• field.h (modified) (4 diffs)

trunk/src/mesh/field.cc

@@ -5 +5 @@
 #include "field.h"
 
-void RpField::setMesh(const char* meshId)
-{
-        m_meshName.assign(meshId);
+RP_ERROR RpField::setMeshObj(RpSerializable* mesh)
+{
+        if (mesh) {
+                m_mesh = mesh;
+                return RP_SUCCESS;
+        } 
+        else {
+                return RP_ERR_NULL_PTR;
+        }
 }
 

trunk/src/mesh/field.h

@@ -3 +3 @@
 
 //
-// class for field values
+// Class for field object
+//
+// Example usage:
+//      mesh = new RpGrid2d;
+//      mesh->addAllPoints(x,y);
+//      field = new RpField;
+//      field->addValues(val);
+// 
 //
 
@@ -13 +20 @@
 public:
         // constructors
-        RpField() { };
+        RpField() { m_mesh = NULL; };
 
-        RpField(int size) : RpGrid1d(size) { };
+        RpField(int size) : RpGrid1d(size) { m_mesh = NULL; };
 
-        RpField(const char* name, int size=0) : RpGrid1d(name,size) { };
+        RpField(const char* name, int size=0) : RpGrid1d(name,size)
+                { m_mesh = NULL; };
 
-        // set mesh link
-        void setMesh(const char* meshId);
+        // set name of mesh object used in field 
+        void setMeshId(const char* meshId) { m_meshName.assign(meshId); };
+
+        // set name of mesh object used in field 
+        RP_ERROR setMeshObj(RpSerializable* meshPtr);
+
+        // remove mesh - only erase name and remove ptr (not free memory as serializer manages the object memory)
+        void removeMesh();
+
+        const char* getMeshId() { return m_meshName.c_str(); };
+        RpSerializable* getMeshObj() { return m_mesh; };
 
         // return number of bytes needed for serialization
@@ -27 +44 @@
         // return object type as a char string
         virtual const char* objectType();
+
+        virtual RP_ERROR addAllValues(double* val, int nitems) {
+                return RpGrid1d::addAllPoints(val, nitems); 
+        };
+
+        virtual void addValue(double val) {
+                RpGrid1d::addPoint(val); 
+        };
 
         // serialize data 
@@ -57 +82 @@
 private:
         std::string m_meshName; // mesh
+        RpSerializable* m_mesh; // pointer to mesh object
 };