further improvement

Author: githubgrasp

src/converter/boundarysphere.C

@@ -19,26 +19,12 @@ BoundarySphere :: ~BoundarySphere()
 }
 
 
-IRResultType
-BoundarySphere :: initializeFrom(InputRecord *ir)
-// Gets from the source line from the data file all the data of the receiver.
+void
+BoundarySphere :: initializeFrom(ConverterInputRecord &ir)
 {
-    const char *__proc = "initializeFrom"; // Required by IR_GIVE_FIELD macro
-    IRResultType result;                // Required by IR_GIVE_FIELD macro
-
-    // int j, size;
-    // oofem::FloatArray vertices;
-    // IntArray *dofIDArry;
-    IR_GIVE_FIELD(ir, centre, IFT_BoundarySphere_centre, "centre");    
-    IR_GIVE_FIELD(ir, radius, IFT_BoundarySphere_radius, "radius"); // Macro
-   return IRRT_OK;
-   
-   //Print command for double
-   //   printf("diameter = %e\n", diameter);
-   //Print command for integer
-   //   printf("number = %d\n", number);
-   //Print command for array
-   //   centre.printYourself();
+  IR_GIVE_FIELD(ir, centre, _IFT_BoundarySphere_centre);    
+  IR_GIVE_FIELD(ir, radius, _IFT_BoundarySphere_radius);
+  return;
 }
 
 

src/converter/boundarysphere.h

@@ -18,6 +18,9 @@
 #include <stdio.h>
 #endif
 
+#define _IFT_BoundarySphere_centre "centre"
+#define _IFT_BoundarySphere_radius "radius"
+
 class BoundarySphere : public Region
 {
 
@@ -53,7 +56,7 @@ class BoundarySphere : public Region
     /// Returns class name of the receiver.
     const char *giveClassName() const { return "BoundarySphere"; }
 
-    IRResultType initializeFrom(InputRecord *ir);
+    void initializeFrom(ConverterInputRecord &ir);
     //virtual IntArray* ResolveDofIDArray (char* initString);
     /// prints receiver state on stdout. Usefull for debuging.
     void         printYourself();
@@ -68,7 +71,7 @@ class BoundarySphere : public Region
 };
 
 
-#endif // node_h
+#endif // boundaryspeher_h
 
 
 

src/converter/converterdatareader.h

@@ -57,7 +57,7 @@ class ConverterDataReader
 public:
     /// Determines the type of input record.
     enum ConverterInputRecordType {
-        GIR_domainRec, GIR_controlRec, GIR_domainCompRec, GIR_vertexRec, GIR_controlVertexRec, GIR_curveRec, GIR_surfaceRec, GIR_regionRec, GIR_inclusionRec, GIR_aggregateRec, GIR_refinementRec
+        CIR_domainRec, CIR_controlRec, CIR_domainCompRec, CIR_vertexRec, CIR_controlVertexRec, CIR_curveRec, CIR_surfaceRec, CIR_regionRec, CIR_inclusionRec, CIR_aggregateRec, CIR_refinementRec
     };
 
     ConverterDataReader() { }

src/converter/curve.C

@@ -27,29 +27,12 @@ Curve :: giveLocalVertex(int i)
   return vertices.at(i);
 }
 
-
-IRResultType
-Curve :: initializeFrom(InputRecord *ir)
+void
+Curve :: initializeFrom(ConverterInputRecord &ir)
 // Gets from the source line from the data file all the data of the receiver.
 {
-    const char *__proc = "initializeFrom"; // Required by IR_GIVE_FIELD macro
-    IRResultType result;                // Required by IR_GIVE_FIELD macro
-
-    IR_GIVE_FIELD(ir, vertices, IFT_Curve_vertices, "vertices"); // Macro
+    IR_GIVE_FIELD(ir, vertices, _IFT_Curve_vertices); // Macro
     refinement = 1.;
-    IR_GIVE_OPTIONAL_FIELD(ir, refinement, IFT_Curve_refine, "refine"); // Macro
-    return IRRT_OK;
-}
-
-
-
-Curve *Curve :: ofType()
-// Returns a new DofManager, which has the same number than the receiver,
-// but belongs to aClass (Node, LineSide,..).
-{
-    Curve *curve;
-    
-    curve = new Curve(number,grid);
-
-    return curve;
+    IR_GIVE_OPTIONAL_FIELD(ir, refinement, _IFT_Curve_refine); // Macro
+    return;
 }

src/converter/curve.h

@@ -15,6 +15,9 @@
 #include <stdio.h>
 #endif
 
+#define _IFT_Curve_vertices "vertices"
+#define _IFT_Curve_refine "refine"
+
 //class oofem::FloatArray;
 //class oofem::IntArray;
 
@@ -43,13 +46,11 @@ class Curve : public GridComponent
     /// Returns pointer to curve vertex array.
     oofem::IntArray *giveLocalVertices() { return & vertices; }
 
