Changeset 372 for trunk/src2

Timestamp:

Mar 23, 2006, 7:41:29 AM (19 years ago)

Author:

mmc

Message:

Added field scaling and made points outside of volume invisible.

Location:

trunk/src2/core

Files:

• RpField1D.cc (modified) (7 diffs)
• RpField1D.h (modified) (1 diff)
• RpFieldPrism3D.cc (modified) (2 diffs)
• RpFieldPrism3D.h (modified) (1 diff)
• RpFieldRect3D.cc (modified) (2 diffs)
• RpFieldRect3D.h (modified) (2 diffs)
• RpFieldTri2D.cc (modified) (2 diffs)
• RpFieldTri2D.h (modified) (1 diff)
• RpMeshTri2D.cc (modified) (5 diffs)

trunk/src2/core/RpField1D.cc

@@ -16 +16 @@
  */
 #include <assert.h>
+#include <math.h>
 #include "RpField1D.h"
 
@@ -21 +22 @@
 
 Field1D::Field1D()
-  : _meshPtr(NULL),
+  : _vmin(NAN),
+    _vmax(NAN),
+    _meshPtr(NULL),
     _counter(0)
 {
@@ -29 +32 @@
 Field1D::Field1D(const Ptr<Mesh1D>& meshPtr)
   : _valuelist(),
+    _vmin(NAN),
+    _vmax(NAN),
     _meshPtr(meshPtr),
     _counter(0)
@@ -36 +41 @@
 Field1D::Field1D(const Field1D& field)
   : _valuelist(field._valuelist),
+    _vmin(field._vmin),
+    _vmax(field._vmax),
     _meshPtr(field._meshPtr),
     _counter(0)
@@ -45 +52 @@
 {
     _valuelist = field._valuelist;
+    _vmin = field._vmin;
+    _vmax = field._vmax;
     _meshPtr = field._meshPtr;
     _counter = field._counter;
@@ -130 +139 @@
 {
     _valuelist[nodeId] = y;
+
+    if (_vmin == NAN || _vmax == NAN) {
+        _vmin = _vmax = y;
+    } else {
+        if (y < _vmin) { _vmin = y; }
+        if (y > _vmax) { _vmax = y; }
+    }
 }
 
@@ -166 +182 @@
     return 0.0;
 }
+
+double
+Field1D::valueMin() const
+{
+    return _vmin;
+}
+
+double
+Field1D::valueMax() const
+{
+    return _vmax;
+}

trunk/src2/core/RpField1D.h

@@ -43 +43 @@
     virtual int define(int nodeId, double y);
     virtual double value(double x) const;
+    virtual double valueMin() const;
+    virtual double valueMax() const;
 
 private:
     std::deque<double> _valuelist;  // list of all values, in nodeId order
+    double _vmin;                   // minimum value in _valuelist
+    double _vmax;                   // maximum value in _valuelist
     Ptr<Mesh1D> _meshPtr;           // mesh for all x-points
     int _counter;                   // counter for generating node IDs

trunk/src2/core/RpFieldPrism3D.cc

@@ -77 +77 @@
 {
     _valuelist[nodeId] = f;
+
+    if (_vmin == NAN || _vmax == NAN) {
+        _vmin = _vmax = f;
+    } else {
+        if (f < _vmin) { _vmin = f; }
+        if (f > _vmax) { _vmax = f; }
+    }
     return *this;
 }
@@ -125 +132 @@
     return outside;
 }
+
+double
+FieldPrism3D::valueMin() const
+{
+    return _vmin;
+}
+
+double
+FieldPrism3D::valueMax() const
+{
+    return _vmax;
+}

trunk/src2/core/RpFieldPrism3D.h

@@ -38 +38 @@
     virtual double value(double x, double y, double z,
         double outside=NAN) const;
+    virtual double valueMin() const;
+    virtual double valueMax() const;
 
 private:
-    std::vector<double> _valuelist; // list of all values, in nodeId order
+    std::vector<double> _valuelist;  // list of all values, in nodeId order
+    double _vmin;                    // minimum value in _valuelist
+    double _vmax;                    // maximum value in _valuelist
     Ptr<MeshPrism3D> _meshPtr;       // mesh for all (x,y,z) points
-    int _counter;                   // counter for generating node IDs
+    int _counter;                    // counter for generating node IDs
 };
 

trunk/src2/core/RpFieldRect3D.cc

