change to size_t

This commit is contained in:
Joachim Schoeberl 2010-04-22 12:28:55 +00:00
parent dbd73daf8d
commit cc66083309
7 changed files with 55 additions and 55 deletions

View File

@ -175,9 +175,9 @@ extern "C" {
/// x ..global coordinates /// x ..global coordinates
/// dxdxi...D x D Jacobian matrix (row major storage) /// dxdxi...D x D Jacobian matrix (row major storage)
DLL_HEADER void Ng_GetMultiElementTransformation (int ei, int n, DLL_HEADER void Ng_GetMultiElementTransformation (int ei, int n,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi); double * dxdxi, size_t sdxdxi);

View File

@ -130,9 +130,9 @@ namespace netgen
/// dxdxi...DIM_SPACE x DIM_EL Jacobian matrix (row major storage) /// dxdxi...DIM_SPACE x DIM_EL Jacobian matrix (row major storage)
template <int DIM_EL, int DIM_SPACE> template <int DIM_EL, int DIM_SPACE>
DLL_HEADER void Ng_MultiElementTransformation (int elnr, int npts, DLL_HEADER void Ng_MultiElementTransformation (int elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi); double * dxdxi, size_t sdxdxi);
template <int DIM> template <int DIM>
DLL_HEADER int Ng_GetElementIndex (int nr); DLL_HEADER int Ng_GetElementIndex (int nr);

View File

@ -2884,9 +2884,9 @@ namespace netgen
template <int DIM_SPACE> template <int DIM_SPACE>
void CurvedElements :: void CurvedElements ::
CalcMultiPointSurfaceTransformation (SurfaceElementIndex elnr, int npts, CalcMultiPointSurfaceTransformation (SurfaceElementIndex elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
if (mesh.coarsemesh) if (mesh.coarsemesh)
{ {
@ -3031,15 +3031,15 @@ namespace netgen
template void CurvedElements :: template void CurvedElements ::
CalcMultiPointSurfaceTransformation<2> (SurfaceElementIndex elnr, int npts, CalcMultiPointSurfaceTransformation<2> (SurfaceElementIndex elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi); double * dxdxi, size_t sdxdxi);
template void CurvedElements :: template void CurvedElements ::
CalcMultiPointSurfaceTransformation<3> (SurfaceElementIndex elnr, int npts, CalcMultiPointSurfaceTransformation<3> (SurfaceElementIndex elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi); double * dxdxi, size_t sdxdxi);
@ -3200,9 +3200,9 @@ namespace netgen
void CurvedElements :: void CurvedElements ::
CalcMultiPointElementTransformation (ElementIndex elnr, int n, CalcMultiPointElementTransformation (ElementIndex elnr, int n,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
if (mesh.coarsemesh) if (mesh.coarsemesh)
{ {

View File

@ -125,9 +125,9 @@ public:
template <int DIM_SPACE> template <int DIM_SPACE>
void CalcMultiPointSurfaceTransformation (SurfaceElementIndex elnr, int n, void CalcMultiPointSurfaceTransformation (SurfaceElementIndex elnr, int n,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi); double * dxdxi, size_t sdxdxi);
void CalcMultiPointElementTransformation (Array< Point<3> > * xi, ElementIndex elnr, void CalcMultiPointElementTransformation (Array< Point<3> > * xi, ElementIndex elnr,
@ -135,9 +135,9 @@ public:
Array< Mat<3,3> > * dxdxi); Array< Mat<3,3> > * dxdxi);
void CalcMultiPointElementTransformation (ElementIndex elnr, int n, void CalcMultiPointElementTransformation (ElementIndex elnr, int n,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi); double * dxdxi, size_t sdxdxi);

View File

@ -920,9 +920,9 @@ void Ng_GetBufferedElementTransformation (int ei, const double * xi,
void Ng_GetMultiElementTransformation (int ei, int n, void Ng_GetMultiElementTransformation (int ei, int n,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
if (mesh->GetDimension() == 2) if (mesh->GetDimension() == 2)
mesh->GetCurvedElements().CalcMultiPointSurfaceTransformation<2> (ei-1, n, xi, sxi, x, sx, dxdxi, sdxdxi); mesh->GetCurvedElements().CalcMultiPointSurfaceTransformation<2> (ei-1, n, xi, sxi, x, sx, dxdxi, sdxdxi);

View File

@ -185,36 +185,36 @@ namespace netgen
template <> template <>
DLL_HEADER void Ng_MultiElementTransformation<3,3> (int elnr, int npts, DLL_HEADER void Ng_MultiElementTransformation<3,3> (int elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
mesh->GetCurvedElements().CalcMultiPointElementTransformation (elnr, npts, xi, sxi, x, sx, dxdxi, sdxdxi); mesh->GetCurvedElements().CalcMultiPointElementTransformation (elnr, npts, xi, sxi, x, sx, dxdxi, sdxdxi);
} }
template <> template <>
DLL_HEADER void Ng_MultiElementTransformation<2,2> (int elnr, int npts, DLL_HEADER void Ng_MultiElementTransformation<2,2> (int elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
mesh->GetCurvedElements().CalcMultiPointSurfaceTransformation<2> (elnr, npts, xi, sxi, x, sx, dxdxi, sdxdxi); mesh->GetCurvedElements().CalcMultiPointSurfaceTransformation<2> (elnr, npts, xi, sxi, x, sx, dxdxi, sdxdxi);
} }
template <> template <>
DLL_HEADER void Ng_MultiElementTransformation<2,3> (int elnr, int npts, DLL_HEADER void Ng_MultiElementTransformation<2,3> (int elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
mesh->GetCurvedElements().CalcMultiPointSurfaceTransformation<3> (elnr, npts, xi, sxi, x, sx, dxdxi, sdxdxi); mesh->GetCurvedElements().CalcMultiPointSurfaceTransformation<3> (elnr, npts, xi, sxi, x, sx, dxdxi, sdxdxi);
} }
template <> template <>
DLL_HEADER void Ng_MultiElementTransformation<1,2> (int elnr, int npts, DLL_HEADER void Ng_MultiElementTransformation<1,2> (int elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
for (int ip = 0; ip < npts; ip++) for (int ip = 0; ip < npts; ip++)
{ {
@ -235,9 +235,9 @@ namespace netgen
template <> template <>
DLL_HEADER void Ng_MultiElementTransformation<1,1> (int elnr, int npts, DLL_HEADER void Ng_MultiElementTransformation<1,1> (int elnr, int npts,
const double * xi, int sxi, const double * xi, size_t sxi,
double * x, int sx, double * x, size_t sx,
double * dxdxi, int sdxdxi) double * dxdxi, size_t sdxdxi)
{ {
cout << "1D not supported" << endl; cout << "1D not supported" << endl;
} }

View File

@ -327,7 +327,7 @@
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="2" WarningLevel="2"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
@ -944,11 +944,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\gprim\gprim.hpp" RelativePath="..\libsrc\include\gprim.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\gprim.hpp" RelativePath="..\libsrc\gprim\gprim.hpp"
> >
</File> </File>
<File <File
@ -1032,11 +1032,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\meshing.hpp" RelativePath="..\libsrc\meshing\meshing.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\meshing\meshing.hpp" RelativePath="..\libsrc\include\meshing.hpp"
> >
</File> </File>
<File <File
@ -1116,11 +1116,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\occ\occgeom.hpp" RelativePath="..\libsrc\include\occgeom.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\occgeom.hpp" RelativePath="..\libsrc\occ\occgeom.hpp"
> >
</File> </File>
<File <File
@ -1128,11 +1128,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\linalg\opti.hpp" RelativePath="..\libsrc\include\opti.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\opti.hpp" RelativePath="..\libsrc\linalg\opti.hpp"
> >
</File> </File>
<File <File
@ -1240,11 +1240,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\stlgeom\stlgeom.hpp" RelativePath="..\libsrc\include\stlgeom.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\stlgeom.hpp" RelativePath="..\libsrc\stlgeom\stlgeom.hpp"
> >
</File> </File>
<File <File
@ -1308,11 +1308,11 @@
> >
</File> </File>
<File <File
RelativePath="..\libsrc\include\visual.hpp" RelativePath="..\libsrc\visualization\visual.hpp"
> >
</File> </File>
<File <File
RelativePath="..\libsrc\visualization\visual.hpp" RelativePath="..\libsrc\include\visual.hpp"
> >
</File> </File>
<File <File