[cig-commits] r11688 - cs/benchmark/cigma/trunk/src
luis at geodynamics.org
luis at geodynamics.org
Tue Apr 1 01:40:07 PDT 2008
Author: luis
Date: 2008-04-01 01:40:07 -0700 (Tue, 01 Apr 2008)
New Revision: 11688
Modified:
cs/benchmark/cigma/trunk/src/Hex.cpp
cs/benchmark/cigma/trunk/src/Quad.cpp
cs/benchmark/cigma/trunk/src/Tet.cpp
cs/benchmark/cigma/trunk/src/Tri.cpp
Log:
Namespace updates to {Hex,Tet,Quad,Tri}.cpp
Modified: cs/benchmark/cigma/trunk/src/Hex.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Hex.cpp 2008-04-01 08:40:05 UTC (rev 11687)
+++ cs/benchmark/cigma/trunk/src/Hex.cpp 2008-04-01 08:40:07 UTC (rev 11688)
@@ -1,6 +1,7 @@
#include "Hex.h"
-#include <cassert>
+using namespace cigma;
+
// ---------------------------------------------------------------------------
static void hex_shape(double u, double v, double w, double s[8])
@@ -57,7 +58,7 @@
// ---------------------------------------------------------------------------
-cigma::Hex::Hex()
+Hex::Hex()
{
const int hex_nno = 8;
const int hex_celldim = 3;
@@ -74,7 +75,7 @@
set_reference_vertices(verts, hex_nno);
}
-cigma::Hex::~Hex()
+Hex::~Hex()
{
}
@@ -84,7 +85,7 @@
* @param values values is an [num x ndofs] array (out)
*
*/
-void cigma::Hex::shape(int num, double *points, double *values)
+void Hex::shape(int num, double *points, double *values)
{
const int nno = n_nodes();
for (int i = 0; i < num; i++)
@@ -101,7 +102,7 @@
* @param points points is an [num x celldim] array (in)
* @param values values is an [num x ndofs x celldim] array (out)
*/
-void cigma::Hex::grad_shape(int num, double *points, double *values)
+void Hex::grad_shape(int num, double *points, double *values)
{
const int nno = n_nodes();
const int celldim = n_celldim();
@@ -121,7 +122,7 @@
#define ZERO (-1.0e-6)
#define ONE (1-ZERO)
-bool cigma::Hex::interior(double u, double v, double w)
+bool Hex::interior(double u, double v, double w)
{
if ((u < -ONE) || (v < -ONE) || (w < -ONE) ||
@@ -135,3 +136,4 @@
#undef ONE
#undef ZERO
+
Modified: cs/benchmark/cigma/trunk/src/Quad.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Quad.cpp 2008-04-01 08:40:05 UTC (rev 11687)
+++ cs/benchmark/cigma/trunk/src/Quad.cpp 2008-04-01 08:40:07 UTC (rev 11688)
@@ -1,6 +1,7 @@
#include "Quad.h"
-#include <cassert>
+using namespace cigma;
+
// ---------------------------------------------------------------------------
static void quad_shape(double u, double v, double s[4])
@@ -32,7 +33,7 @@
// ---------------------------------------------------------------------------
-cigma::Quad::Quad()
+Quad::Quad()
{
const int quad_nno = 4;
const int quad_celldim = 2;
@@ -45,7 +46,7 @@
set_reference_vertices(verts, quad_nno);
}
-cigma::Quad::~Quad()
+Quad::~Quad()
{
}
@@ -57,7 +58,7 @@
* @param points points is an [num x celldim] array (in)
* @param values values is an [num x ndofs] array (out)
*/
-void cigma::Quad::shape(int num, double *points, double *values)
+void Quad::shape(int num, double *points, double *values)
{
const int nno = n_nodes();
for (int i = 0; i < num; i++)
@@ -73,7 +74,7 @@
* @param points points is an [num x celldim] array (in)
* @param values values is an [num x ndofs x celldim] array (out)
*/
-void cigma::Quad::grad_shape(int num, double *points, double *values)
+void Quad::grad_shape(int num, double *points, double *values)
{
const int nno = n_nodes();
const int celldim = n_celldim();
@@ -94,7 +95,7 @@
#define ZERO (-1.0e-6)
#define ONE (1-ZERO)
-bool cigma::Quad::interior(double u, double v, double w)
+bool Quad::interior(double u, double v, double w)
{
if ((u < -ONE) || (v < -ONE) ||
(u > +ONE) || (v > +ONE))
Modified: cs/benchmark/cigma/trunk/src/Tet.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Tet.cpp 2008-04-01 08:40:05 UTC (rev 11687)
+++ cs/benchmark/cigma/trunk/src/Tet.cpp 2008-04-01 08:40:07 UTC (rev 11688)
@@ -1,8 +1,8 @@
-//#include <iostream>
-#include <cassert>
#include "Tet.h"
#include "Numeric.h"
+using namespace cigma;
+
// ---------------------------------------------------------------------------
static void tet_shape(double u, double v, double w, double s[4])
@@ -39,9 +39,8 @@
// ---------------------------------------------------------------------------
-cigma::Tet::Tet()
+Tet::Tet()
{
- //std::cout << "Calling cigma::Tet::Tet()\n";
const int tet_nno = 4;
const int tet_celldim = 3;
double verts[tet_nno * tet_celldim] = {
@@ -53,12 +52,11 @@
set_reference_vertices(verts, tet_nno);
}
-cigma::Tet::~Tet()
+Tet::~Tet()
{
- //std::cout << "Calling cigma::Tet::~Tet()\n";
}
-void cigma::Tet::shape(int num, double *points, double *values)
+void Tet::shape(int num, double *points, double *values)
{
const int nno = n_nodes();
for (int i = 0; i < num; i++)
@@ -70,7 +68,7 @@
}
}
-void cigma::Tet::grad_shape(int num, double *points, double *values)
+void Tet::grad_shape(int num, double *points, double *values)
{
const int nno = n_nodes();
const int celldim = n_celldim();
@@ -84,7 +82,7 @@
}
}
-void cigma::Tet::xyz2uvw(double xyz[3], double uvw[3])
+void Tet::xyz2uvw(double xyz[3], double uvw[3])
{
double det;
double mat[3][3], b[3];
@@ -133,7 +131,7 @@
}
-bool cigma::Tet::interior(double u, double v, double w)
+bool Tet::interior(double u, double v, double w)
{
#define ZERO (-1.0e-6)
#define ONE (1 - ZERO)
Modified: cs/benchmark/cigma/trunk/src/Tri.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Tri.cpp 2008-04-01 08:40:05 UTC (rev 11687)
+++ cs/benchmark/cigma/trunk/src/Tri.cpp 2008-04-01 08:40:07 UTC (rev 11688)
@@ -1,6 +1,7 @@
#include "Tri.h"
-#include <cassert>
+using namespace cigma;
+
// ---------------------------------------------------------------------------
static void tri_shape(double u, double v, double s[3])
@@ -29,7 +30,7 @@
// ---------------------------------------------------------------------------
-cigma::Tri::Tri()
+Tri::Tri()
{
const int tri_nno = 3;
const int tri_celldim = 2; // XXX
@@ -47,7 +48,7 @@
// ---------------------------------------------------------------------------
-void cigma::Tri::shape(int num, double *points, double *values)
+void Tri::shape(int num, double *points, double *values)
{
const int nno = n_nodes();
for (int i = 0; i < num; i++)
@@ -58,7 +59,7 @@
}
}
-void cigma::Tri::grad_shape(int num, double *points, double *values)
+void Tri::grad_shape(int num, double *points, double *values)
{
const int nno = n_nodes();
const int celldim = n_celldim();
@@ -72,13 +73,13 @@
}
-//void cigma::Tri::xyz2uvw(double xyz[3], double uvw[3]) {}
+//void Tri::xyz2uvw(double xyz[3], double uvw[3]) {}
#define ZERO (-1.0e-6)
#define ONE (1 - ZERO)
-bool cigma::Tri::interior(double u, double v, double w)
+bool Tri::interior(double u, double v, double w)
{
if ((u < ZERO) || (v < ZERO) || (u > (ONE - v)))
More information about the cig-commits
mailing list