7f6740a9eb
Merge commit 'origin/master' into splitCyclic
2010-04-30 15:10:10 +01:00
b16ef5f0fa
ENH: set PINC, PLIBS in the rules (not the env) for system-openmpi
...
BUG: syntax error in settings.sh
2010-04-22 15:46:54 +02:00
0d44584112
ENH: rationalize wmake rules to avoid unnecessary duplication
...
- main mplib rules located in GENERAL_RULES with specializations
(if any) under RULES. Modest change in a few options files, but
cleans up the rules directories.
previously in options:
include $(RULES)/mplib$(WM_MPLIB)
now in options:
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
For GNU make it would be permissible to write both in a single line.
2010-04-22 15:01:07 +02:00
87f151c47b
ENH: add wmake rules for gcc-4.5
...
ATTENTION: cpp now needs '-traditional-cpp' for single-line output
2010-04-21 16:23:16 +02:00
cff2580336
Merge branch 'master' into splitCyclic
...
Conflicts:
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.H
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
src/meshTools/sets/topoSets/faceSet.C
src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
2010-04-16 12:09:34 +01:00
4da8beb94b
COMP: revert to non-debug flag for polyMeshAdder purposes.
2010-04-16 11:02:18 +01:00
0686bdf1e9
ENH: simplify cpp rules to avoid absolute paths and multiple GFLAGS.
...
- otherwise /lib/cpp may need a different library binding than
currently available and results in this type of error:
/usr/lib64/gcc/x86_64-suse-linux/4.4/cc1:
/data/app/OpenFOAM/ThirdParty-1.6.x/platforms/linux64/gcc-4.3.3/lib64/libstdc++.so.6:
version `GLIBCXX_3.4.11' not found (required by
/usr/lib64/libppl_c.so.2)
ENH: remove unused flex++ rule for SiCortex that was identical to the
general one anyhow.
2010-03-29 10:59:35 +02:00
0b9e5ea11a
ENH: link to general mplib* rules where possible.
...
ENH: generalize rule for X11
ENH: Avoid move in flex/flex++ rule.
2010-03-26 11:48:23 +01:00
89c7523c72
Merge branch 'master' into splitCyclic
...
Conflicts:
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
src/parallel/decompose/scotchDecomp/scotchDecomp.C
src/parallel/parMetisDecomp/parMetisDecomp.C
src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
2010-03-25 13:54:12 +00:00
46d96dc855
BUG: remove old wmake/rules/*/{dirToString,wmkdep} binaries
2010-03-25 14:42:29 +01:00
d1313bfda7
COMP: use current CGAL rules from cvm branch
2010-03-24 15:30:35 +01:00
d239cc053a
COMP: coco-cpp now installed with --prefix and without separate --exec-prefix
...
COMP: latest coco-cpp can find the frame files relative to the
executable path. This simplifies the make rules.
2010-03-10 12:11:26 +01:00
49fb39e8f3
Merge commit 'origin/master' into splitCyclic
...
Conflicts:
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C
src/OpenFOAM/meshes/pointMesh/pointPatches/derived/coupled/coupledFacePointPatch.H
src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
2010-03-09 21:28:53 +00:00
03b30396cb
ENH: relocate third-party binaries
...
old: $WM_THIRD_PARTY_DIR/<packageName>/platforms/$WM_ARCH*
new: $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH*/<packageName>
This streamlines the creation of binary packs, eases distribution and
helps when testing the robustness of relocatable installations.
2010-03-09 10:15:10 +01:00
85a481906a
ENH: Added new WM_MPLIB setting.
...
This signals that we are using the system installed openmpi version.
2010-03-01 15:14:03 +00:00
e3a1ffb1bb
COMP: rename wmake rule coco -> coco-cpp to reflect frame language (C++)
2010-02-10 13:13:45 +01:00
00616b72ff
ENH: Add functionEntry '#calc' to dictionary
...
- handles basic operations, references to other dictionary entries
(with '$name' syntax) and assorted mathematical functions:
pi(), degToRad, radToDeg, asin, acos, atan, sin, cos, tan, log,
log10, mag, atan2, pow
The basic syntax: #calc{ ... };
NOTE the trailing ';' is required for the primitiveEntry to be
properly defined.
2010-02-07 13:58:10 +01:00
46ad2e55d6
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
2010-01-26 17:11:18 +00:00
7dd1ad1e23
Adjust Make options for calcEntry.
2010-01-15 19:25:12 +01:00
cf3e2a8abf
Update calcEntry grammar to include copyright.
...
Include character class (wchar_t or char) as a template parameter in
CocoParserErrors.
2010-01-06 12:27:14 +01:00
e0ba4cbb02
Adjust line number before/after #calc{} scanner for improved error messages.
2010-01-03 21:45:32 +01:00
ebfdafad7f
Add preliminary wmake rule for using CoCo/R.
2010-01-03 00:39:28 +01:00
192f8ae542
Changed tecio build options to use local file
2009-12-14 11:20:22 +00:00
db34f04131
added tecio compilation rules to wmake
2009-12-08 11:40:00 +00:00
f686c8d531
Remove spurious warnings from the Icc compiler concerning casting NULL.
2009-12-02 16:39:12 +00:00
be1b1ceefc
Merge branch 'master' into splitCyclic
...
Conflicts:
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C
etc/bashrc
etc/cshrc
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
src/dynamicMesh/Make/files
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
src/dynamicMesh/perfectInterface/perfectInterface.C
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
src/finiteVolume/Make/files
src/mesh/blockMesh/blockMesh/blockMesh.C
src/mesh/blockMesh/blockMesh/blockMeshTopology.C
src/meshTools/Make/files
src/meshTools/sets/topoSets/faceSet.C
2009-11-30 15:20:52 +00:00
9c1d1dc7b9
skip c++ include for mpi.h
2009-10-06 14:43:42 +01:00
6c13d978cf
extending template max depth to 60
2009-09-17 11:52:09 +01:00
47066c7e51
cgal compilation
2009-08-17 22:03:53 +01:00
8d115b35c1
Merge branch 'master' into splitCyclic
...
Conflicts:
applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
applications/utilities/mesh/generation/blockMesh/blockMesh.C
applications/utilities/mesh/generation/blockMesh/createTopology.C
applications/utilities/mesh/generation/snappyHexMesh/Make/options
src/OpenFOAM/containers/Lists/ListOps/ListOps.H
src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
src/OpenFOAM/containers/Lists/UList/UList.H
src/OpenFOAM/containers/Lists/UList/UListI.H
src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.C
src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.C
src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H
src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C
src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
src/autoMesh/autoHexMesh/meshRefinement/meshRefinementBaffles.C
src/decompositionAgglomeration/Allwmake
src/decompositionAgglomeration/decompositionMethods/Make/files
src/decompositionAgglomeration/decompositionMethods/Make/options
src/dynamicMesh/attachDetach/attachInterface.C
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8.C
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
src/dynamicMesh/polyTopoChange/polyTopoChange/removePoints.H
src/dynamicMesh/slidingInterface/coupleSlidingInterface.C
src/finiteVolume/Make/files
tutorials/channelOodles/channel395/constant/polyMesh/blockMeshDict
tutorials/icoFoam/cavity/constant/polyMesh/blockMeshDict
wmake/rules/linux64Gcc/c++Opt
2009-08-07 08:19:53 +01:00
efce737693
Add provisioning for gcc-4.4.1
...
- compile into linux64Gcc44, linuxGcc44 to avoid clashes during testing
- continue to use gmp-4.2.4 since gmp-4.3.x might be miscompiled with
a system gcc-4.3.2
2009-07-29 09:59:16 +02:00
ea14d8f8b4
Merge commit 'OpenCFD/master' into olesenm
2009-07-20 14:38:38 +02:00
9b44034d8c
Changed more references to wmake/utilbin to wmake/bin.
2009-07-20 11:02:57 +01:00
f48b841973
mkdep rule was still using utilbin/ directory
2009-07-20 09:15:30 +02:00
dbf3d84560
Merge commit 'OpenCFD/master' into olesenm
2009-07-17 17:08:30 +02:00
6b3ceaf4b5
Removed support for Java.
2009-07-17 09:30:36 +01:00
33358fd383
fix wmake bug introduced by a9699afbb4
...
- skip including java rather than having recursive includes
(and too many files open error) when WM_JAVAC_OPTION isn't defined.
2009-07-16 13:32:40 +02:00
75080ab867
dropped pvm
2009-07-15 13:34:51 +02:00
0e5e84f4ed
removed last remnants of LAM support
2009-07-15 12:26:12 +02:00
218b2baec4
Changed SP and DP to WM_SP and WM_DP.
2009-07-03 11:46:45 +01:00
0bb012d0c2
Corrected handling of loop macros and removed those for PtrList.
2009-06-23 20:43:51 +01:00
dfbf96c4c8
Added new warning message.
2009-06-23 12:12:17 +01:00
65a9101d2e
More warning messages.
2009-06-22 21:04:30 +01:00
3345fd8378
Removed support for cint.
2009-06-22 21:03:57 +01:00
1cdbeb29d7
minor tweak to wmake
...
- place wmkdep and dirToString executables under
utilbin/$(WM_ARCH)$(WM_COMPILER).
This helps somewhat when copying rules about, and might help when creating
general rules.
2009-05-06 15:56:29 +02:00
51f443a345
Merge commit 'OpenCFD/master' into olesenm
...
Conflicts:
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
Can't use [0] to assign the first value of a DynamicList unless it has been
preceded by a setSize() - use append() instead.
2009-05-06 09:33:38 +02:00
433b209702
update to openmpi-1.3.2, prepare for newly released gcc-4.4
...
- added rules for gcc-4.3 in preparation for switching to gcc-4.4
- added 'clean' target for wmake/src/Makefile
It is probably reasonable to separate the binaries from the rules (TODO)
2009-04-30 08:32:48 +02:00
b773710d06
remove opteron and no-gcse switch
...
modified: SiCortex64Gcc/cOpt
modified: SunOS64Gcc/cOpt
modified: linux64Gcc/c++Opt
modified: linux64Gcc/cOpt
modified: linux64Gcc/general
modified: linux64Gcc42/c++Opt
modified: linux64Gcc42/cOpt
modified: linuxGcc/c++
modified: linuxGcc/cDebug
modified: linuxGcc/general
modified: linuxIA64Gcc/cOpt
2009-04-28 22:20:12 +01:00
de2a74b2fa
use gcc, not g++ for flex
2009-04-23 16:20:57 +01:00
2c48a69e50
scotch decomposition method
2009-04-23 14:44:23 +01:00