[cig-commits] commit: Fix compiler warnings
Mercurial
hg at geodynamics.org
Tue Oct 4 15:09:36 PDT 2011
changeset: 804:efd77fe373cf
user: Walter Landry <wlandry at caltech.edu>
date: Tue Oct 04 15:06:53 2011 -0700
files: Discretisation/src/Biquadratic.cxx Discretisation/src/C0Generator.cxx Discretisation/src/C2Generator.cxx Discretisation/src/RegularBilinear.cxx Discretisation/src/RegularTrilinear.cxx Discretisation/src/TrilinearInnerElType.cxx Discretisation/src/Triquadratic.cxx
description:
Fix compiler warnings
diff -r 1a2252c44058 -r efd77fe373cf Discretisation/src/Biquadratic.cxx
--- a/Discretisation/src/Biquadratic.cxx Tue Oct 04 01:55:14 2011 -0700
+++ b/Discretisation/src/Biquadratic.cxx Tue Oct 04 15:06:53 2011 -0700
@@ -110,10 +110,6 @@ void _Biquadratic_Print( void* elementTy
void _Biquadratic_Print( void* elementType, Stream* stream ) {
Biquadratic* self = (Biquadratic*)elementType;
- /* Set the Journal for printing informations */
- Stream* elementTypeStream;
- elementTypeStream = Journal_Register( InfoStream_Type, (Name)"BiquadraticStream" );
-
/* Print parent */
Journal_Printf( stream, "Biquadratic (ptr): (%p)\n", self );
_ElementType_Print( self, stream );
@@ -223,14 +219,11 @@ double Biquadratic_JacobianDeterminantSu
unsigned face_I,
unsigned norm )
{
- Biquadratic* self = (Biquadratic*) elementType;
Mesh* mesh = (Mesh*)_mesh;
unsigned surfaceDim = ( norm + 1 ) % 2;
double x[3];
double detJac;
unsigned nodes[3];
-
- self = (Biquadratic*) elementType;
ElementType_GetFaceNodes( elementType, mesh, element_I, face_I, 3, nodes );
diff -r 1a2252c44058 -r efd77fe373cf Discretisation/src/C0Generator.cxx
--- a/Discretisation/src/C0Generator.cxx Tue Oct 04 01:55:14 2011 -0700
+++ b/Discretisation/src/C0Generator.cxx Tue Oct 04 15:06:53 2011 -0700
@@ -105,10 +105,6 @@ void _C0Generator_Print( void* generator
void _C0Generator_Print( void* generator, Stream* stream ) {
C0Generator* self = (C0Generator*)generator;
- /* Set the Journal for printing informations */
- Stream* generatorStream;
- generatorStream = Journal_Register( InfoStream_Type, (Name)"C0GeneratorStream" );
-
/* Print parent */
Journal_Printf( stream, "C0Generator (ptr): (%p)\n", self );
_MeshGenerator_Print( self, stream );
diff -r 1a2252c44058 -r efd77fe373cf Discretisation/src/C2Generator.cxx
--- a/Discretisation/src/C2Generator.cxx Tue Oct 04 01:55:14 2011 -0700
+++ b/Discretisation/src/C2Generator.cxx Tue Oct 04 15:06:53 2011 -0700
@@ -115,10 +115,6 @@ void _C2Generator_Print( void* meshGener
void _C2Generator_Print( void* meshGenerator, Stream* stream ) {
C2Generator* self = (C2Generator*)meshGenerator;
- /* Set the Journal for printing informations */
- Stream* meshGeneratorStream;
- meshGeneratorStream = Journal_Register( InfoStream_Type, (Name)"C2GeneratorStream" );
-
assert( self );
/* Print parent */
diff -r 1a2252c44058 -r efd77fe373cf Discretisation/src/RegularBilinear.cxx
--- a/Discretisation/src/RegularBilinear.cxx Tue Oct 04 01:55:14 2011 -0700
+++ b/Discretisation/src/RegularBilinear.cxx Tue Oct 04 15:06:53 2011 -0700
@@ -107,10 +107,6 @@ void _RegularBilinear_Print( void* eleme
void _RegularBilinear_Print( void* elementType, Stream* stream ) {
RegularBilinear* self = (RegularBilinear*)elementType;
- /* Set the Journal for printing informations */
- Stream* elementTypeStream;
- elementTypeStream = Journal_Register( InfoStream_Type, (Name)"RegularBilinearStream" );
-
/* Print parent */
Journal_Printf( stream, "RegularBilinear (ptr): (%p)\n", self );
_BilinearElementType_Print( self, stream );
diff -r 1a2252c44058 -r efd77fe373cf Discretisation/src/RegularTrilinear.cxx
--- a/Discretisation/src/RegularTrilinear.cxx Tue Oct 04 01:55:14 2011 -0700
+++ b/Discretisation/src/RegularTrilinear.cxx Tue Oct 04 15:06:53 2011 -0700
@@ -108,10 +108,6 @@ void _RegularTrilinear_Print( void* elem
void _RegularTrilinear_Print( void* elementType, Stream* stream ) {
RegularTrilinear* self = (RegularTrilinear*)elementType;
- /* Set the Journal for printing informations */
- Stream* elementTypeStream;
- elementTypeStream = Journal_Register( InfoStream_Type, (Name)"RegularTrilinearStream" );
-
/* Print parent */
Journal_Printf( stream, "RegularTrilinear (ptr): (%p)\n", self );
_TrilinearElementType_Print( self, stream );
diff -r 1a2252c44058 -r efd77fe373cf Discretisation/src/TrilinearInnerElType.cxx
--- a/Discretisation/src/TrilinearInnerElType.cxx Tue Oct 04 01:55:14 2011 -0700
+++ b/Discretisation/src/TrilinearInnerElType.cxx Tue Oct 04 15:06:53 2011 -0700
@@ -241,12 +241,10 @@ void _TrilinearInnerElType_SF_allNodes(
eta = localCoord[1];
zeta = localCoord[2];
- fac = 1.0/9.0;
-
- evaluatedValues[0] = fac*( - 4.0*xi - 20.0*eta + 12.0*zeta + 3.0 );
- evaluatedValues[1] = fac*( 16.0*xi - 64.0*eta + 60.0*zeta + 6.0 );
- evaluatedValues[2] = fac*( 36.0*eta - 36.0*zeta );
- evaluatedValues[3] = fac*( -12.0*xi + 48.0*eta - 36.0*zeta );
+ evaluatedValues[0] = -xi - eta/2 - zeta/4 + 0.125;
+ evaluatedValues[1] = xi - eta/2 - zeta/4 + 0.125;
+ evaluatedValues[2] = eta - zeta/2 + 0.25;
+ evaluatedValues[3] = zeta + 0.5;
}
@@ -261,22 +259,20 @@ void _TrilinearInnerElType_SF_allLocalDe
eta = localCoord[1];
zeta = localCoord[2];
- fac = 1.0/9.0;
-
- evaluatedDerivatives[0][0] = fac*( - 4.0 );
- evaluatedDerivatives[0][1] = fac*( 16.0 );
- evaluatedDerivatives[0][2] = 0.0 ;
- evaluatedDerivatives[0][3] = fac*( -12.0 );
+ evaluatedDerivatives[0][0] = -1;
+ evaluatedDerivatives[0][1] = 1;
+ evaluatedDerivatives[0][2] = 0;
+ evaluatedDerivatives[0][3] = 0;
- evaluatedDerivatives[1][0] = fac*( -20.0 );
- evaluatedDerivatives[1][1] = fac*( -64.0 );
- evaluatedDerivatives[1][2] = 4.0 ;
- evaluatedDerivatives[1][3] = fac*( 48.0 );
+ evaluatedDerivatives[1][0] = -0.5;
+ evaluatedDerivatives[1][1] = -0.5;
+ evaluatedDerivatives[1][2] = 1;
+ evaluatedDerivatives[1][3] = 0;
- evaluatedDerivatives[2][0] = fac*( 12.0 );
- evaluatedDerivatives[2][1] = fac*( 60.0 );
- evaluatedDerivatives[2][2] = - 4.0 ;
- evaluatedDerivatives[2][3] = - 4.0 ;
+ evaluatedDerivatives[2][0] = -0.25;
+ evaluatedDerivatives[2][1] = -0.25;
+ evaluatedDerivatives[2][2] = -0.5;
+ evaluatedDerivatives[2][3] = 1;
}
/* get rid of this function and just use the superclass (elementType) version, as for BilinearInner class?? */
diff -r 1a2252c44058 -r efd77fe373cf Discretisation/src/Triquadratic.cxx
--- a/Discretisation/src/Triquadratic.cxx Tue Oct 04 01:55:14 2011 -0700
+++ b/Discretisation/src/Triquadratic.cxx Tue Oct 04 15:06:53 2011 -0700
@@ -110,10 +110,6 @@ void _Triquadratic_Print( void* elementT
void _Triquadratic_Print( void* elementType, Stream* stream ) {
Triquadratic* self = (Triquadratic*)elementType;
- /* Set the Journal for printing informations */
- Stream* elementTypeStream;
- elementTypeStream = Journal_Register( InfoStream_Type, (Name)"TriquadraticStream" );
-
/* Print parent */
Journal_Printf( stream, "Triquadratic (ptr): (%p)\n", self );
_ElementType_Print( self, stream );
More information about the CIG-COMMITS
mailing list