diff --git a/ReleaseNotes-1.5 b/ReleaseNotes-1.5 index faa5dad6b2..387d65d9a0 100644 --- a/ReleaseNotes-1.5 +++ b/ReleaseNotes-1.5 @@ -2,7 +2,7 @@ # #+TITLE: *OpenFOAM release notes for version 1.5* #+AUTHOR: OpenCFD Ltd. -#+DATE: 26 August 2008 +#+DATE: 07 October 2008 #+LINK: http://www.opencfd.co.uk #+OPTIONS: author:nil ^:{} @@ -34,7 +34,7 @@ and $WM_COMPILER_ARCH environment variables in the OpenFOAM-1.5/etc/bashrc (or cshrc) file. + The location of the installation of the compiler is controlled by the - $WM_COMPILER_INST environment variable in the OpenFOAM-1.5/etc/settings.sh + $compilerInstall environment variable in the OpenFOAM-1.5/etc/settings.sh (or settings.csh) file. * Developments to solvers (applications) diff --git a/ReleaseNotes-1.5.html b/ReleaseNotes-1.5.html index a1805d5e9d..d1c62c685b 100644 --- a/ReleaseNotes-1.5.html +++ b/ReleaseNotes-1.5.html @@ -49,7 +49,7 @@ quires the installation of Qt 4.3.? for ParaView-3 to run. $WM_COMPILER and $WM_COMPILER_ARCH environment variables in the OpenFOAM-1.5/etc/bashrc (or cshrc) file. * The location of the installation of the compiler is controlled by the - $WM_COMPILER_INST environment variable in the OpenFOAM-1.5/etc/settings.sh + $compilerInstall environment variable in the OpenFOAM-1.5/etc/settings.sh (or settings.csh) file. 4 Developments to solvers (applications) @@ -202,7 +202,7 @@ To aid common monitoring and post-processing activities. * Non-blocking, non-buffered, parallel transfers with potential scaling benefits for larger number of processors. -Date: 26 August 2008 +Date: 07 October 2008 HTML generated by org-mode 6.06b in emacs 23 diff --git a/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H b/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H index 6b87262133..c5a992817f 100644 --- a/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H +++ b/applications/solvers/Lagrangian/kinematicParcelFoam/createFields.H @@ -46,9 +46,6 @@ ) ); - pointMesh pMesh(mesh); - volPointInterpolation vpi(mesh, pMesh); - word kinematicCloudName("kinematicCloud"); if (args.options().found("cloudName")) @@ -60,7 +57,6 @@ basicKinematicCloud kinematicCloud ( kinematicCloudName, - vpi, rho, U, thermo().mu(), diff --git a/applications/solvers/combustion/dieselEngineFoam/createSpray.H b/applications/solvers/combustion/dieselEngineFoam/createSpray.H index c5bc0d88cf..b86b3684c2 100644 --- a/applications/solvers/combustion/dieselEngineFoam/createSpray.H +++ b/applications/solvers/combustion/dieselEngineFoam/createSpray.H @@ -1,8 +1,5 @@ Info << "Constructing Spray" << endl; -pointMesh pMesh(mesh); -volPointInterpolation vpi(mesh, pMesh); - PtrList gasProperties(Y.size()); forAll(gasProperties, i) { @@ -18,7 +15,6 @@ forAll(gasProperties, i) spray dieselSpray ( - vpi, U, rho, p, diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C index b6cfb46d92..f579825384 100644 --- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C +++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C @@ -41,6 +41,7 @@ Description #include "multivariateScheme.H" #include "Switch.H" #include "OFstream.H" +#include "volPointInterpolation.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -75,7 +76,10 @@ int main(int argc, char *argv[]) Info<< "Crank angle = " << runTime.theta() << " CA-deg" << endl; mesh.move(); - vpi.updateMesh(); + const_cast + ( + volPointInterpolation::New(mesh) + ).updateMesh(); dieselSpray.evolve(); diff --git a/applications/test/DynamicList/DynamicListTest.C b/applications/test/DynamicList/DynamicListTest.C index 0233dbd474..6cdbb84890 100644 --- a/applications/test/DynamicList/DynamicListTest.C +++ b/applications/test/DynamicList/DynamicListTest.C @@ -43,20 +43,58 @@ int main(int argc, char *argv[]) ldl[0](3) = 3; ldl[0](1) = 1; - ldl[1](0) = 1; - ldl[1](1) = 2; + ldl[0].setSize(5); // increase allocated size + ldl[1].setSize(10); // increase allocated size + ldl[1](2) = 2; ldl[1] = 3; - Info<< ldl[1]; + Info<< "" << ldl << "" << nl << "sizes: "; + forAll(ldl, i) + { + Info<< " " << ldl[i].size() << "/" << ldl[i].allocSize(); + } + Info<< endl; List > ll(2); - ll[0].transfer(ldl[0].shrink()); + ll[0].transfer(ldl[0]); ll[1].transfer(ldl[1].shrink()); - Info<< ll << endl; + Info<< "" << ldl << "" << nl << "sizes: "; + forAll(ldl, i) + { + Info<< " " << ldl[i].size() << "/" << ldl[i].allocSize(); + } + Info<< endl; + + Info<< "" << ll << "" << nl << endl; + + + // test the transfer between DynamicLists + DynamicList dlA; + DynamicList dlB; + + for (label i = 0; i < 5; i++) + { + dlA.append(i); + } + dlA.setSize(10); + + Info<< "" << dlA << "" << nl << "sizes: " + << " " << dlA.size() << "/" << dlA.allocSize() << endl; + + dlB.transfer(dlA); + + // provokes memory error if previous transfer did not maintain + // the correct allocated space + dlB[6] = 6; + + Info<< "Transferred to dlB" << endl; + Info<< "" << dlA << "" << nl << "sizes: " + << " " << dlA.size() << "/" << dlA.allocSize() << endl; + Info<< "" << dlB << "" << nl << "sizes: " + << " " << dlB.size() << "/" << dlB.allocSize() << endl; - Info << "\nEnd\n" << endl; return 0; } diff --git a/applications/test/List/ListLoop.s b/applications/test/List/ListLoop.s deleted file mode 100644 index 4acfadf829..0000000000 --- a/applications/test/List/ListLoop.s +++ /dev/null @@ -1,224 +0,0 @@ - .file "ListLoop.C" - .section .ctors,"aw",@progbits - .align 4 - .long _GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_ - .text - .align 2 - .p2align 4,,15 - .type _Z41__static_initialization_and_destruction_0ii, @function -_Z41__static_initialization_and_destruction_0ii: -.LFB2550: - pushl %ebp -.LCFI0: - movl %esp, %ebp -.LCFI1: - pushl %ebx -.LCFI2: - call __i686.get_pc_thunk.bx - addl $_GLOBAL_OFFSET_TABLE_, %ebx - subl $20, %esp -.LCFI3: - decl %eax - je .L7 -.L5: - addl $20, %esp - popl %ebx - leave - ret - .p2align 4,,7 -.L7: - cmpl $65535, %edx - jne .L5 - leal _ZSt8__ioinit@GOTOFF(%ebx), %eax - movl %eax, (%esp) - call _ZNSt8ios_base4InitC1Ev@PLT - movl __dso_handle@GOT(%ebx), %eax - movl $0, 4(%esp) - movl %eax, 8(%esp) - leal __tcf_0@GOTOFF(%ebx), %eax - movl %eax, (%esp) - call __cxa_atexit@PLT - addl $20, %esp - popl %ebx - leave - ret -.LFE2550: - .size _Z41__static_initialization_and_destruction_0ii, .-_Z41__static_initialization_and_destruction_0ii -.globl __gxx_personality_v0 - .align 2 - .p2align 4,,15 - .type _GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, @function -_GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_: -.LFB2552: - pushl %ebp -.LCFI4: - movl $65535, %edx - movl $1, %eax - movl %esp, %ebp -.LCFI5: - leave - jmp _Z41__static_initialization_and_destruction_0ii -.LFE2552: - .size _GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, .-_GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_ - .align 2 - .p2align 4,,15 - .type __tcf_0, @function -__tcf_0: -.LFB2551: - pushl %ebp -.LCFI6: - movl %esp, %ebp -.LCFI7: - pushl %ebx -.LCFI8: - call __i686.get_pc_thunk.bx - addl $_GLOBAL_OFFSET_TABLE_, %ebx - subl $4, %esp -.LCFI9: - leal _ZSt8__ioinit@GOTOFF(%ebx), %eax - movl %eax, (%esp) - call _ZNSt8ios_base4InitD1Ev@PLT - addl $4, %esp - popl %ebx - leave - ret -.LFE2551: - .size __tcf_0, .-__tcf_0 - .align 2 - .p2align 4,,15 -.globl _Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_ - .type _Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, @function -_Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_: -.LFB2352: - pushl %ebp -.LCFI10: - movl %esp, %ebp -.LCFI11: - pushl %edi -.LCFI12: - pushl %esi -.LCFI13: - subl $12, %esp -.LCFI14: - movl 8(%ebp), %edx - movl (%edx), %eax - testl %eax, %eax - movl %eax, -20(%ebp) - jle .L16 - movl 16(%ebp), %eax - movl 4(%edx), %edx - xorl %ecx, %ecx - movl 4(%eax), %eax - movl %edx, -12(%ebp) - movl %eax, -16(%ebp) - movl 20(%ebp), %eax - movl 4(%eax), %edi - movl 12(%ebp), %eax - movl 4(%eax), %esi - .p2align 4,,7 -.L15: - movl -16(%ebp), %edx - movl (%edx,%ecx,4), %eax - movl -12(%ebp), %edx - leal (%edx,%eax,8), %eax - movl (%edi,%ecx,4), %edx - incl %ecx - cmpl %ecx, -20(%ebp) - fldl (%eax) - fsubl (%esi,%edx,8) - fstpl (%eax) - jne .L15 -.L16: - addl $12, %esp - popl %esi - popl %edi - leave - ret -.LFE2352: - .size _Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, .-_Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_ - .local _ZSt8__ioinit - .comm _ZSt8__ioinit,1,1 - .section .eh_frame,"a",@progbits -.Lframe1: - .long .LECIE1-.LSCIE1 -.LSCIE1: - .long 0x0 - .byte 0x1 - .string "zPR" - .uleb128 0x1 - .sleb128 -4 - .byte 0x8 - .uleb128 0x6 - .byte 0x9b - .long DW.ref.__gxx_personality_v0-. - .byte 0x1b - .byte 0xc - .uleb128 0x4 - .uleb128 0x4 - .byte 0x88 - .uleb128 0x1 - .align 4 -.LECIE1: -.LSFDE1: - .long .LEFDE1-.LASFDE1 -.LASFDE1: - .long .LASFDE1-.Lframe1 - .long .LFB2550-. - .long .LFE2550-.LFB2550 - .uleb128 0x0 - .byte 0x4 - .long .LCFI0-.LFB2550 - .byte 0xe - .uleb128 0x8 - .byte 0x85 - .uleb128 0x2 - .byte 0x4 - .long .LCFI1-.LCFI0 - .byte 0xd - .uleb128 0x5 - .byte 0x4 - .long .LCFI2-.LCFI1 - .byte 0x83 - .uleb128 0x3 - .align 4 -.LEFDE1: -.LSFDE5: - .long .LEFDE5-.LASFDE5 -.LASFDE5: - .long .LASFDE5-.Lframe1 - .long .LFB2551-. - .long .LFE2551-.LFB2551 - .uleb128 0x0 - .byte 0x4 - .long .LCFI6-.LFB2551 - .byte 0xe - .uleb128 0x8 - .byte 0x85 - .uleb128 0x2 - .byte 0x4 - .long .LCFI7-.LCFI6 - .byte 0xd - .uleb128 0x5 - .byte 0x4 - .long .LCFI8-.LCFI7 - .byte 0x83 - .uleb128 0x3 - .align 4 -.LEFDE5: - .hidden DW.ref.__gxx_personality_v0 - .weak DW.ref.__gxx_personality_v0 - .section .data.DW.ref.__gxx_personality_v0,"awG",@progbits,DW.ref.__gxx_personality_v0,comdat - .align 4 - .type DW.ref.__gxx_personality_v0, @object - .size DW.ref.__gxx_personality_v0, 4 -DW.ref.__gxx_personality_v0: - .long __gxx_personality_v0 - .ident "GCC: (GNU) 4.1.1" - .section .text.__i686.get_pc_thunk.bx,"axG",@progbits,__i686.get_pc_thunk.bx,comdat -.globl __i686.get_pc_thunk.bx - .hidden __i686.get_pc_thunk.bx - .type __i686.get_pc_thunk.bx, @function -__i686.get_pc_thunk.bx: - movl (%esp), %ebx - ret - .section .note.GNU-stack,"",@progbits diff --git a/applications/test/xfer/Make/files b/applications/test/xfer/Make/files new file mode 100644 index 0000000000..92414c039e --- /dev/null +++ b/applications/test/xfer/Make/files @@ -0,0 +1,4 @@ +xferListTest.C + +/* EXE = $(FOAM_USER_APPBIN)/xferListTest */ +EXE = ./xferListTest diff --git a/applications/test/xfer/Make/options b/applications/test/xfer/Make/options new file mode 100644 index 0000000000..e69de29bb2 diff --git a/applications/test/xfer/xferListTest.C b/applications/test/xfer/xferListTest.C new file mode 100644 index 0000000000..6f2af0932a --- /dev/null +++ b/applications/test/xfer/xferListTest.C @@ -0,0 +1,124 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Application + +Description + +\*---------------------------------------------------------------------------*/ + +#include "OSspecific.H" + +#include "IOstreams.H" +#include "IStringStream.H" +#include "labelList.H" +#include "DynamicList.H" +#include "face.H" + +using namespace Foam; + + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Main program: + +int main(int argc, char *argv[]) +{ + List