Commit graph

476 commits

Author SHA1 Message Date
Henrik Rusche
b1c20366d0 BUGFIX: Merge errors 2016-05-25 15:28:09 +02:00
Henrik Rusche
846b6a6c56 Final cumulative bug fix for 3.2. Author: Hrvoje Jasak. Merge: Hrvoje Jasak. 2016-05-25 14:49:11 +02:00
Henrik Rusche
591c495f63 BUGFIX: Merge errors 2016-05-25 14:46:38 +02:00
Hrvoje Jasak
72c51d3b25 Removed 2016-05-25 10:55:38 +01:00
Henrik Rusche
d56de58fbb Merged windows port changes to controlDict and options. Author Robert Kaeser. Merge: Henrik Rusche
Conflicts:
	tutorials/immersedBoundary/porousBumpChannelIb/system/controlDict
	tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options
2016-05-25 11:54:13 +02:00
Henrik Rusche
edfc2c8552 Extracted controlDicts and Make/option from f629df0\n. All test cases checked (Robert Keser) 2016-05-25 11:52:59 +02:00
Henrik Rusche
ec515b441f Merged vanilla compatibility branch. Author: Henrik Rusche, FSB team. Merge: Henrik Rusche
Conflicts:
	applications/solvers/incompressible/channelFoam/channelFoam.C
	applications/solvers/incompressible/icoFoam/icoFoam.C
	applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
	applications/solvers/incompressible/pimpleDyMFoam/UEqn.H
	applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C
	applications/solvers/incompressible/pimpleFoam/UEqn.H
	applications/solvers/incompressible/pimpleFoam/pEqn.H
	applications/solvers/incompressible/simpleFoam/UEqn.H
	applications/solvers/incompressible/simpleFoam/pEqn.H
	src/foam/fields/GeometricFields/GeometricTensorNFields/GeometricTensorNFields.H
	src/turbulenceModels/compressible/RAS/LRR/LRR.C
	src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
	src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
	src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
	src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
	src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
	src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
	src/turbulenceModels/incompressible/LES/laminar/laminar.C
	src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
	src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
	src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
	src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
	src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
	src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
	src/turbulenceModels/incompressible/RAS/coupledKEpsilon/coupledKEpsilon.C
	src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
	src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
	src/turbulenceModels/incompressible/RAS/laminar/laminar.C
	src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
	src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
	src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
	tutorials/basic/laplacianFoam/Case1.1_mixingPlane_sector_AB_60deg/system/fvSchemes
	tutorials/compressible/dbnsFoam/forwardStep/system/fvSchemes
	tutorials/compressible/dbnsFoam/shockTube/system/fvSchemes
	tutorials/compressible/dbnsTurbFoam/naca0012/system/fvSchemes
	tutorials/compressible/rhoPimpleFoam/angledDuct/system/fvSchemes
	tutorials/immersedBoundary/backwardStepShortTurbulentSimpleIbFoam/system/fvSchemes
	tutorials/immersedBoundary/pitzDailyBodyFitted/system/fvSchemes
	tutorials/immersedBoundary/pitzDailyLaminarSimpleIbFoam/system/fvSchemes
	tutorials/immersedBoundary/pitzDailyTurbulentSimpleIbFoam/system/fvSchemes
	tutorials/immersedBoundary/porousBumpChannelBodyFitted/system/fvSchemes
	tutorials/immersedBoundary/porousBumpChannelIb/system/fvSchemes
	tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/system/fvSchemes
	tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/system/fvSchemes
	tutorials/incompressible/boundaryFoam/boundaryTwoWallsFlowSolution/system/fvSchemes
	tutorials/incompressible/boundaryFoam/boundaryWallFunctions/system/fvSchemes
	tutorials/incompressible/channelFoam/channel395/system/fvSchemes
	tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary
	tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes
	tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
	tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution
	tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes
	tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
	tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
	tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
	tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
	tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary
	tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
	tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes
	tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
	tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/system/fvSchemes
	tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
	tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
	tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
	tutorials/incompressible/porousSimpleFoam/beaverJoseph/system/fvSchemes
	tutorials/incompressible/porousSimpleFoam/porousPlug/system/fvSchemes
	tutorials/incompressible/simpleFoam/mixingPlaneAxial/system/fvSchemes
	tutorials/incompressible/simpleFoam/mixingPlaneDomADomB/system/fvSchemes
	tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
	tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
	tutorials/incompressible/simpleFoam/pitzDaily3Blocks/system/fvSchemes
	tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
	tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes

Fixing compilation of DBNS
2016-05-25 10:31:13 +02:00
Henrik Rusche
9007084567 Merge Request #32: Runtime-selectable flux & limiters in DBNS. Author: Henrik Rusche. Merge: Henrik Rusche
https://sourceforge.net/p/foam-extend/foam-extend-3.2/merge-requests/32/
2016-05-24 13:42:54 +02:00
Henrik Rusche
b858c51ff2 Merge Request #30: Time consistent incompressible solvers. Author: Hrvoje Jasak. Merge: Henrik Rusche
https://sourceforge.net/p/foam-extend/foam-extend-3.2/merge-requests/30/

Conflicts:
	applications/solvers/incompressible/simpleFoam/pEqn.H
	applications/solvers/incompressible/simpleSRFFoam/simpleSRFFoam.C
	tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
	tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