-    Vertex *giveGlobalVertex(int i, AList <Vertex> *vertexList);
-
     Curve *ofType();
 
     const char *giveClassName() const { return "Curve"; }
 
-    IRResultType initializeFrom(InputRecord *ir);
+  void initializeFrom(ConverterInputRecord &ir);
 
     void         printYourself();
 

src/converter/cylinder.C

@@ -19,22 +19,15 @@ Cylinder :: ~Cylinder()
 }
 
 
-IRResultType
-Cylinder :: initializeFrom(InputRecord *ir)
+void
+Cylinder :: initializeFrom(ConverterInputRecord &ir)
 // Gets from the source line from the data file all the data of the receiver.
 {
-    const char *__proc = "initializeFrom"; // Required by IR_GIVE_FIELD macro
-    IRResultType result;                // Required by IR_GIVE_FIELD macro
-
-    // int j, size;
-    // oofem::FloatArray vertices;
-    // IntArray *dofIDArry;
-    IR_GIVE_FIELD(ir, line, IFT_Cylinder_line, "line");    
-    IR_GIVE_FIELD(ir, radius, IFT_Cylinder_radius, "radius"); // Macro
+    IR_GIVE_FIELD(ir, line, _IFT_Cylinder_line);    
+    IR_GIVE_FIELD(ir, radius, _IFT_Cylinder_radius); // Macro
     refinement = 1.;
-    IR_GIVE_OPTIONAL_FIELD(ir, refinement, IFT_Cylinder_refine, "refine"); // Macro
-   return IRRT_OK;
-
+    IR_GIVE_OPTIONAL_FIELD(ir, refinement, _IFT_Cylinder_refine); // Macro
+   return;
 }
 
 
@@ -60,10 +53,10 @@ void Cylinder :: findOutsiders(oofem::FloatArray &boundaries)
     //For nodes: 0 = inside,  1 = outside, 2 = on boundary
    //For elements: 0 = inside, 1 = completetly outside (one node could be on boundary), 2 = one node inside and one outside, 3 = on boundary 
 
-    IntArray nodes;
+    oofem::IntArray nodes;
     oofem::FloatArray coords, coordsOne, coordsTwo;
     int outsideFlag;
-    IntArray locationArray(2);
+    oofem::IntArray locationArray(2);
 
     double newTol = 1.e3*this->grid->giveTol();
 
