Commit Graph

4342 Commits

Author SHA1 Message Date
andy
a54bbffbbf typo 2009-11-12 13:28:18 +00:00
mattijs
9f054e0af2 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-11-11 19:15:25 +00:00
mattijs
100f9c2545 stitching points if no points have been merged 2009-11-11 19:14:33 +00:00
mattijs
d7e8802896 removed octreeDataFaceList; created generic PrimitivePatch search one 2009-11-11 17:19:52 +00:00
mattijs
dd746d4e4b incorrect reading of optional wedgePlane 2009-11-11 17:19:18 +00:00
graham
35f0c0ab8d Changing BC types on walls to calculated instead of zeroGradient for
fields:

    iDof  internalE  linearKE  momentum  q  rhoM  rhoN

because the boundary values are required to record surface data.
2009-11-11 15:41:27 +00:00
graham
0870e22400 Merge branch 'master' into dsmc 2009-11-11 13:24:48 +00:00
graham
3ec8579187 Stabilising division by p. 2009-11-11 13:23:26 +00:00
mattijs
13bddac8f0 singleCellFvMesh and application 2009-11-11 11:29:22 +00:00
Mark Olesen
eb81310085 fixed typo in docs for porousZone 2009-11-11 09:19:31 +01:00
mattijs
5a2eff8e17 fieldname is a word; not fileName 2009-11-10 13:18:35 +00:00
mattijs
1999330c4d Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-11-10 07:42:34 +00:00
andy
e7347dbd62 removed unnecessary interpolation of h - not used 2009-11-09 10:15:07 +00:00
Mark Olesen
3d9c822022 Added abortCalculation function object, exposed Time::stopAtControls
- still needs fine-tuning (testing) to see if it reacts as anticipated under
  various conditions.
2009-11-06 17:18:32 +01:00
Mark Olesen
33e936a34d removed redundant check in HashTable 2009-11-06 16:56:36 +01:00
mattijs
84627ec9ff allow external setting of WM variables 2009-11-06 11:12:42 +00:00
mattijs
cad5a703fc Merge branch 'olesenm' 2009-11-06 11:05:21 +00:00
mattijs
3dd6db6d99 typo in header 2009-11-05 16:17:20 +00:00
mattijs
5c9f1ea23b allow read restart 2009-11-05 16:16:55 +00:00
Mark Olesen
227ea995d8 Merge commit 'OpenCFD/master' into olesenm 2009-11-05 15:40:57 +01:00
Mark Olesen
641a0f1b9c HashTable: drop redundant check as Mattijs noticed 2009-11-04 20:51:18 +01:00
mattijs
bd00518f47 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-11-04 11:40:20 +00:00
mattijs
2268ea38a0 Added Container template argument for e.g. construct from faceList 2009-11-04 11:40:12 +00:00
Mark Olesen
c7c9a6e003 Activate the reworked HashTable
- previous draft version was HashTbl
- accidentally still had canonicalSize in templated code
2009-11-04 09:06:26 +01:00
Mark Olesen
ebe39c4ea4 Merge commit 'OpenCFD/master' into olesenm 2009-11-04 08:56:20 +01:00
Mark Olesen
53a9208d9f Merge commit 'bundle/home' into olesenm
Conflicts:
	src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.C
	src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H
	tutorials/incompressible/simpleFoam/airFoil2D/Allclean
	tutorials/multiphase/settlingFoam/ras/tank3D/Allclean
2009-11-04 08:54:34 +01:00
Mark Olesen
b54f89ac05 PV3Reader - render after toggling show point/patch names 2009-11-03 22:13:48 +01:00
henry
e596285b43 Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev 2009-11-03 20:58:43 +00:00
henry
d109f88657 Fix for viewing glyphs on a set of patches provided by Mark Olesen. 2009-11-03 20:58:41 +00:00
Mark Olesen
e3b5d373d0 PV3FoamReader bugfix - interpolated point fields had wrong names on the patches 2009-11-03 21:36:50 +01:00
mattijs
151f30e779 made container constructors explicit 2009-11-03 18:09:52 +00:00
mattijs
1d6268f24a better use of CompactListList 2009-11-03 18:09:20 +00:00
mattijs
69a4c76c6e changed help text 2009-11-03 18:08:53 +00:00
mattijs
baea3d76a8 CompactListList to use offsets sized one beyond nRows 2009-11-03 18:04:24 +00:00
mattijs
fe17dd2d1f globalIndex to use procI+1 scheme 2009-11-03 18:02:52 +00:00
Mark Olesen
08b74f509f fixes to simpleMatrix ... really need to get a copy from work 2009-11-03 17:33:54 +01:00
Mark Olesen
d5ffabcd47 HashTbl - extra safety
- don't let automatic resize into integer overflow
- avoid possible overflow in increment()

StaticHashTable - fix erase()/++ as per HashTbl

- might still be worth dropping it, but at least it'll be in better
  condition when it gets chucked!
2009-11-03 17:17:45 +01:00
andy
23cf5d94cd code tidying 2009-11-03 14:33:01 +00:00
Mark Olesen
39159a9231 HashTbl: change allocation of end iterators
- the end iterators and canonicalSize are independent of the templated
  parameters, so move them to HashTblCore

- this avoid allocating separate end iterator at all.

  end(), cend() return a iteratorEnd.
  iterator == iteratorEnd just checks for non-NULL pointer on iterator.
  The compiler should optimize most of it away.