2016-05-24 13:42:50 +02:00
Hrvoje Jasak
dec32f55f9 Pitching plate immersed boundary: new tutorial 2016-05-24 10:14:20 +01:00
Hrvoje Jasak
d3d1452ae2 Tutorial update 2016-05-24 10:06:36 +01:00
Henrik Rusche
6d43981296 FEAT: Runtime-selectable flux and limiter in DBNS 2016-05-14 13:57:15 +02:00
Hrvoje Jasak
ef813989d5 Formatting 2016-05-11 21:55:52 +01:00
Hrvoje Jasak
75272ad78f Moved cacheing control to solution for consistency 2016-05-11 21:55:22 +01:00
Hrvoje Jasak
7c7e4e416f Clean-up 2016-05-11 21:55:08 +01:00
Hrvoje Jasak
492b696626 Removed extra file 2016-05-11 21:52:20 +01:00
Hrvoje Jasak
27bf71183d Clean-up 2016-05-09 14:32:12 +01:00
Hrvoje Jasak
67ad357bbf Update of grad(U).T() syntax in fvSchemes 2016-05-09 13:37:48 +01:00
Hrvoje Jasak
2c479aea80 Update for alternative VOF flux update: rho solver 2016-05-09 13:36:18 +01:00
Hrvoje Jasak
efcedee058 Settings update 2016-05-09 12:41:36 +01:00
Hrvoje Jasak
9db10d0cd4 Formatting 2016-05-09 12:41:27 +01:00
Hrvoje Jasak
8cf4b6fcd5 Enable full gradient cacheing capability 2016-05-09 11:03:58 +01:00
Vanja Skuric
04d8d1b849 Backported rhoPimpleFoam, rhoPisoFoam and tutorials (vanilla OF 3.0.1) 2016-05-08 15:36:11 +02:00
Vanja Skuric
bb0cb435e5 Cleaned dbnsFoam, dbnsTurbFoam, rhoCentralFoam tutorials (backports) 2016-05-08 14:55:17 +02:00
Vanja Skuric
f609442e99 Backported dieselFoam, dieselEngineFoam, fireFoam, reactingFoam and tutorials (vanilla OF 3.0.1) 2016-05-08 11:28:13 +02:00
Vanja Skuric
53dcbea597 Backported XiFoam, engineFoam, coldEngineFoam and tutorials (vanilla OF 3.0.1) 2016-05-08 10:48:57 +02:00
Vanja Skuric
37964b360c Backported scalarTransportFoam and tutorials (vanilla OF 3.0.1) 2016-05-08 09:38:57 +02:00
Vanja Skuric
4ea9d1f3b8 Fixed PODSolver and potentialFoam tutorials (backports) 2016-05-08 09:29:03 +02:00
Vanja Skuric
30644bf3b0 Backported laplacianFoam and tutorials (vanilla OF 3.0.1) 2016-05-08 09:17:22 +02:00
Vanja Skuric
f698306f06 Fixed the rest of IB tutorials (backports) 2016-05-07 10:54:54 +02:00
Vanja Skuric
685dad16cb Fixed simpleFoam and simpleSRFFoam tutorials (backports) 2016-05-07 10:04:45 +02:00
Vanja Skuric
84d7091a52 Fixed MRFSimpleFoam and porousSimpleFoam tutorials (backports) 2016-05-07 08:58:44 +02:00
Vanja Skuric
a3a524dbe6 Fixed boundaryFoam tutorials (backports) 2016-05-07 08:14:14 +02:00
Vanja Skuric
802b13cacf Fixed tutorials for pimpleDyMFoam solver (backports) 2016-05-07 08:04:39 +02:00
Vanja Skuric
99fdf7833b Fixed channelFoam, nonNewtonianIcoFoam, pisoFoam and shallowWaterFoam tutorials 2016-05-06 15:20:34 +02:00
Vanja Skuric
ff283646df Removed fluxRequired from fvSchemes in icoIbFoam tutorials 2016-05-06 14:47:43 +02:00
Vanja Skuric
3f9d34ff1a Removed fluxRequired from fvSchemes in icoDyMFoam tutorials 2016-05-06 12:34:43 +02:00
Vanja Skuric
897213e27e Removed fluxRequired from fvSchemes in icoFoam tutorials 2016-05-06 12:26:39 +02:00
Vanja Skuric
8b1a4ee57e Fixed tutorials for icoDyMIbFoam and icoDyMIbFoam 2016-05-06 10:47:31 +02:00
Vanja Skuric
4ae909ab2b Small fixes to icoFoam tutorials 2016-05-06 07:26:55 +02:00
Vanja Skuric
69e2914b98 Fixed icoDyMFoam tutorials 2016-05-05 16:18:43 +02:00
Vanja Skuric
5d6e83b834 Fixed icoFoam tutorials 2016-05-05 14:50:06 +02:00
Hrvoje Jasak
c0fba6f3e2 Bugfix: Adujusted tutorial settings 2016-04-27 19:05:56 +01:00
Hrvoje Jasak
be97f7ebac Bugfix: adjust solid temperature relaxation 2016-04-27 19:03:14 +01:00
Hrvoje Jasak
89dd971095 New tutorial: solid cooled by fluid stream 2016-04-20 11:19:16 +01:00
Hrvoje Jasak
a946215a8d Bugfix: update of conjugate heat solvers and tutorial settings 2016-04-18 10:16:29 +01:00
Henrik Rusche
05e63d5084 Backport limited schemes format from vanilla 3.0.1 2016-04-15 22:44:26 +02:00
Hrvoje Jasak
d6aace1c36 Bugfix: corrected file format type to ascii 2016-04-14 18:48:18 +01:00
Hrvoje Jasak
1d4064f388 Formatting 2016-04-14 18:47:59 +01:00
Hrvoje Jasak
b3befd3ede Bugfix: added missing libs 2016-04-14 18:47:48 +01:00