@@ -186,10 +179,10 @@ void Cylinder :: findOutsiders(oofem::FloatArray &boundaries)
 int
 Cylinder :: modifyVoronoiCrossSection(int elementNumber)
 {
-    IntArray crossSectionElements;
-    IntArray crossSectionVertices;
+    oofem::IntArray crossSectionElements;
+    oofem::IntArray crossSectionVertices;
 
-    IntArray nodes(2);
+    oofem::IntArray nodes(2);
 
     oofem::FloatArray coords(3);
 
@@ -235,7 +228,7 @@ Cylinder :: modifyVoronoiCrossSection(int elementNumber)
 
     //Resize cross-section elements
     int newSize = elementSize - elementCounter;
-    IntArray modifiedCrossSectionElements(newSize);
+    oofem::IntArray modifiedCrossSectionElements(newSize);
     int help = 0;
     for ( int i = 0; i < elementSize; i++ ) {
         if ( crossSectionElements.at(i + 1) == 0 ) {
@@ -256,7 +249,7 @@ Cylinder :: modifyVoronoiCrossSection(int elementNumber)
     }
 
     //Write modified vertex vector
-    IntArray modifiedCrossSectionVertices(vertexSize - nodeCounter);
+    oofem::IntArray modifiedCrossSectionVertices(vertexSize - nodeCounter);
     help = 0;
     for ( int i = 0; i < vertexSize; i++ ) {
         if ( crossSectionVertices.at(i + 1) == 0 ) {
@@ -282,10 +275,10 @@ int
 Cylinder :: areaCheck(int elementNumber)
 {
 
-    IntArray crossSectionElements;
-    IntArray crossSectionVertices;
+    oofem::IntArray crossSectionElements;
+    oofem::IntArray crossSectionVertices;
 
-    IntArray nodes(2);
+    oofem::IntArray nodes(2);
 
     oofem::FloatArray coords(3);
 

src/converter/cylinder.h

@@ -4,7 +4,7 @@
 #include "grid.h"
 #include "region.h"
 
-#include "floatarry.h"
+#include "floatarray.h"
 #include "intarray.h"
 
 #include "converterinputrecord.h"
@@ -17,8 +17,9 @@
 #include <stdio.h>
 #endif
 
-//class oofem::FloatArray;
-//class IntArray;
+#define _IFT_Cylinder_line "line"
+#define _IFT_Cylinder_radius "radius"
+#define _IFT_Cylinder_refine "refine"
 
 class Cylinder : public Region
 {
@@ -52,7 +53,7 @@ class Cylinder : public Region
     /// Returns class name of the receiver.
     const char *giveClassName() const { return "Cylinder"; }
 
-    IRResultType initializeFrom(InputRecord *ir);
+    void initializeFrom(ConverterInputRecord &ir);
     //virtual IntArray* ResolveDofIDArray (char* initString);
     /// prints receiver state on stdout. Usefull for debuging.
     void         printYourself();

src/converter/ellipsoid.C

@@ -23,29 +23,21 @@ Ellipsoid :: ~Ellipsoid()
 }
 
 
-IRResultType
-Ellipsoid :: initializeFrom(InputRecord *ir)
+void
+Ellipsoid :: initializeFrom(ConverterInputRecord &ir)
 // Gets from the source line from the data file all the data of the receiver.
 {
 
-    const char *__proc = "initializeFrom"; // Required by IR_GIVE_FIELD macro
-    IRResultType result;                // Required by IR_GIVE_FIELD macro
-    // int j, size;
-    // FloatArray vertices;
-    // IntArray *dofIDArry;
-    IR_GIVE_FIELD(ir, centre, IFT_Ellipsoid_centre, "centre");
+    IR_GIVE_FIELD(ir, centre, _IFT_Ellipsoid_centre);
 
-
-    IR_GIVE_FIELD(ir, radii, IFT_Ellipsoid_radii, "radii"); // Macro
-    IR_GIVE_FIELD(ir, angles, IFT_Ellipsoid_angles, "angles"); // Macro
+    IR_GIVE_FIELD(ir, radii, _IFT_Ellipsoid_radii); // Macro
+    IR_GIVE_FIELD(ir, angles, _IFT_Ellipsoid_angles); // Macro
     refinement = 1.;
 
-    IR_GIVE_OPTIONAL_FIELD(ir, refinement, IFT_Ellipsoid_refine, "refine"); // Macro
+    IR_GIVE_OPTIONAL_FIELD(ir, refinement, _IFT_Ellipsoid_refine); // Macro
     itzThickness = 0.;
-    IR_GIVE_OPTIONAL_FIELD(ir, itzThickness, IFT_Ellipsoid_itz, "itz"); // Macro
-   
-    
-
+    IR_GIVE_OPTIONAL_FIELD(ir, itzThickness, _IFT_Ellipsoid_itz); // Macro
+     
    // compute the matrix of the cartesian equation of the ellipsoid
 
     oofem::FloatMatrix matrixAloc(4,4);
@@ -106,11 +98,6 @@ Ellipsoid :: initializeFrom(InputRecord *ir)
     oofem::FloatMatrix tempM2;
     tempM2.beProductOf(tempM1,tR);
     matrixA.beProductOf(tempM2,tT);
-
-
-    
-    // for control
-    //matrixA.printYourself();
 
     if (itzThickness>0.)
 
@@ -126,13 +113,10 @@ Ellipsoid :: initializeFrom(InputRecord *ir)
         oofem::FloatMatrix tempM2ItZ;
         tempM2ItZ.beProductOf(tempM1ItZ,tR);
         matrixA_wITZ.beProductOf(tempM2ItZ,tT);
-        
-        // for control
-        //matrixA_wITZ.printYourself();
-        
+                
     }
 
-    return IRRT_OK;
+    return;
 
 }
 

src/converter/ellipsoid.h

@@ -1,11 +1,10 @@
 #ifndef ELLIPSOID_H_INCLUDED
 #define ELLIPSOID_H_INCLUDED
 
-
 #include "grid.h"
 #include "inclusion.h"
 
-#include "flotarry.h"
+#include "floatarray.h"
 #include "intarray.h"
 #include "floatmatrix.h"
 
@@ -19,6 +18,14 @@
 #include <stdio.h>
 #endif
 
+    
+#define _IFT_Ellipsoid_centre "centre"
+#define _IFT_Ellipsoid_radii "radii"
+#define _IFT_Ellipsoid_angles "angles"
+#define _IFT_Ellipsoid_refine "refine"
+#define _IFT_Ellipsoid_itz "itz"
+
+
 
 class Ellipsoid : public Inclusion
 {
@@ -62,14 +69,11 @@ class Ellipsoid : public Inclusion
     /// Returns class name of the receiver.
     const char *giveClassName() const { return "Ellipsoid"; }
 
-    IRResultType initializeFrom(InputRecord *ir);
-    //virtual IntArray* ResolveDofIDArray (char* initString);
-    /// prints receiver state on stdout. Usefull for debuging.
-    void         printYourself();
-
-    // to know whether a point is inside the ellipsoid
-    int isInside(double coord_x,double coord_y,double coord_z);
-    // 1 means inside , 0 outisde , 2 in the ITZ (if specified)
+    void initializeFrom(ConverterInputRecord &ir);
+  
+  // to know whether a point is inside the ellipsoid
+  // 1 means inside , 0 outisde , 2 in the ITZ (if specified)
+  int isInside(double coord_x,double coord_y,double coord_z); 
 
 };