[cig-commits] r11198 - in cs/benchmark/cigma/trunk/src: . tests
luis at geodynamics.org
luis at geodynamics.org
Wed Feb 20 05:12:39 PST 2008
Author: luis
Date: 2008-02-20 05:12:38 -0800 (Wed, 20 Feb 2008)
New Revision: 11198
Added:
cs/benchmark/cigma/trunk/src/QuadraturePoints.cpp
cs/benchmark/cigma/trunk/src/QuadraturePoints.h
Removed:
cs/benchmark/cigma/trunk/src/Quadrature.cpp
cs/benchmark/cigma/trunk/src/Quadrature.h
Modified:
cs/benchmark/cigma/trunk/src/CompareCmd.cpp
cs/benchmark/cigma/trunk/src/CompareCmd.h
cs/benchmark/cigma/trunk/src/FE.cpp
cs/benchmark/cigma/trunk/src/FE.h
cs/benchmark/cigma/trunk/src/FE_Field.cpp
cs/benchmark/cigma/trunk/src/HdfReader.h
cs/benchmark/cigma/trunk/src/Makefile.am
cs/benchmark/cigma/trunk/src/QuadratureIO.cpp
cs/benchmark/cigma/trunk/src/QuadratureIO.h
cs/benchmark/cigma/trunk/src/tests/TestQuadrature.cpp
Log:
Renamed class cigma::Quadrature to cigma::QuadraturePoints
Modified: cs/benchmark/cigma/trunk/src/CompareCmd.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/CompareCmd.cpp 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/CompareCmd.cpp 2008-02-20 13:12:38 UTC (rev 11198)
@@ -280,7 +280,7 @@
// XXX: first variable block
Cell *cell = field_a->fe->cell; // XXX: change to mesh->fe->cell
- Quadrature *quadrature = field_a->fe->quadrature; // XXX: change to mesh->fe->quadrature
+ QuadraturePoints *quadrature = field_a->fe->quadrature; // XXX: change to mesh->fe->quadrature
ResidualField *residuals = env->residuals;
Modified: cs/benchmark/cigma/trunk/src/CompareCmd.h
===================================================================
--- cs/benchmark/cigma/trunk/src/CompareCmd.h 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/CompareCmd.h 2008-02-20 13:12:38 UTC (rev 11198)
@@ -34,7 +34,7 @@
int run();
public:
- Quadrature *quadrature;
+ QuadraturePoints *quadrature;
MeshPart *mesh;
FE_Field *field_a;
FE_Field *field_b;
Modified: cs/benchmark/cigma/trunk/src/FE.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/FE.cpp 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/FE.cpp 2008-02-20 13:12:38 UTC (rev 11198)
@@ -28,7 +28,7 @@
this->cell = cell;
}
-void cigma::FE::set_quadrature(Quadrature *quadrature)
+void cigma::FE::set_quadrature(QuadraturePoints *quadrature)
{
assert(cell != 0);
Modified: cs/benchmark/cigma/trunk/src/FE.h
===================================================================
--- cs/benchmark/cigma/trunk/src/FE.h 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/FE.h 2008-02-20 13:12:38 UTC (rev 11198)
@@ -3,7 +3,7 @@
#include "Cell.h"
#include "Points.h"
-#include "Quadrature.h"
+#include "QuadraturePoints.h"
namespace cigma
{
@@ -22,14 +22,14 @@
public:
void set_cell(Cell *cell);
- void set_quadrature(Quadrature *quadrature);
+ void set_quadrature(QuadraturePoints *quadrature);
public:
void update_jxw();
public:
Cell *cell;
- Quadrature *quadrature;
+ QuadraturePoints *quadrature;
double *jxw;
double *basis_tab; // [nq x ndofs]
double *basis_jet; // [nq x ndofs x celldim]
Modified: cs/benchmark/cigma/trunk/src/FE_Field.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/FE_Field.cpp 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/FE_Field.cpp 2008-02-20 13:12:38 UTC (rev 11198)
@@ -80,7 +80,7 @@
assert(cell != 0);
// quadrature
- Quadrature *quadrature = fe->quadrature;
+ QuadraturePoints *quadrature = fe->quadrature;
assert(quadrature != 0);
int nq = quadrature->n_points();
double *qpts = quadrature->qpts;
Modified: cs/benchmark/cigma/trunk/src/HdfReader.h
===================================================================
--- cs/benchmark/cigma/trunk/src/HdfReader.h 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/HdfReader.h 2008-02-20 13:12:38 UTC (rev 11198)
@@ -5,7 +5,7 @@
#include "hdf5.h"
#include "Reader.h"
-#include "Quadrature.h"
+#include "QuadraturePoints.h"
#include "MeshPart.h"
#include "DofHandler.h"
#include "FE_Field.h"
@@ -36,8 +36,8 @@
void get_connectivity(const char *loc, int **connectivity, int *nel, int *ndofs);
public:
- void get_quadrature(Quadrature *quadrature, const char *loc);
- void get_quadrature(Quadrature *quadrature, const char *points_loc, const char *weights_loc);
+ void get_quadrature(QuadraturePoints *quadrature, const char *loc);
+ void get_quadrature(QuadraturePoints *quadrature, const char *points_loc, const char *weights_loc);
public:
void get_field(FE_Field *field, const char *loc);
Modified: cs/benchmark/cigma/trunk/src/Makefile.am
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile.am 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/Makefile.am 2008-02-20 13:12:38 UTC (rev 11198)
@@ -111,10 +111,10 @@
PointField.h \
Quad.cpp \
Quad.h \
- Quadrature.cpp \
- Quadrature.h \
QuadratureIO.cpp \
QuadratureIO.h \
+ QuadraturePoints.cpp \
+ QuadraturePoints.h \
Reader.cpp \
Reader.h \
ResidualField.cpp \
Deleted: cs/benchmark/cigma/trunk/src/Quadrature.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Quadrature.cpp 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/Quadrature.cpp 2008-02-20 13:12:38 UTC (rev 11198)
@@ -1,84 +0,0 @@
-#include "Quadrature.h"
-
-// ---------------------------------------------------------------------------
-
-cigma::Quadrature::Quadrature()
-{
- qdim = 0;
- qpts = 0;
- qwts = 0;
-}
-
-
-cigma::Quadrature::~Quadrature()
-{
- if (qpts != 0) delete [] qpts;
- if (qwts != 0) delete [] qwts;
- if (data != 0) delete [] data;
-}
-
-
-// ---------------------------------------------------------------------------
-
-void cigma::Quadrature::set_quadrature(double *quadpts, double *quadwts, int npts, int qdim)
-{
- /* some basic assertions */
- assert(quadpts != 0);
- assert(quadwts != 0);
- assert(npts > 0);
- assert(qdim > 0);
-
- /* clear existing data */
- if (qpts != 0) delete [] qpts;
- if (qwts != 0) delete [] qwts;
-
- /* set dimensions */
- this->num = npts;
- this->qdim = qdim;
-
- /* allocate new data arrays */
- qpts = new double[num * qdim];
- qwts = new double[num];
-
- /* copy from quadpts & quadwts */
- int i,j;
- for (i = 0; i < num; i++)
- {
- qwts[i] = quadwts[i];
- for (j = 0; j < qdim; j++)
- {
- int n = qdim*i + j;
- qpts[n] = quadpts[n];
- }
- }
-}
-
-void cigma::Quadrature::set_globaldim(int dim)
-{
- assert(num > 0);
- this->dim = dim;
- this->data = new double[num * dim];
- for (int i = 0; i < num; i++)
- {
- for (int j = 0; j < dim; j++)
- {
- data[dim*i+j] = 0.0;
- }
- }
-}
-
-
-void cigma::Quadrature::apply_refmap(Cell *cell)
-{
- assert(cell != 0);
- assert(data != 0);
-
- for (int i = 0; i < num; i++)
- {
- double *uvw = &qpts[qdim*i];
- double *xyz = &data[dim*i];
- cell->uvw2xyz(uvw, xyz);
- }
-}
-
-// ---------------------------------------------------------------------------
Deleted: cs/benchmark/cigma/trunk/src/Quadrature.h
===================================================================
--- cs/benchmark/cigma/trunk/src/Quadrature.h 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/Quadrature.h 2008-02-20 13:12:38 UTC (rev 11198)
@@ -1,67 +0,0 @@
-#ifndef __QUADRATURE_H__
-#define __QUADRATURE_H__
-
-#include "Cell.h"
-#include "Points.h"
-
-namespace cigma
-{
- class Quadrature;
-}
-
-/**
- * @brief Quadrature scheme
- *
- */
-
-class cigma::Quadrature : public Points
-{
-public:
- Quadrature();
- ~Quadrature();
-
-public:
- void set_quadrature(double *quadpts, double *quadwts, int npts, int qdim);
- void set_globaldim(int dim);
- void apply_refmap(Cell *cell);
-
-public:
- int n_refdim() const;
- int n_globaldim() const;
-
-public:
- double point(int i, int j) const;
- double weight(int i) const;
-
-public:
- int qdim;
- double *qpts;
- double *qwts;
-};
-
-// ---------------------------------------------------------------------------
-
-
-inline int cigma::Quadrature::n_refdim() const
-{
- return qdim;
-}
-
-inline int cigma::Quadrature::n_globaldim() const
-{
- return dim;
-}
-
-inline double cigma::Quadrature::point(int i, int j) const
-{
- return qpts[qdim*i + j];
-}
-
-inline double cigma::Quadrature::weight(int i) const
-{
- return qwts[i];
-}
-
-// ---------------------------------------------------------------------------
-
-#endif
Modified: cs/benchmark/cigma/trunk/src/QuadratureIO.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/QuadratureIO.cpp 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/QuadratureIO.cpp 2008-02-20 13:12:38 UTC (rev 11198)
@@ -338,22 +338,22 @@
switch (cell->geometry())
{
case Cell::TRIANGLE:
- quadrature = new Quadrature();
+ quadrature = new QuadraturePoints();
quadrature->set_quadrature(tri_qpts, tri_qwts, tri_nno, tri_celldim);
quadrature->set_globaldim(tri_nsd);
break;
case Cell::QUADRANGLE:
- quadrature = new Quadrature();
+ quadrature = new QuadraturePoints();
quadrature->set_quadrature(quad_qpts, quad_qwts, quad_nno, quad_celldim);
quadrature->set_globaldim(quad_nsd);
break;
case Cell::TETRAHEDRON:
- quadrature = new Quadrature();
+ quadrature = new QuadraturePoints();
quadrature->set_quadrature(tet_qpts, tet_qwts, tet_nno, tet_celldim);
quadrature->set_globaldim(tet_nsd);
break;
case Cell::HEXAHEDRON:
- quadrature = new Quadrature();
+ quadrature = new QuadraturePoints();
quadrature->set_quadrature(hex_qpts, hex_qwts, hex_nno, hex_celldim);
quadrature->set_globaldim(hex_nsd);
break;
@@ -364,7 +364,7 @@
if ((qx != 0) && (qw != 0))
{
- quadrature = new Quadrature();
+ quadrature = new QuadraturePoints();
quadrature->set_quadrature(qx, qw, nq, nd);
quadrature->set_globaldim(3); // XXX: how to treat 2D case?
}
Modified: cs/benchmark/cigma/trunk/src/QuadratureIO.h
===================================================================
--- cs/benchmark/cigma/trunk/src/QuadratureIO.h 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/QuadratureIO.h 2008-02-20 13:12:38 UTC (rev 11198)
@@ -5,7 +5,7 @@
#include "AnyOption.h"
#include "Reader.h"
#include "Writer.h"
-#include "Quadrature.h"
+#include "QuadraturePoints.h"
#include "Cell.h"
class QuadratureIO
@@ -19,7 +19,7 @@
std::string quadrature_path;
std::string points_path;
std::string weights_path;
- cigma::Quadrature *quadrature;
+ cigma::QuadraturePoints *quadrature;
public:
QuadratureIO();
Copied: cs/benchmark/cigma/trunk/src/QuadraturePoints.cpp (from rev 11197, cs/benchmark/cigma/trunk/src/Quadrature.cpp)
===================================================================
--- cs/benchmark/cigma/trunk/src/QuadraturePoints.cpp (rev 0)
+++ cs/benchmark/cigma/trunk/src/QuadraturePoints.cpp 2008-02-20 13:12:38 UTC (rev 11198)
@@ -0,0 +1,84 @@
+#include "QuadraturePoints.h"
+
+// ---------------------------------------------------------------------------
+
+cigma::QuadraturePoints::QuadraturePoints()
+{
+ qdim = 0;
+ qpts = 0;
+ qwts = 0;
+}
+
+
+cigma::QuadraturePoints::~QuadraturePoints()
+{
+ if (qpts != 0) delete [] qpts;
+ if (qwts != 0) delete [] qwts;
+ if (data != 0) delete [] data;
+}
+
+
+// ---------------------------------------------------------------------------
+
+void cigma::QuadraturePoints::set_quadrature(double *quadpts, double *quadwts, int npts, int qdim)
+{
+ /* some basic assertions */
+ assert(quadpts != 0);
+ assert(quadwts != 0);
+ assert(npts > 0);
+ assert(qdim > 0);
+
+ /* clear existing data */
+ if (qpts != 0) delete [] qpts;
+ if (qwts != 0) delete [] qwts;
+
+ /* set dimensions */
+ this->num = npts;
+ this->qdim = qdim;
+
+ /* allocate new data arrays */
+ qpts = new double[num * qdim];
+ qwts = new double[num];
+
+ /* copy from quadpts & quadwts */
+ int i,j;
+ for (i = 0; i < num; i++)
+ {
+ qwts[i] = quadwts[i];
+ for (j = 0; j < qdim; j++)
+ {
+ int n = qdim*i + j;
+ qpts[n] = quadpts[n];
+ }
+ }
+}
+
+void cigma::QuadraturePoints::set_globaldim(int dim)
+{
+ assert(num > 0);
+ this->dim = dim;
+ this->data = new double[num * dim];
+ for (int i = 0; i < num; i++)
+ {
+ for (int j = 0; j < dim; j++)
+ {
+ data[dim*i+j] = 0.0;
+ }
+ }
+}
+
+
+void cigma::QuadraturePoints::apply_refmap(Cell *cell)
+{
+ assert(cell != 0);
+ assert(data != 0);
+
+ for (int i = 0; i < num; i++)
+ {
+ double *uvw = &qpts[qdim*i];
+ double *xyz = &data[dim*i];
+ cell->uvw2xyz(uvw, xyz);
+ }
+}
+
+// ---------------------------------------------------------------------------
Copied: cs/benchmark/cigma/trunk/src/QuadraturePoints.h (from rev 11197, cs/benchmark/cigma/trunk/src/Quadrature.h)
===================================================================
--- cs/benchmark/cigma/trunk/src/QuadraturePoints.h (rev 0)
+++ cs/benchmark/cigma/trunk/src/QuadraturePoints.h 2008-02-20 13:12:38 UTC (rev 11198)
@@ -0,0 +1,67 @@
+#ifndef __QUADRATURE_POINTS_H__
+#define __QUADRATURE_POINTS_H__
+
+#include "Cell.h"
+#include "Points.h"
+
+namespace cigma
+{
+ class QuadraturePoints;
+}
+
+/**
+ * @brief QuadraturePoints scheme
+ *
+ */
+
+class cigma::QuadraturePoints : public Points
+{
+public:
+ QuadraturePoints();
+ ~QuadraturePoints();
+
+public:
+ void set_quadrature(double *quadpts, double *quadwts, int npts, int qdim);
+ void set_globaldim(int dim);
+ void apply_refmap(Cell *cell);
+
+public:
+ int n_refdim() const;
+ int n_globaldim() const;
+
+public:
+ double point(int i, int j) const;
+ double weight(int i) const;
+
+public:
+ int qdim;
+ double *qpts;
+ double *qwts;
+};
+
+// ---------------------------------------------------------------------------
+
+
+inline int cigma::QuadraturePoints::n_refdim() const
+{
+ return qdim;
+}
+
+inline int cigma::QuadraturePoints::n_globaldim() const
+{
+ return dim;
+}
+
+inline double cigma::QuadraturePoints::point(int i, int j) const
+{
+ return qpts[qdim*i + j];
+}
+
+inline double cigma::QuadraturePoints::weight(int i) const
+{
+ return qwts[i];
+}
+
+// ---------------------------------------------------------------------------
+
+#endif
Modified: cs/benchmark/cigma/trunk/src/tests/TestQuadrature.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/tests/TestQuadrature.cpp 2008-02-20 13:12:36 UTC (rev 11197)
+++ cs/benchmark/cigma/trunk/src/tests/TestQuadrature.cpp 2008-02-20 13:12:38 UTC (rev 11198)
@@ -1,7 +1,7 @@
#include <iostream>
#include <iomanip>
#include "../Tet.h"
-#include "../Quadrature.h"
+#include "../QuadraturePoints.h"
int main()
{
@@ -29,7 +29,7 @@
-0.74470688, -0.4120024 , 0.08830369
};
- Quadrature Q;
+ QuadraturePoints Q;
Q.set_quadrature(qpts, qwts, npts, 3);
/*
More information about the cig-commits
mailing list