exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge branch feature/globalCtrlDictFromEnvVariable hotfix/ThirdParty_scripts hotfix/testHarness

Browse source
This commit is contained in:
Martin Beaudoin 2011-06-04 12:38:23 -04:00
commit 500b61e503
12 changed files with 60 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CTestConfig.cmake
View file

@ -4,10 +4,10 @@
## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext_testing")
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext_testing")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext")
set(CTEST_DROP_SITE_CDASH TRUE)

33
etc/bashrc
View file

@ -251,24 +251,23 @@ Darwin)
then
# Use Mac-Ports-Compiler instead of Apple-gcc-4.2
case $WM_COMPILER in
Gcc43)
export WM_CC='gcc-mp-4.3'
export WM_CXX='g++-mp-4.3'
;;
Gcc44)
export WM_CC='gcc-mp-4.4'
export WM_CXX='g++-mp-4.4'
;;
Gcc45)
export WM_CC='gcc-mp-4.5'
export WM_CXX='g++-mp-4.5'
;;
*)
export WM_COMPILER=
;;
esac
Gcc43)
export WM_CC='gcc-mp-4.3'
export WM_CXX='g++-mp-4.3'
;;
Gcc44)
export WM_CC='gcc-mp-4.4'
export WM_CXX='g++-mp-4.4'
;;
Gcc45)
export WM_CC='gcc-mp-4.5'
export WM_CXX='g++-mp-4.5'
;;
*)
export WM_COMPILER=
;;
esac
fi
;;
SunOS)

8
etc/prefs.csh-EXAMPLE
View file

@ -146,4 +146,12 @@
#setenv ParaView_VERSION git # eg, cvs/git version
#setenv ParaView_MAJOR 3.7
# System identifier for the OpenFOAM CDash test harness on openfoam-extend
#
# By default, your system FQN/hostname will be used as the system identifier
# when publishing your test harness results on the OpenFOAM CDash server
# on openfoam-extend.
# You can override your identifier using this environment variable
#setenv CDASH_SUBMIT_LOCAL_HOST_ID choose_your_CDash_system_identifer
# ----------------------------------------------------------------- end-of-file

8
etc/prefs.sh-EXAMPLE
View file

@ -156,4 +156,12 @@ compilerInstall=System
#export ParaView_VERSION=git # eg, cvs/git version
#export ParaView_MAJOR=3.7
# System identifier for the OpenFOAM CDash test harness on openfoam-extend
#
# By default, your system FQN/hostname will be used as the system identifier
# when publishing your test harness results on the OpenFOAM CDash server
# on openfoam-extend.
# You can override your identifier using this environment variable
#export CDASH_SUBMIT_LOCAL_HOST_ID=choose_your_CDash_system_identifer
# ----------------------------------------------------------------- end-of-file

4
etc/settings.sh
View file

@ -120,7 +120,7 @@ unset compilerBin compilerLib
# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# compilerInstall = OpenFOAM | System
#
#
# We can override the value of compilerInstall from prefs.sh
: ${compilerInstall:=System}
@ -140,7 +140,7 @@ OpenFOAM)
_foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.sh
_foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.sh
_foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS/etc/gcc-4.4.5.sh
;;
;;
Gcc43)
export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
_foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib

7
testHarness/OSIG/Turbomachinery/README.txt
View file

@ -31,6 +31,13 @@
# \*---------------------------------------------------------------------------*/
MAJOR WARNING: THIS TEST HARNESS IS NOT READY YET FOR OPENFOAM-1.6-EXT
----------------------------------------------------------------------
Warning #1: Make sure your OpenFOAM environment is properly initialized before
running the test harness.

8
testHarness/OpenFOAM/1.6-ext/CMakeFiles/CMakeLists.txt
View file

@ -125,6 +125,14 @@ if(GIT_FOUND)
OUTPUT_VARIABLE GIT_BRANCH_NAME
)
message("Git branch: ${GIT_BRANCH_NAME}")
if (GIT_BRANCH_NAME STREQUAL "")
message("No git-branch. Mercurial?")
EXEC_PROGRAM(hg
ARGS branch
OUTPUT_VARIABLE GIT_BRANCH_NAME
)
message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif()
SET(BUILDNAME "${BUILDNAME}-git-branch:${GIT_BRANCH_NAME}")
endif()

4
testHarness/OpenFOAM/1.6-ext/CMakeFiles/CTestConfig.cmake.openfoam-extend
View file

