mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
Merge branch 'master' into splitCyclic
Conflicts: applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterfaceFields/cyclicLduInterfaceField/cyclicLduInterfaceField.C src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H src/OpenFOAM/meshes/polyMesh/syncTools/dummyTransform.H src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C src/edgeMesh/edgeFormats/vtk/VTKedgeFormat.H src/mesh/blockMesh/curvedEdges/spline.H src/meshTools/PointEdgeWave/PointEdgeWave.C src/meshTools/sets/topoSets/faceSet.C
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
.SUFFIXES: .C .cxx .cc .cpp
|
||||
|
||||
c++WARN = -wd654,819,1125,1476,1505,1572
|
||||
c++WARN = -wd327,654,819,1125,1476,1505,1572
|
||||
|
||||
CC = icpc
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
.SUFFIXES: .C .cxx .cc .cpp
|
||||
|
||||
c++WARN = -wd654,819,1125,1476,1505,1572
|
||||
c++WARN = -wd327,654,819,1125,1476,1505,1572
|
||||
|
||||
CC = icpc
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
.SUFFIXES: .C .cxx .cc .cpp
|
||||
|
||||
c++WARN = -wd654,819,1125,1476,1505,1572
|
||||
c++WARN = -wd327,654,819,1125,1476,1505,1572
|
||||
|
||||
#CC = icpc -gcc-version=400
|
||||
CC = icpc
|
||||
|
||||
Reference in New Issue
Block a user