From fc2c422bcc420d44851e097e86f8d2255413cdbc Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 9 Jun 2011 08:48:23 -0400 Subject: [PATCH 1/3] Minor changes to test harness : CMakeLists.txt --- CMakeLists.txt | 6 +++--- testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 647779e53..32b3f2340 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ # # Description # CMakeLists.txt file for implementing a test harness for the compilation -# and test of OpenFOAM-1.5-dev using Kitware CTest./CMake/CDash +# and test of OpenFOAM-1.6-ext using Kitware CTest./CMake/CDash # # The results will be submitted to the CDash server identified by the file # CTestConfig.cmake @@ -37,7 +37,7 @@ cmake_minimum_required (VERSION 2.8) -PROJECT(OpenFOAM_1.5-dev) +PROJECT(OpenFOAM_1.6-ext) #----------------------------------------------------------------------------- # Initialization of CTest specific variables @@ -92,7 +92,7 @@ SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}") # We will support more compilers eventually. # -# Timeout for running all this: 4 hours: 4 x 3600 seconds +# Timeout for running every single test: 4 hours: 4 x 3600 seconds #SET( # DART_TESTING_TIMEOUT 14400 # CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test." diff --git a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt b/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt index 647779e53..32b3f2340 100644 --- a/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt +++ b/testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt @@ -24,7 +24,7 @@ # # Description # CMakeLists.txt file for implementing a test harness for the compilation -# and test of OpenFOAM-1.5-dev using Kitware CTest./CMake/CDash +# and test of OpenFOAM-1.6-ext using Kitware CTest./CMake/CDash # # The results will be submitted to the CDash server identified by the file # CTestConfig.cmake @@ -37,7 +37,7 @@ cmake_minimum_required (VERSION 2.8) -PROJECT(OpenFOAM_1.5-dev) +PROJECT(OpenFOAM_1.6-ext) #----------------------------------------------------------------------------- # Initialization of CTest specific variables @@ -92,7 +92,7 @@ SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}") # We will support more compilers eventually. # -# Timeout for running all this: 4 hours: 4 x 3600 seconds +# Timeout for running every single test: 4 hours: 4 x 3600 seconds #SET( # DART_TESTING_TIMEOUT 14400 # CACHE STRING "Maximum time allowed (4 hours) before CTest will kill the test." From 534243fd732ee3f43e30047b3744d5377550614b Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Fri, 31 May 2013 00:31:18 -0400 Subject: [PATCH 2/3] .gitignore: blacklisting files subject to a DMCA complaint by ANSYS --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index b6d81a490..013e5460d 100644 --- a/.gitignore +++ b/.gitignore @@ -86,4 +86,12 @@ etc/settings.csh etc/setteings.sh +# The following files are blacklisted because of a DMCA complaint by ANSYS. +src/lduSolvers/tools/PriorityArray.C +src/lduSolvers/tools/PriorityArray.H +src/lduSolvers/amg/amgPolicy/samgPolicy.C +src/lduSolvers/amg/amgPolicy/samgPolicy.H +src/lduSolvers/amg/amgPolicy/aamgPolicy.C +src/lduSolvers/amg/amgPolicy/aamgPolicy.H + # end-of-file From 10322b52d5548d0e9218ace41a2b8bf941fa4e13 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sun, 2 Jun 2013 09:11:26 -0400 Subject: [PATCH 3/3] Fixing compilation of lduSolvers following removal of files --- src/lduSolvers/Make/files | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lduSolvers/Make/files b/src/lduSolvers/Make/files index ab36ce6b1..7d891ced3 100644 --- a/src/lduSolvers/Make/files +++ b/src/lduSolvers/Make/files @@ -30,7 +30,5 @@ $(amg)/coarseAmgLevel.C amgPolicy = $(amg)/amgPolicy $(amgPolicy)/amgPolicy.C $(amgPolicy)/pamgPolicy.C -$(amgPolicy)/aamgPolicy.C -$(amgPolicy)/samgPolicy.C LIB = $(FOAM_LIBBIN)/liblduSolvers