@@ -97 +97 @@
 {
     _valuelist[nodeId] = f;
+
+    if (_vmin == NAN || _vmax == NAN) {
+        _vmin = _vmax = f;
+    } else {
+        if (f < _vmin) { _vmin = f; }
+        if (f > _vmax) { _vmax = f; }
+    }
     return *this;
 }
@@ -147 +154 @@
 
 double
+FieldRect3D::valueMin() const
+{
+    return _vmin;
+}
+
+double
+FieldRect3D::valueMax() const
+{
+    return _vmax;
+}
+
+double
 FieldRect3D::_interpolate(double x0, double y0, double x1, double y1,
     double x) const

trunk/src2/core/RpFieldRect3D.h

@@ -40 +40 @@
     virtual double value(double x, double y, double z,
         double outside=NAN) const;
+    virtual double valueMin() const;
+    virtual double valueMax() const;
 
 protected:
@@ -47 +49 @@
 private:
     std::vector<double> _valuelist; // list of all values, in nodeId order
+    double _vmin;                   // minimum value in _valuelist
+    double _vmax;                   // maximum value in _valuelist
     Ptr<MeshRect3D> _meshPtr;       // mesh for all (x,y,z) points
     int _counter;                   // counter for generating node IDs

trunk/src2/core/RpFieldTri2D.cc

@@ -93 +93 @@
 {
     _valuelist[nodeId] = f;
+
+    if (_vmin == NAN || _vmax == NAN) {
+        _vmin = _vmax = f;
+    } else {
+        if (f < _vmin) { _vmin = f; }
+        if (f > _vmax) { _vmax = f; }
+    }
     return *this;
 }
@@ -118 +125 @@
     return outside;
 }
+
+double
+FieldTri2D::valueMin() const
+{
+    return _vmin;
+}
+
+double
+FieldTri2D::valueMax() const
+{
+    return _vmax;
+}

trunk/src2/core/RpFieldTri2D.h

@@ -39 +39 @@
     virtual FieldTri2D& define(int nodeId, double f);
     virtual double value(double x, double y, double outside=NAN) const;
+    virtual double valueMin() const;
+    virtual double valueMax() const;
 
 private:
     std::vector<double> _valuelist; // list of all values, in nodeId order
+    double _vmin;                   // minimum value in _valuelist
+    double _vmax;                   // maximum value in _valuelist
     Ptr<MeshTri2D> _meshPtr;        // mesh for all (x,y) points
     int _counter;                   // counter for generating node IDs

trunk/src2/core/RpMeshTri2D.cc

@@ -14 +14 @@
  */
 #include <math.h>
+#include <iostream>
 #include "RpMeshTri2D.h"
 
@@ -111 +112 @@
     double det = x2*y3-x3*y2;
 
-    phi[1] = (xr*y3 - x3*yr)/det;
-    phi[2] = (x2*yr - xr*y2)/det;
-    phi[0] = 1.0-phi[1]-phi[2];
+    if (det != 0.0) {
+        phi[1] = (xr*y3 - x3*yr)/det;
+        phi[2] = (x2*yr - xr*y2)/det;
+        phi[0] = 1.0-phi[1]-phi[2];
+    } else {
+        phi[1] = NAN;
+        phi[2] = NAN;
+        phi[0] = NAN;
+    }
 }
 
@@ -340 +347 @@
     }
 
+    int lastCellId = -1;
     while (!cell.isNull()) {
         double phi[3];
@@ -346 +354 @@
         // if all are >= 0, then this tri contains node
         cell.barycentrics(node, phi);
+        if (isnan(phi[0])) {
+            cell.clear();
+            return cell;
+        }
         if (phi[0] >= 0.0 && phi[1] >= 0.0 && phi[2] >= 0.0) {
             break;
@@ -360 +372 @@
         Tri2D& tri = nonconst->_celllist[ cell.cellId() ];
         int neighborId = tri.neighbors[dir];
-        if (neighborId < 0) {
+        if (neighborId < 0 || neighborId == lastCellId) {
+if (neighborId == lastCellId) {
+std::cout << "loop at " << lastCellId << "->" << neighborId << std::endl;
+}
             cell.clear();
             return cell;
         }
 
+        lastCellId = cell.cellId();
         Tri2D& tri2 = nonconst->_celllist[neighborId];
         Node2D *n1Ptr = &nonconst->_nodelist[tri2.nodes[0]];