@ -4,10 +4,10 @@
## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "OpenFOAM-1.5-dev")
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.5-dev")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext")
set(CTEST_DROP_SITE_CDASH TRUE)

13
testHarness/OpenFOAM/1.6-ext/CMakeFiles/CTestConfig.cmake.openfoam-extend_of-1.6-ext-testing
View file

@ -1,13 +0,0 @@
## This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
## # The following are required to uses Dart and the Cdash dashboard
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "OpenFOAM-1.6-ext_testing")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "openfoam-extend.sourceforge.net")
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=OpenFOAM-1.6-ext_testing")
set(CTEST_DROP_SITE_CDASH TRUE)

4
testHarness/OpenFOAM/1.6-ext/README.txt
View file

@ -48,7 +48,7 @@ a) You can set your local system identifier using the environment variable
b) Install the CMakeLists.txt and CTestConfig.cmake files by executing the following commands:
cp ./CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR
cp ./CMakeFiles/CTestConfig.cmake.openfoam-extend_of-1.6-ext-testing $WM_PROJECT_DIR/CTestConfig.cmake
cp ./CMakeFiles/CTestConfig.cmake.openfoam-extend $WM_PROJECT_DIR/CTestConfig.cmake
c) Run the test harness and push your results on the CDash server on openfoam-extend
@ -74,5 +74,5 @@ To submit your results to the CDash server on openfoam-extend, just use
the file CTestConfig.cmake.openfoam-extend.
If submitted to the CDash server on openfoam-extend, your results will be displayed here:
http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext_testing
http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext

19
testHarness/README.txt
View file

@ -7,7 +7,7 @@ Directory Structure
===================
OpenFOAM : CMake/CTest scripts for compilation and execution test harness for OpenFOAM.
OpenFOAM/1.6-dev : Test harness for OpenFOAM version 1.6-dev. See the file OpenFOAM/1.6-dev/README.txt for more information
OpenFOAM/1.6-ext : Test harness for OpenFOAM version 1.6-ext. See the file OpenFOAM/1.6-ext/README.txt for more information
OSIG : CMake/CTest scripts for OpenFOAM Special Interest Group (OSIG) test harness
OSIG/TurboMachinery : Test harness for the TurboMachinery OSIG. See the file OSIG/Turbomachinery/README.txt for more information.
@ -42,7 +42,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
Still, I recommand always checking that these two important files are up-to-date:
cp ../CMakeFiles/CMakeLists.txt $WM_PROJECT_DIR
cp ../CMakeFiles/CTestConfig.cmake.openfoam-extend_of-1.6-ext-testing $WM_PROJECT_DIR/CTestConfig.cmake
cp ../CMakeFiles/CTestConfig.cmake.openfoam-extend $WM_PROJECT_DIR/CTestConfig.cmake
7: Next, running the test loop is pretty simple:
@ -55,9 +55,7 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
8: The results will be published on the CDash dashboard on openfoam-extend.
To see your results:
URL : http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext_testing
Username : of-1.6-ext@of-extend.cdash
Password : onepasswd4all
URL : http://openfoam-extend.sourceforge.net/CDash/index.php?project=OpenFOAM-1.6-ext
9: You can customize your system identifier on the dashboard using the environment variable $CDASH_SUBMIT_LOCAL_HOST_ID.
@ -71,15 +69,6 @@ Martin Beaudoin, Hydro-Quebec, 2010. All rights reserved.
10: In general, see the file $WM_PROJECT_DIR/testHarness/OpenFOAM/1.6-ext/README.txt for the necessary information about running the
test loop.
(NB: I just found out a couple of mistakes in that file, so please use this message for now as per instructions for running the test loop.
I will fix this shortly. Sorry.)
11: As more people will start using these basic steps, I will supply more information about some other features that are available with
the test loop.
But I need to see those baby steps first... :)
12: Please do not hesitate to report any problems, comments, suggestions about the test loop.
This stuff runs great on my systems, but it needs to run even better on yours.
11: Please do not hesitate to report any problems, comments, suggestions about the test loop.

2
tutorials/mesh/moveDynamicMesh/SnakeRiverCanyon/Allrun
View file

@ -3,7 +3,7 @@
. $WM_PROJECT_DIR/bin/tools/RunFunctions
echo "This tutorial fails in octree search: blame Mattijs Janssens (HJ). Martin Beaudoin, Oct 12 2010"
exit 0;
exit -1;
# Get application name
application=`getApplication`