diff --git a/src/cudaSolvers/Allwmake b/src/cudaSolvers/Allwmake index 77d376d04..095b3108d 100755 --- a/src/cudaSolvers/Allwmake +++ b/src/cudaSolvers/Allwmake @@ -1,14 +1,14 @@ -#!/bin/sh +#!/bin/bash cd ${0%/*} || exit 1 # run from this directory if [ -f $CUDA_BIN_DIR/nvcc ] then if [ -z $CUDA_IGNORE ] then - echo "Found nvcc but \$CUDA_IGNORE set -- not enabling CUDA support." - else echo "Found nvcc -- enabling CUDA support." wmake libso + else + echo "Found nvcc but \$CUDA_IGNORE set -- not enabling CUDA support." fi else echo "No nvcc - CUDA not available." diff --git a/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu b/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu index bd747d4ce..028966234 100644 --- a/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu +++ b/src/cudaSolvers/cudaBiCGStab/bicgAinv.cu @@ -32,21 +32,17 @@ This file is part of cufflink. GNU General Public License for more details. You should have received a copy of the GNU General Public License - This file is part of foam-extend. + along with cufflink. If not, see . - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. + Author + Daniel P. Combest. All rights reserved. + Modifications by Dominik Christ, Wikki Ltd. - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . + Description + diagonal preconditioned conjugate gradient + solver for symmetric Matrices using a CUSP CUDA™ based solver. +\**********************************************************************/ #include "cudaTypes.H" diff --git a/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu b/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu index 546d002a7..bfea700e5 100644 --- a/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu +++ b/src/cudaSolvers/cudaBiCGStab/bicgDiag.cu @@ -32,21 +32,17 @@ This file is part of cufflink. GNU General Public License for more details. You should have received a copy of the GNU General Public License - This file is part of foam-extend. + along with cufflink. If not, see . - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. + Author + Daniel P. Combest. All rights reserved. + Modifications by Dominik Christ, Wikki Ltd. - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . + Description + diagonal preconditioned conjugate gradient + solver for symmetric Matrices using a CUSP CUDA™ based solver. +\**********************************************************************/ #include "cudaTypes.H" diff --git a/src/cudaSolvers/cudaCG/cgAinv.cu b/src/cudaSolvers/cudaCG/cgAinv.cu index 70340ae1d..5e391fad8 100644 --- a/src/cudaSolvers/cudaCG/cgAinv.cu +++ b/src/cudaSolvers/cudaCG/cgAinv.cu @@ -32,21 +32,17 @@ This file is part of cufflink. GNU General Public License for more details. You should have received a copy of the GNU General Public License - This file is part of foam-extend. + along with cufflink. If not, see . - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. + Author + Daniel P. Combest. All rights reserved. + Modifications by Dominik Christ, Wikki Ltd. - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . + Description + diagonal preconditioned conjugate gradient + solver for symmetric Matrices using a CUSP CUDA™ based solver. +\**********************************************************************/ #include "cudaTypes.H" diff --git a/src/cudaSolvers/cudaCG/cgAmg.cu b/src/cudaSolvers/cudaCG/cgAmg.cu index e2e5f88bf..d6ab2807c 100644 --- a/src/cudaSolvers/cudaCG/cgAmg.cu +++ b/src/cudaSolvers/cudaCG/cgAmg.cu @@ -32,20 +32,17 @@ This file is part of cufflink. GNU General Public License for more details. You should have received a copy of the GNU General Public License - This file is part of foam-extend. + along with cufflink. If not, see . - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. + Author + Daniel P. Combest. All rights reserved. + Modifications by Dominik Christ, Wikki Ltd. - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Description + diagonal preconditioned conjugate gradient + solver for symmetric Matrices using a CUSP CUDA™ based solver. - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . +\**********************************************************************/ #include "cudaTypes.H" diff --git a/src/cudaSolvers/cudaCG/cgDiag.cu b/src/cudaSolvers/cudaCG/cgDiag.cu index df3eccbbe..db4ca0e62 100644 --- a/src/cudaSolvers/cudaCG/cgDiag.cu +++ b/src/cudaSolvers/cudaCG/cgDiag.cu @@ -32,20 +32,17 @@ This file is part of cufflink. GNU General Public License for more details. You should have received a copy of the GNU General Public License - This file is part of foam-extend. + along with cufflink. If not, see . - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. + Author + Daniel P. Combest. All rights reserved. + Modifications by Dominik Christ, Wikki Ltd. - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Description + diagonal preconditioned conjugate gradient + solver for symmetric Matrices using a CUSP CUDA™ based solver. - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . +\**********************************************************************/ #include "cudaTypes.H" diff --git a/src/cudaSolvers/include/buildNormFactor.H b/src/cudaSolvers/include/buildNormFactor.H index e391f1d71..70f4e8f6d 100644 --- a/src/cudaSolvers/include/buildNormFactor.H +++ b/src/cudaSolvers/include/buildNormFactor.H @@ -12,7 +12,7 @@ cufflink is a library for linking numerical methods based on Nvidia's Compute Unified Device Architecture (CUDA™) C/C++ programming language and OpenFOAM®. -Please note that cufflink is not approved or endorsed by OpenCFD® +Please note that cufflink is not approved or endorsed by ESI-OpenCFD® Limited, the owner of the OpenFOAM® and OpenCFD® trademarks and producer of OpenFOAM® software. @@ -32,20 +32,17 @@ This file is part of cufflink. GNU General Public License for more details. You should have received a copy of the GNU General Public License - This file is part of foam-extend. + along with cufflink. If not, see . - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. + Author + Daniel P. Combest. All rights reserved. + Modifications by Dominik Christ, Wikki Ltd. - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Description + diagonal preconditioned conjugate gradient + solver for symmetric Matrices using a CUSP CUDA™ based solver. - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . +\**********************************************************************/ // Build the normfactor as foam-extend does in file diff --git a/src/cudaSolvers/include/fillCOOMatrix.H b/src/cudaSolvers/include/fillCOOMatrix.H index 26efcfe96..93f694fdc 100644 --- a/src/cudaSolvers/include/fillCOOMatrix.H +++ b/src/cudaSolvers/include/fillCOOMatrix.H @@ -9,10 +9,10 @@ Cuda For FOAM Link cufflink is a library for linking numerical methods based on Nvidia's -Compute Unified Device Architecture (CUDA™) C/C + + programming language +Compute Unified Device Architecture (CUDA™) C/C++ programming language and OpenFOAM®. -Please note that cufflink is not approved or endorsed by OpenCFD® +Please note that cufflink is not approved or endorsed by ESI-OpenCFD® Limited, the owner of the OpenFOAM® and OpenCFD® trademarks and producer of OpenFOAM® software. @@ -32,20 +32,17 @@ This file is part of cufflink. GNU General Public License for more details. You should have received a copy of the GNU General Public License - This file is part of foam-extend. + along with cufflink. If not, see . - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. + Author + Daniel P. Combest. All rights reserved. + Modifications by Dominik Christ, Wikki Ltd. - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Description + diagonal preconditioned conjugate gradient + solver for symmetric Matrices using a CUSP CUDA™ based solver. - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . +\**********************************************************************/ // Fill in the rest of the diag (rows and col), // upper and upper.rows and upper.cols