Commit 60d588d7 authored by Simone Rossi's avatar Simone Rossi
Browse files

Casting to EpetraInt_Type

parent 62b81c55
...@@ -680,7 +680,7 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryDisplacement ( void ) ...@@ -680,7 +680,7 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryDisplacement ( void )
for ( UInt iDOF = 0; iDOF < ( UInt ) M_FESpace->dof().numTotalDof(); ++iDOF ) for ( UInt iDOF = 0; iDOF < ( UInt ) M_FESpace->dof().numTotalDof(); ++iDOF )
{ {
if ( M_displacement->blockMap().LID ( (int) iDOF) != -1 ) // The Global ID is on the calling processors if ( M_displacement->blockMap().LID ( static_cast<EpetraInt_Type> (iDOF) ) != -1 ) // The Global ID is on the calling processors
{ {
std::vector<Real> dX (3, 0.0); std::vector<Real> dX (3, 0.0);
std::vector<Real> dY (3, 0.0); std::vector<Real> dY (3, 0.0);
...@@ -695,8 +695,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryDisplacement ( void ) ...@@ -695,8 +695,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryDisplacement ( void )
//Extracting the gradient of U on the current DOF //Extracting the gradient of U on the current DOF
for ( UInt iComp = 0; iComp < M_FESpace->fieldDim(); ++iComp ) for ( UInt iComp = 0; iComp < M_FESpace->fieldDim(); ++iComp )
{ {
Int LIDid = M_displacement->blockMap().LID ( (int) ( iDOF + iComp * dim + M_offset ) ); Int LIDid = M_displacement->blockMap().LID ( static_cast<EpetraInt_Type> ( ( iDOF + iComp * dim + M_offset ) ) );
Int GIDid = M_displacement->blockMap().GID ( LIDid); Int GIDid = M_displacement->blockMap().GID ( static_cast<EpetraInt_Type> (LIDid) );
dX[iComp] = (*grDisplX) (GIDid); // (d_xX,d_yX,d_zX) dX[iComp] = (*grDisplX) (GIDid); // (d_xX,d_yX,d_zX)
dY[iComp] = (*grDisplY) (GIDid); // (d_xY,d_yY,d_zY) dY[iComp] = (*grDisplY) (GIDid); // (d_xY,d_yY,d_zY)
dZ[iComp] = (*grDisplZ) (GIDid); // (d_xZ,d_yZ,d_zZ) dZ[iComp] = (*grDisplZ) (GIDid); // (d_xZ,d_yZ,d_zZ)
...@@ -742,8 +742,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryDisplacement ( void ) ...@@ -742,8 +742,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryDisplacement ( void )
//Save the eigenvalues in the global vector //Save the eigenvalues in the global vector
for ( UInt icoor (0); icoor < M_FESpace->fieldDim(); ++icoor ) for ( UInt icoor (0); icoor < M_FESpace->fieldDim(); ++icoor )
{ {
Int LIDid = M_displacement->blockMap().LID ( (int) (iDOF + icoor * dim + M_offset) ); Int LIDid = M_displacement->blockMap().LID ( static_cast<EpetraInt_Type>(iDOF + icoor * dim + M_offset) );
Int GIDid = M_displacement->blockMap().GID (LIDid); Int GIDid = M_displacement->blockMap().GID ( static_cast<EpetraInt_Type>(LIDid) );
(*M_globalEigenvalues) (GIDid) = M_eigenvaluesR[icoor]; (*M_globalEigenvalues) (GIDid) = M_eigenvaluesR[icoor];
} }
...@@ -897,7 +897,7 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryCauchyStresses ( void ) ...@@ -897,7 +897,7 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryCauchyStresses ( void )
for ( UInt iDOF (0); iDOF < ( UInt ) M_FESpace->dof().numTotalDof(); ++iDOF ) for ( UInt iDOF (0); iDOF < ( UInt ) M_FESpace->dof().numTotalDof(); ++iDOF )
{ {
if ( M_displacement->blockMap().LID ( (int) iDOF) != -1 ) // The Global ID is on the calling processors if ( M_displacement->blockMap().LID ( static_cast<EpetraInt_Type>(iDOF) ) != -1 ) // The Global ID is on the calling processors
{ {
(*M_sigma).Scale (0.0); (*M_sigma).Scale (0.0);
...@@ -905,8 +905,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryCauchyStresses ( void ) ...@@ -905,8 +905,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryCauchyStresses ( void )
//Extracting the gradient of U on the current DOF //Extracting the gradient of U on the current DOF
for ( UInt iComp = 0; iComp < M_FESpace->fieldDim(); ++iComp ) for ( UInt iComp = 0; iComp < M_FESpace->fieldDim(); ++iComp )
{ {
Int LIDid = M_displacement->blockMap().LID ( (int) (iDOF + iComp * M_FESpace->dim() + M_offset) ); Int LIDid = M_displacement->blockMap().LID ( static_cast<EpetraInt_Type> (iDOF + iComp * M_FESpace->dim() + M_offset) );
Int GIDid = M_displacement->blockMap().GID (LIDid); Int GIDid = M_displacement->blockMap().GID (static_cast<EpetraInt_Type>(LIDid) );
(*M_sigma) (iComp, 0) = (*M_sigmaX) (GIDid); // (d_xX,d_yX,d_zX) (*M_sigma) (iComp, 0) = (*M_sigmaX) (GIDid); // (d_xX,d_yX,d_zX)
(*M_sigma) (iComp, 1) = (*M_sigmaY) (GIDid); // (d_xY,d_yY,d_zY) (*M_sigma) (iComp, 1) = (*M_sigmaY) (GIDid); // (d_xY,d_yY,d_zY)
(*M_sigma) (iComp, 2) = (*M_sigmaZ) (GIDid); // (d_xZ,d_yZ,d_zZ) (*M_sigma) (iComp, 2) = (*M_sigmaZ) (GIDid); // (d_xZ,d_yZ,d_zZ)
...@@ -929,8 +929,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryCauchyStresses ( void ) ...@@ -929,8 +929,8 @@ WallTensionEstimator<Mesh >::analyzeTensionsRecoveryCauchyStresses ( void )
//Save the eigenvalues in the global vector //Save the eigenvalues in the global vector
for ( UInt icoor = 0; icoor < M_FESpace->fieldDim(); ++icoor ) for ( UInt icoor = 0; icoor < M_FESpace->fieldDim(); ++icoor )
{ {
Int LIDid = M_displacement->blockMap().LID ( (int) (iDOF + icoor * M_FESpace->dim() + M_offset ) ); Int LIDid = M_displacement->blockMap().LID ( static_cast<EpetraInt_Type> (iDOF + icoor * M_FESpace->dim() + M_offset ) );
Int GIDid = M_displacement->blockMap().GID (LIDid); Int GIDid = M_displacement->blockMap().GID (static_cast<EpetraInt_Type>(LIDid));
(*M_globalEigenvalues) (GIDid) = M_eigenvaluesR[icoor]; (*M_globalEigenvalues) (GIDid) = M_eigenvaluesR[icoor];
} }
} }
......
...@@ -560,7 +560,7 @@ WallTensionEstimatorCylindricalCoordinates<Mesh >::analyzeTensionsRecoveryCauchy ...@@ -560,7 +560,7 @@ WallTensionEstimatorCylindricalCoordinates<Mesh >::analyzeTensionsRecoveryCauchy
for ( UInt iDOF = 0; iDOF < ( UInt ) this->M_FESpace->dof().numTotalDof(); iDOF++ ) for ( UInt iDOF = 0; iDOF < ( UInt ) this->M_FESpace->dof().numTotalDof(); iDOF++ )
{ {
if ( this->M_displacement->blockMap().LID ( (int) iDOF ) != -1 ) // The Global ID is on the calling processors if ( this->M_displacement->blockMap().LID ( static_cast<EpetraInt_Type>(iDOF) ) != -1 ) // The Global ID is on the calling processors
{ {
(* (this->M_sigma) ).Scale (0.0); (* (this->M_sigma) ).Scale (0.0);
...@@ -568,8 +568,8 @@ WallTensionEstimatorCylindricalCoordinates<Mesh >::analyzeTensionsRecoveryCauchy ...@@ -568,8 +568,8 @@ WallTensionEstimatorCylindricalCoordinates<Mesh >::analyzeTensionsRecoveryCauchy
//Extracting the gradient of U on the current DOF //Extracting the gradient of U on the current DOF
for ( UInt iComp = 0; iComp < this->M_FESpace->fieldDim(); ++iComp ) for ( UInt iComp = 0; iComp < this->M_FESpace->fieldDim(); ++iComp )
{ {
Int LIDid = this->M_displacement->blockMap().LID ( (int) (iDOF + iComp * dim + this->M_offset )); Int LIDid = this->M_displacement->blockMap().LID ( static_cast<EpetraInt_Type>(iDOF + iComp * dim + this->M_offset ));
Int GIDid = this->M_displacement->blockMap().GID (LIDid); Int GIDid = this->M_displacement->blockMap().GID (static_cast<EpetraInt_Type>(LIDid));
(* (this->M_sigma) ) (iComp, 0) = (*this->M_sigmaX) (GIDid); // (d_xX,d_yX,d_zX) (* (this->M_sigma) ) (iComp, 0) = (*this->M_sigmaX) (GIDid); // (d_xX,d_yX,d_zX)
(* (this->M_sigma) ) (iComp, 1) = (*this->M_sigmaY) (GIDid); // (d_xY,d_yY,d_zY) (* (this->M_sigma) ) (iComp, 1) = (*this->M_sigmaY) (GIDid); // (d_xY,d_yY,d_zY)
(* (this->M_sigma) ) (iComp, 2) = (*this->M_sigmaZ) (GIDid); // (d_xZ,d_yZ,d_zZ) (* (this->M_sigma) ) (iComp, 2) = (*this->M_sigmaZ) (GIDid); // (d_xZ,d_yZ,d_zZ)
...@@ -592,8 +592,8 @@ WallTensionEstimatorCylindricalCoordinates<Mesh >::analyzeTensionsRecoveryCauchy ...@@ -592,8 +592,8 @@ WallTensionEstimatorCylindricalCoordinates<Mesh >::analyzeTensionsRecoveryCauchy
//Save the eigenvalues in the global vector //Save the eigenvalues in the global vector
for ( UInt icoor = 0; icoor < this->M_FESpace->fieldDim(); ++icoor ) for ( UInt icoor = 0; icoor < this->M_FESpace->fieldDim(); ++icoor )
{ {
Int LIDid = this->M_displacement->blockMap().LID ( (int) (iDOF + icoor * dim + this->M_offset) ); Int LIDid = this->M_displacement->blockMap().LID ( static_cast<EpetraInt_Type>(iDOF + icoor * dim + this->M_offset) );
Int GIDid = this->M_displacement->blockMap().GID (LIDid); Int GIDid = this->M_displacement->blockMap().GID (static_cast<EpetraInt_Type>(LIDid));
(* (this->M_globalEigenvalues) ) (GIDid) = this->M_eigenvaluesR[icoor]; (* (this->M_globalEigenvalues) ) (GIDid) = this->M_eigenvaluesR[icoor];
} }
......
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