From d65ca495d38e25d31ac2f69c112e4f1ee6d7fc3a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 22 Nov 2017 10:52:42 +0100 Subject: [PATCH] STYLE: minor changes in comments --- bin/foamEtcFile | 9 --------- etc/bashrc | 2 +- etc/cshrc | 2 +- src/fileFormats/ensight/file/ensightGeoFile.C | 2 +- .../basic/overLaplacianDyMFoam/heatTransfer/0.orig/T | 2 +- .../heatTransfer/0.orig/pointDisplacement | 2 +- .../overLaplacianDyMFoam/heatTransfer/0.orig/zoneID | 2 +- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/bin/foamEtcFile b/bin/foamEtcFile index 294cc26505..58810ea21b 100755 --- a/bin/foamEtcFile +++ b/bin/foamEtcFile @@ -46,8 +46,6 @@ # This script must exist in one of these locations: # - $WM_PROJECT_INST_DIR/OpenFOAM-/bin # - $WM_PROJECT_INST_DIR/openfoam-/bin -# - $WM_PROJECT_INST_DIR/OpenFOAM+/bin -# - $WM_PROJECT_INST_DIR/openfoam+/bin # - $WM_PROJECT_INST_DIR/openfoam/bin (debian version) # #------------------------------------------------------------------------------- @@ -146,13 +144,6 @@ guessVersion() version="${version%%*-}" # Extra safety, eg openfoam-version-packager ;; - (OpenFOAM+* | openfoam+*) - # Alternative naming: OpenFOAM+ or openfoam+ - dirBase="${projectDirName%%+*}+" - version="${projectDirName#*+}" - version="${version%%*-}" # Extra safety, eg openfoam-version-packager - ;; - (openfoam[0-9]*) # Debian naming: openfoam dirBase="openfoam" diff --git a/etc/bashrc b/etc/bashrc index dbe16c9d7a..b6103e3b2e 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -65,7 +65,7 @@ export WM_COMPILER_TYPE=system #- Compiler: # WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL -# | Clang | Clang3[8-9] | Gcc[45]0 | Icc | IccKNL | Cray +# | Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray export WM_COMPILER=Gcc unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH diff --git a/etc/cshrc b/etc/cshrc index 4b186c3fce..759599098b 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -61,7 +61,7 @@ setenv WM_COMPILER_TYPE system #- Compiler: # WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL -# | Clang | Clang3[8-9] | Gcc[45]0 | Icc | IccKNL | Cray +# | Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray setenv WM_COMPILER Gcc setenv WM_COMPILER_ARCH # defined but empty unsetenv WM_COMPILER_LIB_ARCH diff --git a/src/fileFormats/ensight/file/ensightGeoFile.C b/src/fileFormats/ensight/file/ensightGeoFile.C index 27ce98282f..878b288d5b 100644 --- a/src/fileFormats/ensight/file/ensightGeoFile.C +++ b/src/fileFormats/ensight/file/ensightGeoFile.C @@ -43,7 +43,7 @@ void Foam::ensightGeoFile::initialize() // Description line 2 #ifdef OPENFOAM_PLUS - write(string("Written by OpenFOAM+ " STRING_QUOTE(OPENFOAM_PLUS))); + write(string("Written by OpenFOAM-" STRING_QUOTE(OPENFOAM_PLUS))); #else write(string("Written by OpenFOAM-" + string(Foam::FOAMversion))); #endif diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T index 22c659e653..dbbd532127 100644 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus.develop | +| \\ / O peration | Version: plus | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement index b76806329e..af449cb369 100644 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/pointDisplacement @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus.develop | +| \\ / O peration | Version: plus | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID index d6776efb1c..b57f3b4499 100644 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus.develop | +| \\ / O peration | Version: plus | | \\ / A nd | Web: www.OpenFOAM.com | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/