zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: bump API version number to 1803 to account for removal of Xfer

Browse Source 
- primary points for an external user are the polyMesh constructor

- add config info for gcc-7.3.0

COMP: intel-2017. Ignore unknown pragmas. Disambiguate method resolution.
This commit is contained in:
Mark Olesen
2018-03-05 20:18:26 +01:00
parent 3d608bf06a
commit 664685f7fe
10 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/bashrc
View File

@ -60,7 +60,7 @@ unset rc
export WM_COMPILER_TYPE=system
# [WM_COMPILER] - Compiler:
# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-2] | GccKNL |
# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | GccKNL |
# Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
export WM_COMPILER=Gcc

3
etc/config.csh/compiler
View File

@ -66,6 +66,9 @@ case ThirdParty:
case Gcc72:
set gcc_version=gcc-7.2.0
breaksw
case Gcc73:
set gcc_version=gcc-7.3.0
breaksw
case Clang:
set clang_version=llvm-3.7.1
breaksw

3
etc/config.sh/compiler
View File

@ -65,6 +65,9 @@ ThirdParty)
Gcc72)
gcc_version=gcc-7.2.0
;;
Gcc73)
gcc_version=gcc-7.3.0
;;
Clang)
clang_version=llvm-3.7.1
;;

2
etc/cshrc
View File

@ -57,7 +57,7 @@ setenv FOAM_INST_DIR `lsof +p $$ |& \
setenv WM_COMPILER_TYPE system
# [WM_COMPILER] - Compiler:
# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-2] | GccKNL |
# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | GccKNL |
# Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
setenv WM_COMPILER Gcc

2
src/combustionModels/singleStepCombustion/singleStepCombustion.C
View File

@ -116,7 +116,7 @@ tmp<fvScalarMatrix> singleStepCombustion<CombThermoType, ThermoType>::R
const volScalarField fres(singleMixturePtr_->fres(specieI));
wSpecie /= max(fNorm*(Y - fres), scalar(1e-2));
return -fNorm*wSpecie*fres + fNorm*fvm::Sp(wSpecie, Y);
return -fNorm*wSpecie*fres + scalar(fNorm)*fvm::Sp(wSpecie, Y);
}
else
{

2
wmake/rules/General/general
View File

@ -1,5 +1,5 @@
#-------------------------------*- makefile -*---------------------------------
WM_VERSION = OPENFOAM_PLUS=1712
WM_VERSION = OPENFOAM_PLUS=1803
AR = ar
ARFLAGS = cr

2
wmake/rules/linux64Icc/c++
View File

@ -1,6 +1,6 @@
SUFFIXES += .C .cc .cpp .cxx
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
-diag-disable 327,654,1125,1292,2289,2304,11062,11074,11076
# Suppress some warnings for flex++ and CGAL

2
wmake/rules/linux64IccKNL/c++
View File

@ -1,6 +1,6 @@
SUFFIXES += .C .cc .cpp .cxx
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
-diag-disable 654,1125,1292,2304
# Suppress some warnings for flex++ and CGAL

2
wmake/rules/linuxIA64Icc/c++
View File

@ -1,6 +1,6 @@
SUFFIXES += .C .cc .cpp .cxx
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
-diag-disable 2304,1292
# Suppress some warnings for flex++ and CGAL

2
wmake/rules/linuxIcc/c++
View File

@ -1,6 +1,6 @@
SUFFIXES += .C .cc .cpp .cxx
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof \
c++WARN = -Wall -Wextra -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-unknown-pragmas \
-diag-disable 327,654,1125,1292,2289,2304,11062,11074,11076
# Suppress some warnings for flex++ and CGAL