diff --git a/dist-exclude b/dist-exclude index 1278a8ef1b92df2c4c45903364feee17a4764379..b2eb671be7fa340597abd8a876219b4c9f47bea6 100644 --- a/dist-exclude +++ b/dist-exclude @@ -3,20 +3,17 @@ dist-exclude builds/* nektar++-* ThirdParty -templates +Testing library/CPackRPM.cmake library/Demos/StdRegions/ExtraDemos library/Demos/MultiRegions/ExtraDemos -solvers/ADR2DManifoldSolver -solvers/CardiacEPSolver/Utilities -solvers/FitzHughNagumoSolver solvers/ImageWarpingSolver solvers/PulseWaveSolver solvers/VortexWaveInteraction +solvers/CompressibleFlowSolver/Tests/Perturbation* docs/*.doc docs/arch docs/emacs -docs/.cvsignore docs/html/code docs/html/images docs/html/downloads diff --git a/distribute.sh b/distribute.sh index 45b7f88a1a274f2e5d9336d34775b9c1fd45f9b3..9e70be2c9406d2a1807701f7ebe92617c19173f4 100755 --- a/distribute.sh +++ b/distribute.sh @@ -1,13 +1,8 @@ #!/bin/bash # @author Chris Cantwell # -# This script generates Nektar++ distributions, comprising of the following: -# - A code distribution (nektar++-VERSION.tar.gz) -# - A website package (nektar++-web-VERSION.tar.gz) +# This script generates Nektar++ distributions (nektar++-VERSION.tar.gz) # The file VERSION contains the version number of the generated release. -# A working copy of the ThirdParty repository should be placed in a subdirectory -# called ThirdParty, or sym-linked to such from elsewhere. If available, the -# ThirdParty distribution will also be compiled and included in the web package. # # @requires rsync doxygen tar @@ -16,13 +11,6 @@ cd $BASE TARGET=nektar++-`cat VERSION` -# Make Web tree target -if [ -d $TARGET-web ]; then - rm -rf $TARGET-web -fi -mkdir -p $TARGET-web -mkdir -p $TARGET-web/downloads/ - # Make Code tree target if [ -d $TARGET ]; then rm -rf $TARGET @@ -37,36 +25,5 @@ rsync -avqH --cvs-exclude --exclude-from dist-exclude * $TARGET echo "Packaging code distribution..." tar -zc -f $TARGET.tar.gz $TARGET -# Generate ThirdParty package if available -if [ -d ThirdParty -o -h ThirdParty ]; then - if [ -f ThirdParty/distribute.sh ]; then - ThirdParty/distribute.sh - mv ThirdParty/ThirdParty-*.tar.gz $TARGET-web/downloads/ - else - echo "ThirdParty directory exists, but without distribution script." - fi -else - echo "ThirdParty not available. Please package separately." -fi - -# Generate documentation for distributed code -echo "Generating doxygen docs...this will take a while..." -cd $TARGET/docs/html/doxygen -doxygen doxygen > /dev/null 2>&1 - -cd ../../../../ - -# Create web tree -echo "Generating web tree..." -rsync -avqH --cvs-exclude --exclude='code' docs/html/* $TARGET-web -mv $TARGET/docs/html/code $TARGET-web/ -mv $TARGET.tar.gz $TARGET-web/downloads/ - -# Package web tree -echo "Packaging web distribution..." -tar -zc -f $TARGET-web.tar.gz $TARGET-web -mv $TARGET-web/downloads/$TARGET.tar.gz . - # Clean up -rm -rf $TARGET-web rm -rf $TARGET diff --git a/docs/html/.cvsignore b/docs/html/.cvsignore deleted file mode 100644 index 048e873df3eeb9eb2db52d9167875d70a610b2e8..0000000000000000000000000000000000000000 --- a/docs/html/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -code -common.php diff --git a/library/README b/library/README deleted file mode 100644 index 9cd947cd7965d9603ce52487983b555110767757..0000000000000000000000000000000000000000 --- a/library/README +++ /dev/null @@ -1,13 +0,0 @@ - -Misc Notes about the build process, should be put in a better location. - -ACML 3.6 --------- -* Linking statically to the ifortran verison requires ifortran libraries. -* Linking dynamically to the ifortran version had unexplained crashes and just general strange behavior. - -* The PGI versions seems to work. - -MKL 8.1.1 ---------- -32 bit linux version appears to be working fine. diff --git a/solvers/CompressibleFlowSolver/CMakeLists.txt b/solvers/CompressibleFlowSolver/CMakeLists.txt index 4dde3330e008ef4127520894f9d52fed22d85173..5240eb0f7ab5ac43992a4f693c75506dc0724584 100644 --- a/solvers/CompressibleFlowSolver/CMakeLists.txt +++ b/solvers/CompressibleFlowSolver/CMakeLists.txt @@ -65,16 +65,16 @@ IF( NEKTAR_SOLVER_COMPRESSIBLE_FLOW ) ADD_NEKTAR_TEST(Couette_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM) ADD_NEKTAR_TEST(CylinderSubsonic_NS_FRSD_LFRSD_MODIFIED_3DHOMO1D_MVM) - IF (NEKTAR_USE_MPI) - ADD_NEKTAR_TEST(Perturbation_M05_square_CBC_par) - ADD_NEKTAR_TEST(Perturbation_M05_square_CBC_back_par) - ADD_NEKTAR_TEST(Perturbation_M15_square_CBC_par) - ADD_NEKTAR_TEST(Perturbation_M15_square_CBC_back_par) - ADD_NEKTAR_TEST(Perturbation_M05_circle_CBC_back_par) - ADD_NEKTAR_TEST(Perturbation_M15_circle_CBC_back_par) - ADD_NEKTAR_TEST(Perturbation_NS_M05_square_CBC_par) - ADD_NEKTAR_TEST(Perturbation_NS_M15_square_CBC_par) - ENDIF (NEKTAR_USE_MPI) + #IF (NEKTAR_USE_MPI) + # ADD_NEKTAR_TEST(Perturbation_M05_square_CBC_par) + # ADD_NEKTAR_TEST(Perturbation_M05_square_CBC_back_par) + # ADD_NEKTAR_TEST(Perturbation_M15_square_CBC_par) + # ADD_NEKTAR_TEST(Perturbation_M15_square_CBC_back_par) + # ADD_NEKTAR_TEST(Perturbation_M05_circle_CBC_back_par) + # ADD_NEKTAR_TEST(Perturbation_M15_circle_CBC_back_par) + # ADD_NEKTAR_TEST(Perturbation_NS_M05_square_CBC_par) + # ADD_NEKTAR_TEST(Perturbation_NS_M15_square_CBC_par) + #ENDIF (NEKTAR_USE_MPI) IF (NEKTAR_USE_FFTW) ADD_NEKTAR_TEST(Couette_WeakDG_LDG_SEM_3DHOMO1D_FFT)