2009-11-03 01:01:59 +01:00
mattijs
cfdb0a5ec3 wildcards for excludedPatches 2009-11-02 13:31:17 +00:00
mattijs
5c98e0b652 Tecplot360 writer 2009-11-02 13:30:51 +00:00
mattijs
ba1422df46 Tecplot360 writer 2009-11-02 13:30:36 +00:00
mattijs
6930293dc6 Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev 2009-11-02 08:47:29 +00:00
mattijs
afeb602912 revert to normal HashTable 2009-11-02 08:47:15 +00:00
Mark Olesen
a237b7ce6e HashTbl - iterator/const_iterator implemented in terms of an iteratorBase 2009-11-01 00:54:56 +01:00
Mark Olesen
3a0c427c7b HashTbl - preparation for using interatorBase 2009-10-31 21:27:52 +01:00
Mark Olesen
a61c03a6a4 HashTbl: improve efficiency when deleting many keys and in operator==
- fix off by one error in erase/increment code
2009-10-31 00:03:02 +01:00
Mark Olesen
946aac500a HashTbl changes
- iterators store pointers instead of references to the HashTbl.
  This lets us use the default bitwise copy/assignment

- add empty constructor for iterators. It returns the equivalent to end().
  This lets us do this:
      HashTbl<label>::iterator iter;
      // some time later
      iter = find(Value);

- erase(const HashTbl<AnyType, Key, AnyHash>&) is now more generous.
  Only the Key type matters, not the hashing function.
2009-10-30 22:37:35 +01:00
Mark Olesen
1fbcb6e2c0 Added HashTbl::shrink() - but it only be useful in particular situations
- for the hashTableTest3, it seemed to slow things down a bit

loop 0 - Erased 100000 elements (size 2900000 capacity 4194304) 0.31 s
loop 1 - Erased 100000 elements (size 2800000 capacity 4194304) 0.01 s
loop 2 - Erased 100000 elements (size 2700000 capacity 4194304) 0 s
loop 3 - Erased 100000 elements (size 2600000 capacity 4194304) 0 s
loop 4 - Erased 100000 elements (size 2500000 capacity 4194304) 0.01 s
loop 5 - Erased 100000 elements (size 2400000 capacity 4194304) 0 s
loop 6 - Erased 100000 elements (size 2300000 capacity 4194304) 0 s
loop 7 - Erased 100000 elements (size 2200000 capacity 4194304) 0 s
loop 8 - Erased 100000 elements (size 2100000 capacity 4194304) 0.01 s
loop 9 - Erased 100000 elements (size 2000000 capacity 4194304) 0.44 s
loop 10 - Erased 100000 elements (size 1900000 capacity 4194304) 0.44 s
loop 11 - Erased 100000 elements (size 1800000 capacity 4194304) 0.39 s
loop 12 - Erased 100000 elements (size 1700000 capacity 4194304) 0.4 s
loop 13 - Erased 100000 elements (size 1600000 capacity 2097152) 0.15 s
loop 14 - Erased 100000 elements (size 1500000 capacity 2097152) 0.01 s
loop 15 - Erased 100000 elements (size 1400000 capacity 2097152) 0 s
loop 16 - Erased 100000 elements (size 1300000 capacity 2097152) 0 s
loop 17 - Erased 100000 elements (size 1200000 capacity 2097152) 0.01 s
loop 18 - Erased 100000 elements (size 1100000 capacity 2097152) 0 s
loop 19 - Erased 100000 elements (size 1000000 capacity 2097152) 0.27 s
loop 20 - Erased 100000 elements (size 900000 capacity 2097152) 0.2 s
loop 21 - Erased 100000 elements (size 800000 capacity 1048576) 0.1 s
loop 22 - Erased 100000 elements (size 700000 capacity 1048576) 0 s
loop 23 - Erased 100000 elements (size 600000 capacity 1048576) 0 s
loop 24 - Erased 100000 elements (size 500000 capacity 1048576) 0.12 s
loop 25 - Erased 100000 elements (size 400000 capacity 524288) 0.04 s
loop 26 - Erased 100000 elements (size 300000 capacity 524288) 0.01 s
loop 27 - Erased 100000 elements (size 200000 capacity 262144) 0.02 s
loop 28 - Erased 100000 elements (size 100000 capacity 131072) 0.02 s
loop 29 - Erased 100000 elements (size 0 capacity 2) 0 s
2009-10-30 19:28:39 +01:00
Mark Olesen
2c73afb6ec HashTbl avoid backward search in erase()
- The ideas as discussed in email

- The speedup is really there.

Before
loop 0 - Erased 100000 elements:   3.82 s
loop 1 - Erased 100000 elements:   11.45 s
loop 2 - Erased 100000 elements:   19.46 s
loop 3 - Erased 100000 elements:   27.73 s
loop 4 - Erased 100000 elements:   38.74 s
^C

After
loop 0 - Erased 100000 elements (size 2900000 capacity 8388608) 0.01 s
loop 1 - Erased 100000 elements (size 2800000 capacity 8388608) 0 s
loop 2 - Erased 100000 elements (size 2700000 capacity 8388608) 0.01 s
loop 3 - Erased 100000 elements (size 2600000 capacity 8388608) 0 s
loop 4 - Erased 100000 elements (size 2500000 capacity 8388608) 0 s
loop 5 - Erased 100000 elements (size 2400000 capacity 8388608) 0 s
loop 6 - Erased 100000 elements (size 2300000 capacity 8388608) 0 s
loop 7 - Erased 100000 elements (size 2200000 capacity 8388608) 0 s
...
2009-10-30 18:54:51 +01:00