Gentoo Archives: gentoo-commits

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