Commit 6e2c49fc authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Fix windows compile errors.

Changed errors to warning in prism parallel axes test.


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@3994 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent 0ce73416
......@@ -654,9 +654,10 @@ namespace Nektar
Array<OneD, NekDouble> &outarray,
bool UseContCoeffs = false);
void GeneralMatrixOp_IterPerExp( const GlobalMatrixKey &gkey,
const Array<OneD,const NekDouble> &inarray,
Array<OneD, NekDouble> &outarray);
MULTI_REGIONS_EXPORT void GeneralMatrixOp_IterPerExp(
const GlobalMatrixKey &gkey,
const Array<OneD,const NekDouble> &inarray,
Array<OneD, NekDouble> &outarray);
inline void SetUpPhysNormals();
......@@ -752,7 +753,7 @@ namespace Nektar
* using the basic ExpList Elemental expansions rather
* than planes in homogeneous case
*/
void ExtractElmtDataToCoeffs(
MULTI_REGIONS_EXPORT void ExtractElmtDataToCoeffs(
SpatialDomains::FieldDefinitionsSharedPtr &fielddef,
std::vector<NekDouble> &fielddata,
std::string &field,
......
......@@ -644,9 +644,11 @@ namespace Nektar
}
// check that both these axis are indeed parallel
ASSERTL1(fabs(elementAaxis_length*faceBaxis_length - fabs(dotproduct1)) <
NekConstants::kNekZeroTol,
"These vectors should be parallel");
if (fabs(elementAaxis_length*faceBaxis_length
- fabs(dotproduct1)) > NekConstants::kNekZeroTol)
{
cout << "Warning: Prism axes not parallel" << endl;
}
// if the result is negative, both axis point in reverse
// directions
......@@ -663,9 +665,11 @@ namespace Nektar
}
// check that both these axis are indeed parallel
ASSERTL1(fabs(elementBaxis_length*faceAaxis_length - fabs(dotproduct2)) <
NekConstants::kNekZeroTol,
"These vectors should be parallel");
if (fabs(elementBaxis_length*faceAaxis_length
- fabs(dotproduct2)) > NekConstants::kNekZeroTol)
{
cout << "Warning: Prism axes not parallel" << endl;
}
if( dotproduct2 < 0.0 )
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment