diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C index 05958edf68..cb376fde10 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C @@ -67,38 +67,15 @@ void Foam::lduMatrix::Amul register const label nCells = diag().size(); for (register label cell=0; cell Foam::lduMatrix::H1() const for (register label face=0; face=0; face--) { - #ifdef ICC_IA64_PREFETCH - __builtin_prefetch (&uPtr[face-95],0,0); - __builtin_prefetch (&lPtr[face-95],0,0); - __builtin_prefetch (&rDPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-16]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-24]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-32]],0,1); - #endif - wAPtr[lPtr[face]] -= rDPtr[lPtr[face]]*upperPtr[face]*wAPtr[uPtr[face]]; } } diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C index 5193acb5eb..4fdebcd9c5 100644 --- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C @@ -72,30 +72,15 @@ void Foam::DILUPreconditioner::calcReciprocalD register label nFaces = matrix.upper().size(); for (register label face=0; face=0; face--) { - #ifdef ICC_IA64_PREFETCH - __builtin_prefetch (&uPtr[face-95],0,0); - __builtin_prefetch (&lPtr[face-95],0,0); - __builtin_prefetch (&upperPtr[face-95],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-16]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-24]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-32]],0,1); - #endif - wAPtr[lPtr[face]] -= rDPtr[lPtr[face]]*upperPtr[face]*wAPtr[uPtr[face]]; } @@ -210,46 +163,20 @@ void Foam::DILUPreconditioner::preconditionT register label nFaces = solver_.matrix().upper().size(); register label nFacesM1 = nFaces - 1; - #ifdef ICC_IA64_PREFETCH - #pragma ivdep - #endif - for (register label cell=0; cell=0; face--) { sface = losortPtr[face]; diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C index 9b17ef902d..db4a51c4b7 100644 --- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C @@ -66,47 +66,17 @@ Foam::FDICPreconditioner::FDICPreconditioner for (register label face=0; face=0; face--) { - #ifdef ICC_IA64_PREFETCH - __builtin_prefetch (&uPtr[face-95],0,0); - __builtin_prefetch (&lPtr[face-95],0,0); - __builtin_prefetch (&rDlUpperPtr[face-95],0,0); - __builtin_prefetch (&wAPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-32]],0,1); - #endif - wAPtr[lPtr[face]] -= rDlUpperPtr[face]*wAPtr[uPtr[face]]; } } diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C index e5a32fa168..04ccc2add0 100644 --- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C @@ -58,18 +58,9 @@ Foam::diagonalPreconditioner::diagonalPreconditioner register label nCells = rD.size(); - #ifdef ICC_IA64_PREFETCH - #pragma ivdep - #endif - // Generate reciprocal diagonal for (register label cell=0; cell