1 |
patrick 09/04/25 16:19:34 |
2 |
|
3 |
Added: OpenFOAM-1.5-ggi.patch OpenFOAM-1.5-compile.patch |
4 |
Log: |
5 |
Initial import from sunrise. Thanks to Oliver Borm for the ebuild and the sunrise people for massaging it into shape. |
6 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sci-libs/openfoam-kernel/files/OpenFOAM-1.5-ggi.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/openfoam-kernel/files/OpenFOAM-1.5-ggi.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/openfoam-kernel/files/OpenFOAM-1.5-ggi.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: OpenFOAM-1.5-ggi.patch |
15 |
=================================================================== |
16 |
--- OpenFOAM-1.5/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H 2009-03-12 16:57:20.000000000 +0100 |
17 |
+++ OpenFOAM-1.5-dev/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H 2009-01-21 13:25:35.000000000 +0100 |
18 |
@@ -54,9 +54,14 @@ |
19 |
: |
20 |
public polyPatch |
21 |
{ |
22 |
- // Private data |
23 |
+protected: |
24 |
+ |
25 |
+ // Protected data |
26 |
+ |
27 |
+ // Alowing derived classes to create their own transformation |
28 |
+ // HJ, 24/Oct/2008 |
29 |
|
30 |
- //- offset (distance) vector from one side of the couple to the other |
31 |
+ //- Offset (distance) vector from one side of the couple to the other |
32 |
mutable vectorField separation_; |
33 |
|
34 |
//- Face transformation tensor |
35 |
--- OpenFOAM-1.5/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H 2009-03-12 16:57:20.000000000 +0100 |
36 |
+++ OpenFOAM-1.5-dev/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H 2009-01-21 13:25:37.000000000 +0100 |
37 |
@@ -173,6 +173,11 @@ |
38 |
mutable Field<PointType>* pointNormalsPtr_; |
39 |
|
40 |
|
41 |
+ // Static Private Data |
42 |
+ |
43 |
+ static const bool nSquaredProjection_; |
44 |
+ |
45 |
+ |
46 |
// Private Member Functions |
47 |
|
48 |
//- Calculate edges of the patch |
49 |
@@ -412,6 +417,22 @@ |
50 |
labelHashSet* setPtr = NULL |
51 |
) const; |
52 |
|
53 |
+ //- Write VTK patch, HJ, 14/Jan/2009 |
54 |
+ static void writeVTK |
55 |
+ ( |
56 |
+ const fileName& name, |
57 |
+ const FaceListType& faces, |
58 |
+ const Field<PointType>& points |
59 |
+ ); |
60 |
+ |
61 |
+ //- Write VTK patch normals, HJ, 14/Jan/2009 |
62 |
+ static void writeVTKNormals |
63 |
+ ( |
64 |
+ const fileName& name, |
65 |
+ const FaceListType& faces, |
66 |
+ const Field<PointType>& points |
67 |
+ ); |
68 |
+ |
69 |
|
70 |
// Edit |
71 |
|
72 |
--- OpenFOAM-1.5/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C 2009-03-12 16:57:20.000000000 +0100 |
73 |
+++ OpenFOAM-1.5-dev/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchCheck.C 2009-01-21 13:25:37.000000000 +0100 |
74 |
@@ -30,6 +30,7 @@ |
75 |
#include "PrimitivePatch.H" |
76 |
#include "Map.H" |
77 |
#include "ListOps.H" |
78 |
+#include "OFstream.H" |
79 |
|
80 |
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // |
81 |
|
82 |
@@ -331,6 +332,166 @@ |
83 |
} |
84 |
|
85 |
|
86 |
+template |
87 |
+< |
88 |
+ class Face, |
89 |
+ template<class> class FaceList, |
90 |
+ class PointField, |
91 |
+ class PointType |
92 |
+> |
93 |
+void PrimitivePatch<Face, FaceList, PointField, PointType>::writeVTK |
94 |
+( |
95 |
+ const fileName& name, |
96 |
+ const FaceListType& faces, |
97 |
+ const Field<PointType>& points |
98 |
+) |
99 |
+{ |
100 |
+ // Write patch and points into VTK |
101 |
+ OFstream mps(name + ".vtk"); |
102 |
+ |
103 |
+ mps << "# vtk DataFile Version 2.0" << nl |
104 |
+ << name << ".vtk" << nl |
105 |
+ << "ASCII" << nl |
106 |
+ << "DATASET POLYDATA" << nl |
107 |
+ << "POINTS " << points.size() << " float" << nl; |
108 |
+ |
109 |
+ // Write points |
110 |
+ List<float> mlpBuffer(3*points.size()); |
111 |
+ |
112 |
+ label counter = 0; |
113 |
+ forAll (points, i) |
114 |
+ { |
115 |
+ mlpBuffer[counter++] = float(points[i].x()); |
116 |
+ mlpBuffer[counter++] = float(points[i].y()); |
117 |
+ mlpBuffer[counter++] = float(points[i].z()); |
118 |
+ } |
119 |
+ |
120 |
+ forAll (mlpBuffer, i) |
121 |
+ { |
122 |
+ mps << mlpBuffer[i] << ' '; |
123 |
+ |
124 |
+ if (i > 0 && (i % 10) == 0) |
125 |
+ { |
126 |
+ mps << nl; |
127 |
+ } |
128 |
+ } |
129 |
+ |
130 |
+ // Write faces |
131 |
+ label nFaceVerts = 0; |
132 |
+ |
133 |
+ forAll (faces, faceI) |
134 |
+ { |
135 |
+ nFaceVerts += faces[faceI].size() + 1; |
136 |
+ } |
137 |
+ labelList mlfBuffer(nFaceVerts); |
138 |
+ |
139 |
+ counter = 0; |
140 |
+ forAll (faces, faceI) |
141 |
+ { |
142 |
+ const Face& f = faces[faceI]; |
143 |
+ |
144 |
+ mlfBuffer[counter++] = f.size(); |
145 |
+ |
146 |
+ forAll (f, fpI) |
147 |
+ { |
148 |
+ mlfBuffer[counter++] = f[fpI]; |
149 |
+ } |
150 |
+ } |
151 |
+ mps << nl; |
152 |
+ |
153 |
+ mps << "POLYGONS " << faces.size() << ' ' << nFaceVerts << endl; |
154 |
+ |
155 |
+ forAll (mlfBuffer, i) |
156 |
+ { |
157 |
+ mps << mlfBuffer[i] << ' '; |
158 |
+ |
159 |
+ if (i > 0 && (i % 10) == 0) |
160 |
+ { |
161 |
+ mps << nl; |
162 |
+ } |
163 |
+ } |
164 |
+ mps << nl; |
165 |
+} |
166 |
+ |
167 |
+ |
168 |
+template |
169 |
+< |
170 |
+ class Face, |
171 |
+ template<class> class FaceList, |
172 |
+ class PointField, |
173 |
+ class PointType |
174 |
+> |
175 |
+void PrimitivePatch<Face, FaceList, PointField, PointType>::writeVTKNormals |
176 |
+( |
177 |
+ const fileName& name, |
178 |
+ const FaceListType& faces, |
179 |
+ const Field<PointType>& points |
180 |
+) |
181 |
+{ |
182 |
+ // Write patch and points into VTK |
183 |
+ OFstream mps(name + ".vtk"); |
184 |
+ |
185 |
+ mps << "# vtk DataFile Version 2.0" << nl |
186 |
+ << name << ".vtk" << nl |
187 |
+ << "ASCII" << nl |
188 |
+ << "DATASET POLYDATA" << nl |
189 |
+ << "POINTS " << faces.size() << " float" << nl; |
190 |
+ |
191 |
+ // Write points |
192 |
+ List<float> mlPointBuffer(3*faces.size()); |
193 |
+ |
194 |
+ label counter = 0; |
195 |
+ forAll (faces, i) |
196 |
+ { |
197 |
+ const vector c = faces[i].centre(points); |
198 |
+ |
199 |
+ mlPointBuffer[counter++] = float(c.x()); |
200 |
+ mlPointBuffer[counter++] = float(c.y()); |
201 |
+ mlPointBuffer[counter++] = float(c.z()); |
202 |
+ } |
203 |
+ |
204 |
+ forAll (mlPointBuffer, i) |
205 |
+ { |
206 |
+ mps << mlPointBuffer[i] << ' '; |
207 |
+ |
208 |
+ if (i > 0 && (i % 10) == 0) |
209 |
+ { |
210 |
+ mps << nl; |
211 |
+ } |
212 |
+ } |
213 |
+ mps << nl; |
214 |
+ |
215 |
+ // Write normals |
216 |
+ mps << "POINT_DATA " << faces.size() << nl |
217 |
+ << "FIELD attributes " << 1 << nl |
218 |
+ << "normals" << " 3 " |
219 |
+ << faces.size() << " float" << nl; |
220 |
+ |
221 |
+ List<float> mlNormalBuffer(3*faces.size()); |
222 |
+ |
223 |
+ counter = 0; |
224 |
+ forAll (faces, i) |
225 |
+ { |
226 |
+ const vector n = faces[i].normal(points); |
227 |
+ |
228 |
+ mlNormalBuffer[counter++] = float(n.x()); |
229 |
+ mlNormalBuffer[counter++] = float(n.y()); |
230 |
+ mlNormalBuffer[counter++] = float(n.z()); |
231 |
+ } |
232 |
+ |
233 |
+ forAll (mlNormalBuffer, i) |
234 |
+ { |
235 |
+ mps << mlNormalBuffer[i] << ' '; |
236 |
+ |
237 |
+ if (i > 0 && (i % 10) == 0) |
238 |
+ { |
239 |
+ mps << nl; |
240 |
+ } |
241 |
+ } |
242 |
+ mps << nl; |
243 |
+} |
244 |
+ |
245 |
+ |
246 |
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // |
247 |
|
248 |
} // End namespace Foam |
249 |
|
250 |
|
251 |
|
252 |
1.1 sci-libs/openfoam-kernel/files/OpenFOAM-1.5-compile.patch |
253 |
|
254 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/openfoam-kernel/files/OpenFOAM-1.5-compile.patch?rev=1.1&view=markup |
255 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/openfoam-kernel/files/OpenFOAM-1.5-compile.patch?rev=1.1&content-type=text/plain |
256 |
|
257 |
Index: OpenFOAM-1.5-compile.patch |
258 |
=================================================================== |
259 |
--- OpenFOAM-1.5-src/etc/bashrc 2008-07-09 19:08:57.000000000 +0200 |
260 |
+++ OpenFOAM-1.5/etc/bashrc 2008-07-21 23:07:48.000000000 +0200 |
261 |
@@ -42,9 +42,9 @@ |
262 |
# |
263 |
# Location of FOAM installation |
264 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
265 |
-foamInstall=$HOME/$WM_PROJECT |
266 |
+# foamInstall=$HOME/$WM_PROJECT |
267 |
# foamInstall=~$WM_PROJECT |
268 |
-# foamInstall=/usr/local/$WM_PROJECT |
269 |
+foamInstall=/usr/lib/$WM_PROJECT |
270 |
# foamInstall=/opt/$WM_PROJECT |
271 |
|
272 |
: ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR |
273 |
@@ -59,7 +59,7 @@ |
274 |
|
275 |
# Location of third-party software |
276 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
277 |
-export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty |
278 |
+# export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty |
279 |
|
280 |
|
281 |
# Operating System/Platform from Unix or MSWindows |
282 |
@@ -192,15 +192,15 @@ |
283 |
|
284 |
|
285 |
_foamSource $WM_PROJECT_DIR/etc/settings.sh |
286 |
-_foamSource $WM_PROJECT_DIR/etc/aliases.sh |
287 |
+# _foamSource $WM_PROJECT_DIR/etc/aliases.sh |
288 |
|
289 |
|
290 |
# Source user setup files for optional packages |
291 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
292 |
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc |
293 |
-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc |
294 |
+# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc |
295 |
# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc |
296 |
-_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc |
297 |
+# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc |
298 |
|
299 |
|
300 |
# Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH) |
301 |
--- OpenFOAM-1.5-src/etc/settings.sh 2008-06-27 13:19:25.000000000 +0200 |
302 |
+++ OpenFOAM-1.5/etc/settings.sh 2008-07-21 00:50:00.000000000 +0200 |
303 |
@@ -56,30 +56,30 @@ |
304 |
export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH |
305 |
|
306 |
#- Location of the jobControl directory |
307 |
-export FOAM_JOB_DIR=$FOAM_INST_DIR/jobControl |
308 |
+export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl |
309 |
|
310 |
export WM_DIR=$WM_PROJECT_DIR/wmake |
311 |
export WM_LINK_LANGUAGE=c++ |
312 |
-export WM_OPTIONS=$WM_ARCH${WM_COMPILER}$WM_PRECISION_OPTION$WM_COMPILE_OPTION |
313 |
+export WM_OPTIONS=$WM_ARCH${WM_COMPILER} |
314 |
export PATH=$WM_DIR:$PATH |
315 |
|
316 |
export FOAM_SRC=$WM_PROJECT_DIR/src |
317 |
export FOAM_LIB=$WM_PROJECT_DIR/lib |
318 |
-export FOAM_LIBBIN=$FOAM_LIB/$WM_OPTIONS |
319 |
+export FOAM_LIBBIN=$FOAM_LIB |
320 |
_foamAddLib $FOAM_LIBBIN |
321 |
|
322 |
export FOAM_APP=$WM_PROJECT_DIR/applications |
323 |
-export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS |
324 |
+export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin |
325 |
_foamAddPath $FOAM_APPBIN |
326 |
|
327 |
export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials |
328 |
export FOAM_UTILITIES=$FOAM_APP/utilities |
329 |
export FOAM_SOLVERS=$FOAM_APP/solvers |
330 |
|
331 |
-export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS |
332 |
+export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib |
333 |
_foamAddLib $FOAM_USER_LIBBIN |
334 |
|
335 |
-export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS |
336 |
+export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin |
337 |
_foamAddPath $FOAM_USER_APPBIN |
338 |
|
339 |
export FOAM_RUN=$WM_PROJECT_USER_DIR/run |
340 |
@@ -93,7 +93,7 @@ |
341 |
# Select compiler installation |
342 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
343 |
# WM_COMPILER_INST = OpenFOAM | System |
344 |
-WM_COMPILER_INST=OpenFOAM |
345 |
+WM_COMPILER_INST=System |
346 |
|
347 |
case "$WM_COMPILER_INST" in |
348 |
OpenFOAM) |
349 |
@@ -136,45 +136,47 @@ |
350 |
|
351 |
case "$WM_MPLIB" in |
352 |
OPENMPI) |
353 |
- mpi_version=openmpi-1.2.6 |
354 |
- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version |
355 |
- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS |
356 |
- |
357 |
+ MPI_VERSION=openmpi |
358 |
+# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version |
359 |
+# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS |
360 |
+ export MPI_ARCH_PATH=/usr |
361 |
# Tell OpenMPI where to find its install directory |
362 |
export OPAL_PREFIX=$MPI_ARCH_PATH |
363 |
|
364 |
- _foamAddLib $MPI_ARCH_PATH/lib |
365 |
- _foamAddPath $MPI_ARCH_PATH/bin |
366 |
+# _foamAddLib $MPI_ARCH_PATH/lib |
367 |
+# _foamAddPath $MPI_ARCH_PATH/bin |
368 |
|
369 |
- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version |
370 |
- unset mpi_version |
371 |
+ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION |
372 |
+# unset mpi_version |
373 |
;; |
374 |
|
375 |
LAM) |
376 |
- mpi_version=lam-7.1.4 |
377 |
- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version |
378 |
- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS |
379 |
- export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version |
380 |
+ MPI_VERSION=lam |
381 |
+# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version |
382 |
+# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS |
383 |
+ export MPI_ARCH_PATH=/usr |
384 |
+# export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version |
385 |
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too |
386 |
|
387 |
- _foamAddLib $MPI_ARCH_PATH/lib |
388 |
- _foamAddPath $MPI_ARCH_PATH/bin |
389 |
+# _foamAddLib $MPI_ARCH_PATH/lib |
390 |
+# _foamAddPath $MPI_ARCH_PATH/bin |
391 |
|
392 |
- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version |
393 |
- unset mpi_version |
394 |
+ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION |
395 |
+# unset mpi_version |
396 |
;; |
397 |
|
398 |
MPICH) |
399 |
- mpi_version=mpich-1.2.4 |
400 |
- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version |
401 |
- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS |
402 |
+ MPI_VERSION=mpich |
403 |
+# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version |
404 |
+# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS |
405 |
+ export MPI_ARCH_PATH=/usr |
406 |
export MPICH_ROOT=$MPI_ARCH_PATH |
407 |
|
408 |
- _foamAddLib $MPI_ARCH_PATH/lib |
409 |
- _foamAddPath $MPI_ARCH_PATH/bin |
410 |
+# _foamAddLib $MPI_ARCH_PATH/lib |
411 |
+# _foamAddPath $MPI_ARCH_PATH/bin |
412 |
|
413 |
- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version |
414 |
- unset mpi_version |
415 |
+ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION |
416 |
+# unset mpi_version |
417 |
;; |
418 |
|
419 |
MPICH-GM) |
420 |
--- OpenFOAM-1.5-src/etc/cshrc 2008-07-09 19:09:28.000000000 +0200 |
421 |
+++ OpenFOAM-1.5/etc/cshrc 2008-07-20 22:31:22.000000000 +0200 |
422 |
@@ -58,7 +58,7 @@ |
423 |
|
424 |
# Location of third-party software |
425 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
426 |
-setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty |
427 |
+# setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty |
428 |
|
429 |
|
430 |
# Operating System/Platform from Unix or MSWindows |
431 |
@@ -188,12 +188,12 @@ |
432 |
alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*' |
433 |
|
434 |
_foamSource $WM_PROJECT_DIR/etc/settings.csh |
435 |
-_foamSource $WM_PROJECT_DIR/etc/aliases.csh |
436 |
+# _foamSource $WM_PROJECT_DIR/etc/aliases.csh |
437 |
|
438 |
# Source user setup files for optional packages |
439 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
440 |
# _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc |
441 |
-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc |
442 |
+# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc |
443 |
# _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc |
444 |
|
445 |
|
446 |
--- OpenFOAM-1.5-src/etc/settings.csh 2008-06-27 13:19:25.000000000 +0200 |
447 |
+++ OpenFOAM-1.5/etc/settings.csh 2008-07-20 23:14:59.000000000 +0200 |
448 |
@@ -39,30 +39,30 @@ |
449 |
set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path) |
450 |
|
451 |
#- Location of the jobControl directory |
452 |
-setenv FOAM_JOB_DIR $FOAM_INST_DIR/jobControl |
453 |
+setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl |
454 |
|
455 |
setenv WM_DIR $WM_PROJECT_DIR/wmake |
456 |
setenv WM_LINK_LANGUAGE c++ |
457 |
-setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION |
458 |
+setenv WM_OPTIONS $WM_ARCH$WM_COMPILER |
459 |
set path=($WM_DIR $path) |
460 |
|
461 |
setenv FOAM_SRC $WM_PROJECT_DIR/src |
462 |
setenv FOAM_LIB $WM_PROJECT_DIR/lib |
463 |
-setenv FOAM_LIBBIN $FOAM_LIB/$WM_OPTIONS |
464 |
+setenv FOAM_LIBBIN $FOAM_LIB |
465 |
_foamAddLib $FOAM_LIBBIN |
466 |
|
467 |
setenv FOAM_APP $WM_PROJECT_DIR/applications |
468 |
-setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS |
469 |
+setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin |
470 |
_foamAddPath $FOAM_APPBIN |
471 |
|
472 |
setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials |
473 |
setenv FOAM_UTILITIES $FOAM_APP/utilities |
474 |
setenv FOAM_SOLVERS $FOAM_APP/solvers |
475 |
|
476 |
-setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS |
477 |
+setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib |
478 |
_foamAddLib $FOAM_USER_LIBBIN |
479 |
|
480 |
-setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS |
481 |
+setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin |
482 |
_foamAddPath $FOAM_USER_APPBIN |
483 |
|
484 |
setenv FOAM_RUN $WM_PROJECT_USER_DIR/run |
485 |
@@ -76,7 +76,7 @@ |
486 |
# Select compiler installation |
487 |
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
488 |
# WM_COMPILER_INST = OpenFOAM | System |
489 |
-set WM_COMPILER_INST=OpenFOAM |
490 |
+set WM_COMPILER_INST=System |
491 |
|
492 |
switch ("$WM_COMPILER_INST") |
493 |
case OpenFOAM: |
494 |
@@ -125,45 +125,48 @@ |
495 |
|
496 |
switch ("$WM_MPLIB") |
497 |
case OPENMPI: |
498 |
- set mpi_version=openmpi-1.2.6 |
499 |
- setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version |
500 |
- setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS |
501 |
+# set mpi_version=openmpi-1.2.6 |
502 |
+# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version |
503 |
+# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS |
504 |
+ setenv MPI_ARCH_PATH /usr |
505 |
|
506 |
# Tell OpenMPI where to find its install directory |
507 |
setenv OPAL_PREFIX $MPI_ARCH_PATH |
508 |
|
509 |
- _foamAddLib $MPI_ARCH_PATH/lib |
510 |
- _foamAddPath $MPI_ARCH_PATH/bin |
511 |
+# _foamAddLib $MPI_ARCH_PATH/lib |
512 |
+# _foamAddPath $MPI_ARCH_PATH/bin |
513 |
|
514 |
- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version |
515 |
- unset mpi_version |
516 |
+ setenv FOAM_MPI_LIBBIN $FOAM_LIB/openmpi |
517 |
+# unset mpi_version |
518 |
breaksw |
519 |
|
520 |
case LAM: |
521 |
- set mpi_version=lam-7.1.4 |
522 |
- setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version |
523 |
- setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS |
524 |
- setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version |
525 |
+# set mpi_version=lam-7.1.4 |
526 |
+# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version |
527 |
+# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS |
528 |
+ setenv MPI_ARCH_PATH /usr |
529 |
+# setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version |
530 |
# note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too |
531 |
|
532 |
- _foamAddLib $MPI_ARCH_PATH/lib |
533 |
- _foamAddPath $MPI_ARCH_PATH/bin |
534 |
+# _foamAddLib $MPI_ARCH_PATH/lib |
535 |
+# _foamAddPath $MPI_ARCH_PATH/bin |
536 |
|
537 |
- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version |
538 |
- unset mpi_version |
539 |
+ setenv FOAM_MPI_LIBBIN $FOAM_LIB/lam |
540 |
+# unset mpi_version |
541 |
breaksw |
542 |
|
543 |
case MPICH: |
544 |
- set mpi_version=mpich-1.2.4 |
545 |
- setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version |
546 |
- setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS |
547 |
+# set mpi_version=mpich-1.2.4 |
548 |
+# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version |
549 |
+# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS |
550 |
+ setenv MPI_ARCH_PATH /usr |
551 |
setenv MPICH_ROOT $MPI_ARCH_PATH |
552 |
|
553 |
- _foamAddLib $MPI_ARCH_PATH/lib |
554 |
- _foamAddPath $MPI_ARCH_PATH/bin |
555 |
+# _foamAddLib $MPI_ARCH_PATH/lib |
556 |
+# _foamAddPath $MPI_ARCH_PATH/bin |
557 |
|
558 |
- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version |
559 |
- unset mpi_version |
560 |
+ setenv FOAM_MPI_LIBBIN $FOAM_LIB/mpich |
561 |
+# unset mpi_version |
562 |
breaksw |
563 |
|
564 |
case MPICH-GM: |
565 |
--- OpenFOAM-1.5-src/wmake/rules/General/flex++ 2008-05-01 16:16:40.000000000 +0200 |
566 |
+++ OpenFOAM-1.5/wmake/rules/General/flex++ 2008-07-22 16:18:41.000000000 +0200 |
567 |
@@ -1,6 +1,6 @@ |
568 |
.SUFFIXES: .L |
569 |
|
570 |
-Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ |
571 |
+Ltoo = flex --c++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ |
572 |
|
573 |
.L.dep: |
574 |
$(MAKE_DEP) |
575 |
--- OpenFOAM-1.5-src/wmake/Makefile 2008-06-27 13:19:31.000000000 +0200 |
576 |
+++ OpenFOAM-1.5/wmake/Makefile 2008-07-20 23:06:27.000000000 +0200 |
577 |
@@ -56,7 +56,7 @@ |
578 |
|
579 |
LIB_SRC = $(WM_PROJECT_DIR)/src |
580 |
LIB_DIR = $(WM_PROJECT_DIR)/lib |
581 |
-LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS) |
582 |
+LIB_WM_OPTIONS_DIR = $(LIB_DIR) |
583 |
OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS) |
584 |
CLASSES_DIR = $(MAKE_DIR)/classes |
585 |
|
586 |
--- OpenFOAM-1.5-src/bin/paraFoam 2008-07-03 18:14:43.000000000 +0200 |
587 |
+++ OpenFOAM-1.5/bin/paraFoam 2008-07-22 15:23:24.000000000 +0200 |
588 |
@@ -77,8 +77,8 @@ |
589 |
[ -s "$parentDir/$check" ] || usage "file does not exist: '$parentDir/$check'" |
590 |
done |
591 |
|
592 |
-#caseFile="$caseName.foam" |
593 |
-caseFile="$caseName.OpenFOAM" |
594 |
+caseFile="$caseName.foam" |
595 |
+# caseFile="$caseName.OpenFOAM" |
596 |
|
597 |
case "$ParaView_VERSION" in |
598 |
2*) |
599 |
@@ -96,7 +96,7 @@ |
600 |
*) |
601 |
# Clean up on termination and on Ctrl-C |
602 |
trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT |
603 |
- touch $caseFile |
604 |
+ ln system/controlDict $caseFile |
605 |
paraview --data=$caseFile |
606 |
;; |
607 |
|
608 |
--- OpenFOAM-1.5-src/src/decompositionAgglomeration/decompositionMethods/Make/options 2008-06-09 16:22:09.000000000 +0200 |
609 |
+++ OpenFOAM-1.5/src/decompositionAgglomeration/decompositionMethods/Make/options 2008-07-20 22:19:30.000000000 +0200 |
610 |
@@ -1,6 +1,5 @@ |
611 |
EXE_INC = \ |
612 |
- -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include |
613 |
+ -I/usr/include/metis |
614 |
|
615 |
LIB_LIBS = \ |
616 |
- -lmetis \ |
617 |
- -lGKlib |
618 |
+ -lmetis |
619 |
--- OpenFOAM-1.5-src/src/decompositionAgglomeration/parMetisDecomp/Make/options 2008-06-09 16:23:55.000000000 +0200 |
620 |
+++ OpenFOAM-1.5/src/decompositionAgglomeration/parMetisDecomp/Make/options 2008-07-20 22:24:04.000000000 +0200 |
621 |
@@ -2,11 +2,11 @@ |
622 |
|
623 |
EXE_INC = \ |
624 |
$(PFLAGS) $(PINC) \ |
625 |
- -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \ |
626 |
- -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \ |
627 |
+ -I/usr/include/parmetis \ |
628 |
+ -I/usr/include/metis \ |
629 |
-I../decompositionMethods/lnInclude |
630 |
|
631 |
LIB_LIBS = \ |
632 |
-L$(FOAM_MPI_LIBBIN) \ |
633 |
- -lmetis-parmetis \ |
634 |
+ -lmetis \ |
635 |
-lparmetis |
636 |
--- OpenFOAM-1.5-src/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options 2008-06-09 16:22:37.000000000 +0200 |
637 |
+++ OpenFOAM-1.5/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options 2008-07-21 20:45:42.000000000 +0200 |
638 |
@@ -1,5 +1,3 @@ |
639 |
-ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0 |
640 |
- |
641 |
TYPE_REAL= |
642 |
#if defined(SP) |
643 |
TYPE_REAL=-DTYPE_REAL |
644 |
@@ -7,9 +5,9 @@ |
645 |
|
646 |
EXE_INC = \ |
647 |
-I$(LIB_SRC)/finiteVolume/lnInclude \ |
648 |
- -I$(ParMGridGen)/MGridGen/Lib/lnInclude \ |
649 |
- -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \ |
650 |
+ -I/usr/include/mgridgen \ |
651 |
$(TYPE_REAL) |
652 |
|
653 |
LIB_LIBS = \ |
654 |
+ -lIMlib \ |
655 |
-lMGridGen |