From 2ae5333ef3629fad201245af991ec89337b2877d Mon Sep 17 00:00:00 2001 From: pkuLmq <1900011062@pku.edu.cn> Date: Mon, 19 Aug 2024 15:32:30 +0800 Subject: [PATCH 1/2] integrate lagrangian source term in dfLowMachFoam, modify examples and test --- applications/solvers/dfLowMachFoam/EEqn.H | 14 ++ .../solvers/dfLowMachFoam/Make/options | 24 ++ applications/solvers/dfLowMachFoam/UEqn.H | 3 + applications/solvers/dfLowMachFoam/YEqn.H | 4 +- .../solvers/dfLowMachFoam/createClouds.H | 9 + .../solvers/dfLowMachFoam/createFields.H | 6 + .../solvers/dfLowMachFoam/dfLowMachFoam.C | 21 ++ applications/solvers/dfLowMachFoam/rhoEqn.H | 2 + .../constant/sprayCloudProperties | 26 ++ .../fgm/twoD_SandiaD_flareFGM/constant/g | 22 ++ .../constant/sprayCloudProperties | 26 ++ .../notorch/threeD_aachenBomb/0/N2.gz | Bin 0 -> 338 bytes .../notorch/threeD_aachenBomb/0/O2.gz | Bin 0 -> 339 bytes .../notorch/threeD_aachenBomb/0/T.gz | Bin 0 -> 338 bytes .../notorch/threeD_aachenBomb/0/U.gz | Bin 0 -> 348 bytes .../notorch/threeD_aachenBomb/0/Ydefault.gz | Bin 0 -> 344 bytes .../notorch/threeD_aachenBomb/0/alphat.gz | Bin 0 -> 374 bytes .../notorch/threeD_aachenBomb/0/epsilon.gz | Bin 0 -> 368 bytes .../notorch/threeD_aachenBomb/0/k.gz | Bin 0 -> 359 bytes .../notorch/threeD_aachenBomb/0/nut.gz | Bin 0 -> 361 bytes .../notorch/threeD_aachenBomb/0/p.gz | Bin 0 -> 341 bytes .../notorch/threeD_aachenBomb/Allclean | 9 + .../notorch/threeD_aachenBomb/Allrun | 11 + .../notorch/threeD_aachenBomb/C7_oneStep.yaml | 1 + .../constant/CanteraTorchProperties | 51 ++++ .../constant/combustionProperties | 20 ++ .../notorch/threeD_aachenBomb/constant/g | 22 ++ .../constant/sprayCloudProperties | 234 ++++++++++++++++++ .../constant/thermophysicalProperties | 24 ++ .../constant/turbulenceProperties | 30 +++ .../threeD_aachenBomb/system/blockMeshDict | 57 +++++ .../threeD_aachenBomb/system/controlDict | 53 ++++ .../threeD_aachenBomb/system/decomposeParDict | 22 ++ .../threeD_aachenBomb/system/fvSchemes | 59 +++++ .../threeD_aachenBomb/system/fvSolution | 100 ++++++++ .../H2/cvodeIntegrator/constant/g | 22 ++ .../constant/sprayCloudProperties | 26 ++ .../notorch/twoD_HIT_flame/CH4/constant/g | 22 ++ .../CH4/constant/sprayCloudProperties | 26 ++ .../constant/sprayCloudProperties | 26 ++ .../notorch/twoD_reactingTGV/CH4/constant/g | 22 ++ .../CH4/constant/sprayCloudProperties | 26 ++ .../notorch/twoD_supercirticalTGV/constant/g | 22 ++ .../constant/sprayCloudProperties | 26 ++ .../twoD_sydneySprayBurner/0/C2H5OH.gz | Bin 0 -> 450 bytes .../notorch/twoD_sydneySprayBurner/0/CO2.gz | Bin 0 -> 447 bytes .../notorch/twoD_sydneySprayBurner/0/H2O.gz | Bin 0 -> 448 bytes .../notorch/twoD_sydneySprayBurner/0/N2.gz | Bin 0 -> 450 bytes .../notorch/twoD_sydneySprayBurner/0/O2.gz | Bin 0 -> 444 bytes .../notorch/twoD_sydneySprayBurner/0/T.gz | Bin 0 -> 449 bytes .../notorch/twoD_sydneySprayBurner/0/U.gz | Bin 0 -> 490 bytes .../twoD_sydneySprayBurner/0/Ydefault.gz | Bin 0 -> 441 bytes .../twoD_sydneySprayBurner/0/alphat.gz | Bin 0 -> 472 bytes .../twoD_sydneySprayBurner/0/epsilon.gz | Bin 0 -> 617 bytes .../notorch/twoD_sydneySprayBurner/0/k.gz | Bin 0 -> 532 bytes .../notorch/twoD_sydneySprayBurner/0/nut.gz | Bin 0 -> 496 bytes .../notorch/twoD_sydneySprayBurner/0/p.gz | Bin 0 -> 443 bytes .../notorch/twoD_sydneySprayBurner/Allclean | 9 + .../notorch/twoD_sydneySprayBurner/Allrun | 11 + .../constant/CanteraTorchProperties | 51 ++++ .../constant/combustionProperties | 27 ++ .../notorch/twoD_sydneySprayBurner/constant/g | 22 ++ .../constant/radiationProperties | 20 ++ .../constant/sprayCloudProperties | 193 +++++++++++++++ .../constant/thermophysicalProperties | 40 +++ .../constant/turbulenceProperties | 37 +++ .../twoD_sydneySprayBurner/ethanol66.yaml | 1 + .../system/blockMeshDict | 176 +++++++++++++ .../twoD_sydneySprayBurner/system/controlDict | 62 +++++ .../system/decomposeParDict | 35 +++ .../twoD_sydneySprayBurner/system/fvSchemes | 70 ++++++ .../twoD_sydneySprayBurner/system/fvSolution | 99 ++++++++ .../CH4/constant/g | 22 ++ .../CH4/constant/sprayCloudProperties | 26 ++ .../notorch/twoD_tripleFlame/H2/constant/g | 22 ++ .../H2/constant/sprayCloudProperties | 26 ++ test/CMakeLists.txt | 1 + test/Tu500K-Phi1/constant/g | 22 ++ .../Tu500K-Phi1/constant/sprayCloudProperties | 26 ++ test/aachenBomb_2D/0/N2 | 33 +++ test/aachenBomb_2D/0/O2 | 33 +++ test/aachenBomb_2D/0/T | 33 +++ test/aachenBomb_2D/0/U | 34 +++ test/aachenBomb_2D/0/Ydefault | 33 +++ test/aachenBomb_2D/0/alphat | 36 +++ test/aachenBomb_2D/0/epsilon | 36 +++ test/aachenBomb_2D/0/k | 36 +++ test/aachenBomb_2D/0/nut | 36 +++ test/aachenBomb_2D/0/p | 33 +++ test/aachenBomb_2D/Allclean | 13 + test/aachenBomb_2D/Allrun | 14 ++ test/aachenBomb_2D/C7_oneStep.yaml | 113 +++++++++ .../constant/CanteraTorchProperties | 51 ++++ .../constant/combustionProperties | 20 ++ test/aachenBomb_2D/constant/g | 22 ++ .../constant/sprayCloudProperties | 234 ++++++++++++++++++ .../constant/thermophysicalProperties | 24 ++ .../constant/turbulenceProperties | 30 +++ test/aachenBomb_2D/system/blockMeshDict | 68 +++++ test/aachenBomb_2D/system/controlDict | 56 +++++ test/aachenBomb_2D/system/decomposeParDict | 22 ++ test/aachenBomb_2D/system/fvSchemes | 59 +++++ test/aachenBomb_2D/system/fvSolution | 100 ++++++++ test/aachenBomb_2D/system/sample | 38 +++ test/corrtest.cpp | 39 +++ .../H2/cvodeSolver/constant/g | 22 ++ .../cvodeSolver/constant/sprayCloudProperties | 26 ++ 107 files changed, 3358 insertions(+), 2 deletions(-) create mode 100644 applications/solvers/dfLowMachFoam/createClouds.H create mode 100644 examples/dfLowMachFoam/fgm/twoD_SandiaD_DeePFGM/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/g create mode 100644 examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/N2.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/O2.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/T.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/U.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/Ydefault.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/alphat.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/epsilon.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/k.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/nut.gz create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/p.gz create mode 100755 examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allclean create mode 100755 examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allrun create mode 120000 examples/dfLowMachFoam/notorch/threeD_aachenBomb/C7_oneStep.yaml create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/CanteraTorchProperties create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/combustionProperties create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/g create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/thermophysicalProperties create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/turbulenceProperties create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/blockMeshDict create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/controlDict create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/decomposeParDict create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSchemes create mode 100644 examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSolution create mode 100644 examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/g create mode 100644 examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/g create mode 100644 examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_SandiaD_EDC_Trans/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/g create mode 100644 examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/g create mode 100644 examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/C2H5OH.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/CO2.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/H2O.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/N2.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/O2.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/T.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/U.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/Ydefault.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/alphat.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/epsilon.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/k.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/nut.gz create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/p.gz create mode 100755 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/Allclean create mode 100755 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/Allrun create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/constant/CanteraTorchProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/constant/combustionProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/constant/g create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/constant/radiationProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/constant/thermophysicalProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/constant/turbulenceProperties create mode 120000 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/ethanol66.yaml create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/system/blockMeshDict create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/system/controlDict create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/system/decomposeParDict create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/system/fvSchemes create mode 100644 examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/system/fvSolution create mode 100644 examples/dfLowMachFoam/notorch/twoD_temporally_evolving_jet/CH4/constant/g create mode 100644 examples/dfLowMachFoam/notorch/twoD_temporally_evolving_jet/CH4/constant/sprayCloudProperties create mode 100644 examples/dfLowMachFoam/notorch/twoD_tripleFlame/H2/constant/g create mode 100644 examples/dfLowMachFoam/notorch/twoD_tripleFlame/H2/constant/sprayCloudProperties create mode 100644 test/Tu500K-Phi1/constant/g create mode 100644 test/Tu500K-Phi1/constant/sprayCloudProperties create mode 100644 test/aachenBomb_2D/0/N2 create mode 100644 test/aachenBomb_2D/0/O2 create mode 100644 test/aachenBomb_2D/0/T create mode 100644 test/aachenBomb_2D/0/U create mode 100644 test/aachenBomb_2D/0/Ydefault create mode 100644 test/aachenBomb_2D/0/alphat create mode 100644 test/aachenBomb_2D/0/epsilon create mode 100644 test/aachenBomb_2D/0/k create mode 100644 test/aachenBomb_2D/0/nut create mode 100644 test/aachenBomb_2D/0/p create mode 100755 test/aachenBomb_2D/Allclean create mode 100755 test/aachenBomb_2D/Allrun create mode 100644 test/aachenBomb_2D/C7_oneStep.yaml create mode 100644 test/aachenBomb_2D/constant/CanteraTorchProperties create mode 100644 test/aachenBomb_2D/constant/combustionProperties create mode 100644 test/aachenBomb_2D/constant/g create mode 100644 test/aachenBomb_2D/constant/sprayCloudProperties create mode 100644 test/aachenBomb_2D/constant/thermophysicalProperties create mode 100644 test/aachenBomb_2D/constant/turbulenceProperties create mode 100644 test/aachenBomb_2D/system/blockMeshDict create mode 100644 test/aachenBomb_2D/system/controlDict create mode 100644 test/aachenBomb_2D/system/decomposeParDict create mode 100644 test/aachenBomb_2D/system/fvSchemes create mode 100644 test/aachenBomb_2D/system/fvSolution create mode 100644 test/aachenBomb_2D/system/sample create mode 100644 test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/g create mode 100644 test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/sprayCloudProperties diff --git a/applications/solvers/dfLowMachFoam/EEqn.H b/applications/solvers/dfLowMachFoam/EEqn.H index f8fc95351..0238a15a6 100644 --- a/applications/solvers/dfLowMachFoam/EEqn.H +++ b/applications/solvers/dfLowMachFoam/EEqn.H @@ -1,5 +1,13 @@ { volScalarField& he = thermo.he(); + tmp thcSource(new fvScalarMatrix(he, dimEnergy/dimTime)); + fvScalarMatrix& hcSource = thcSource.ref(); + forAll(Y, i) + { + hcSource.source() -= parcels.rhoTrans(i)*chemistry->mixture().Hc(i)/runTime.deltaT(); + } + //hSource.source() -= parcels.hsTrans()/runTime.deltaT();// equivalent to parcels.Sh(he) + start1 = std::clock(); fvScalarMatrix EEqn ( @@ -15,10 +23,16 @@ fvm::laplacian(turbulence->alpha(), he) - diffAlphaD + fvc::div(hDiffCorrFlux) + + rho*(U&g) + + parcels.Sh(he) + + hcSource ) : ( fvm::laplacian(turbulence->alphaEff(), he) + + rho*(U&g) + + parcels.Sh(he) + + hcSource ) ) ); diff --git a/applications/solvers/dfLowMachFoam/Make/options b/applications/solvers/dfLowMachFoam/Make/options index a0dc9ba1c..49835a766 100644 --- a/applications/solvers/dfLowMachFoam/Make/options +++ b/applications/solvers/dfLowMachFoam/Make/options @@ -6,18 +6,33 @@ EXE_INC = -std=c++14 \ -Wno-unused-variable \ -Wno-unused-but-set-variable \ -Wno-old-style-cast \ + -I. \ $(PFLAGS) $(PINC) \ $(if $(LIBTORCH_ROOT),-DUSE_LIBTORCH,) \ $(if $(PYTHON_INC_DIR),-DUSE_PYTORCH,) \ + -I$(FOAM_APP)/solvers/lagrangian/reactingParcelFoam \ + -I$(FOAM_APP)/solvers/compressible/rhoPimpleFoam \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(FOAM_APP)/solvers/lagrangian/reactingParcelFoam \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ + -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ + -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(DF_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(DF_SRC)/lagrangian/spray/lnInclude \ + -I$(LIB_SRC)/lagrangian/spray/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(DF_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ + -I$(DF_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/Pstream/mpi \ -I$(DF_SRC)/dfCanteraMixture/lnInclude \ -I$(DF_SRC)/dfChemistryModel/lnInclude \ @@ -35,12 +50,21 @@ EXE_INC = -std=c++14 \ EXE_LIBS = \ -lcompressibleTransportModels \ -lturbulenceModels \ + -llagrangian \ + -lregionModels \ + -ldfSurfaceFilmModels \ -lfiniteVolume \ + -ltopoChangerFvMesh \ -lmeshTools \ -lsampling \ -L$(DF_LIBBIN) \ -ldfFluidThermophysicalModels \ -ldfCompressibleTurbulenceModels \ + -ldfThermophysicalProperties \ + -ldfSLGThermo \ + -ldfLagrangianIntermediate \ + -ldfLagrangianTurbulence \ + -ldfLagrangianSpray \ -ldfCanteraMixture \ -ldfChemistryModel \ -ldfCombustionModels \ diff --git a/applications/solvers/dfLowMachFoam/UEqn.H b/applications/solvers/dfLowMachFoam/UEqn.H index 23a9bc7ba..d269c5582 100644 --- a/applications/solvers/dfLowMachFoam/UEqn.H +++ b/applications/solvers/dfLowMachFoam/UEqn.H @@ -4,6 +4,9 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + turbulence->divDevRhoReff(U) + == + rho()*g + + parcels.SU(U) ); fvVectorMatrix& UEqn = tUEqn.ref(); end1 = std::clock(); diff --git a/applications/solvers/dfLowMachFoam/YEqn.H b/applications/solvers/dfLowMachFoam/YEqn.H index a80452998..6203bbef9 100644 --- a/applications/solvers/dfLowMachFoam/YEqn.H +++ b/applications/solvers/dfLowMachFoam/YEqn.H @@ -107,8 +107,8 @@ == ( splitting - ? fvm::laplacian(DEff(), Yi) - : (fvm::laplacian(DEff(), Yi) + combustion->R(Yi)) + ? (fvm::laplacian(DEff(), Yi) + parcels.SYi(i, Yi) ) + : (fvm::laplacian(DEff(), Yi) + parcels.SYi(i, Yi) + combustion->R(Yi)) ) ); diff --git a/applications/solvers/dfLowMachFoam/createClouds.H b/applications/solvers/dfLowMachFoam/createClouds.H new file mode 100644 index 000000000..ee0985ff7 --- /dev/null +++ b/applications/solvers/dfLowMachFoam/createClouds.H @@ -0,0 +1,9 @@ +Info<< "\nConstructing reacting cloud" << endl; +basicSprayCloud parcels +( + "sprayCloud", + rho, + U, + g, + slgThermo +); diff --git a/applications/solvers/dfLowMachFoam/createFields.H b/applications/solvers/dfLowMachFoam/createFields.H index 42214ea22..444882e72 100644 --- a/applications/solvers/dfLowMachFoam/createFields.H +++ b/applications/solvers/dfLowMachFoam/createFields.H @@ -1,4 +1,5 @@ #include "createRDeltaT.H" +#include "readGravitationalAcceleration.H" Info<< "Reading thermophysical properties\n" << endl; @@ -7,6 +8,8 @@ fluidThermo* pThermo = new heRhoThermo(mesh, word::nu fluidThermo& thermo = *pThermo; // thermo.validate(args.executable(), "ha"); +SLGThermo slgThermo(mesh, thermo); + const volScalarField& psi = thermo.psi(); volScalarField& p = thermo.p(); volScalarField& T = thermo.T(); @@ -115,6 +118,9 @@ volScalarField K("K", 0.5*magSqr(U)); multivariateSurfaceInterpolationScheme::fieldTable fields; +#include "createMRF.H" +#include "createClouds.H" + if(combModelName!="ESF" && combModelName!="flareFGM" && combModelName!="DeePFGM" && combModelName!="FSD") { forAll(Y, i) diff --git a/applications/solvers/dfLowMachFoam/dfLowMachFoam.C b/applications/solvers/dfLowMachFoam/dfLowMachFoam.C index 590836ce0..b0bbd3288 100644 --- a/applications/solvers/dfLowMachFoam/dfLowMachFoam.C +++ b/applications/solvers/dfLowMachFoam/dfLowMachFoam.C @@ -64,6 +64,9 @@ Description #include "basicThermo.H" #include "CombustionModel.H" +#include "basicSprayCloud.H" +#include "SLGThermo.H" + //#define GPUSolver_ // #define TIME // #define DEBUG_ @@ -153,6 +156,7 @@ int main(int argc, char *argv[]) double time_monitor_Y = 0; double time_monitor_E = 0; double time_monitor_p = 0; + double time_monitor_parcels=0; double time_monitor_chemistry_correctThermo = 0; double time_monitor_turbulence_correct = 0; double time_monitor_chem = 0; // combustion correct @@ -261,6 +265,19 @@ int main(int argc, char *argv[]) runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; + + if (parcels.solution().active()) + { + start = std::clock(); + + // Store the particle positions + parcels.storeGlobalPositions(); + + parcels.evolve(); + + end = std::clock(); + time_monitor_parcels += double(end - start) / double(CLOCKS_PER_SEC); + } // store old time fields #ifdef GPUSolver_ @@ -522,6 +539,10 @@ int main(int argc, char *argv[]) Info<< "Y Equations = " << time_monitor_Y - time_monitor_chem << " s" << endl; Info<< "E Equations = " << time_monitor_E << " s" << endl; Info<< "p Equations = " << time_monitor_p << " s" << endl; + if (parcels.solution().active()) + { + Info<< "calculate parcels = " << time_monitor_parcels << " s" << endl; + } Info<< "chemistry correctThermo = " << time_monitor_chemistry_correctThermo << " s" << endl; Info<< "turbulence correct = " << time_monitor_turbulence_correct << " s" << endl; Info<< "combustion correct(in Y) = " << time_monitor_chem << " s" << endl; diff --git a/applications/solvers/dfLowMachFoam/rhoEqn.H b/applications/solvers/dfLowMachFoam/rhoEqn.H index 7f7d7c15b..65f119319 100644 --- a/applications/solvers/dfLowMachFoam/rhoEqn.H +++ b/applications/solvers/dfLowMachFoam/rhoEqn.H @@ -34,6 +34,8 @@ Description ( fvm::ddt(rho) + fvc::div(phi) + == + parcels.Srho(rho) ); end1 = std::clock(); time_monitor_rhoEqn += double(end1 - start1) / double(CLOCKS_PER_SEC); diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_DeePFGM/constant/sprayCloudProperties b/examples/dfLowMachFoam/fgm/twoD_SandiaD_DeePFGM/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/examples/dfLowMachFoam/fgm/twoD_SandiaD_DeePFGM/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/g b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/sprayCloudProperties b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/examples/dfLowMachFoam/fgm/twoD_SandiaD_flareFGM/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/N2.gz b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/N2.gz new file mode 100644 index 0000000000000000000000000000000000000000..8b0f6005f270d1e6ca233a074e029ea774371f2e GIT binary patch literal 338 zcmV-Y0j>TYiwFo>W-?;{15Ppktx~aW!Y~ls{S`L{1tSKKKpha3J5dHuJ2V}fGTKM-mc2E%u3_LHk@7=q1XVWCTf+U4`uLtQ>qNipA;Nb+g#KA|iEbb`)1A(&q zkHWG>#g?oB(W{tL=nR z?R7SqSAA_h+T@Vk=E4kAd2SD0&{!|!lgEMSseuR!;7Zhu>?$2dcEdDoMnVbm2APmZ zena71G!kkL`-5q?+-OsA7rk;@2obLf$*t{L*lD>cxa5Ylqm6N$e`3+4JrAekNGOHm zUI0o7DMf{)7hvv=?I57eO+EHVQC0L)99$p8QV literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/O2.gz b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/O2.gz new file mode 100644 index 0000000000000000000000000000000000000000..9d47ae21aab137c100c77cea30c69cf401d21b15 GIT binary patch literal 339 zcmV-Z0j&NXiwFo>W-?;{15Yvltx~aW!Y~ls{S`L{1tVIi5~u^Bawn7l)DBGtCpn5M z$Bt}=mKOfKjvZ9Q0t3&B?R)p`-PtrrFCa-_J{UlHk?5&80eCzD&awB=Jdb+{z(Am^ z{-cmJs8}{zOklOaaDt_7O^GmPPq5Nj7W&(3^depYGHB3nC$#D{Ua_#k;RImgTw^Dc zYOk}_ydG-v(ItoME*EB?s#AOLg2s9&pZpM*o*Ia-0Io#S%D&Q` zTLCB~q!Kl%&hXKP$J+=_*87wYp&S~;B|CZcR*9}H7!AjF_nuSeR#n{W0;eCw7njn8 lT|9Siy9Up{*AE)~YTYiwFo>W-?;{15^O5Qax|NFcjSVE8ZLgPP?=MbwE_^gcv~W&~$K;M{#BB z$aZLH;lI}(K_C_wxJZ#d?%lh43C;Q!ko95G>p}k_(NhZo@N@v2W9M&+BCRO^1A($W z-omUw#b)E_5Ed(pJDBU%R0tFH3=6GgseimiC*mbw1`QhSgjSu#8QqYGDkjKD7t0Xsnm=#Sf9`sgVd%;7T;D>^kj8am6&QMn(zq2APmZ z{$k@zG7@{=5AsnwTxzrCE_vm)5+WT}l3UwF*l0Pgxa5X~(WZM{eqq&>EkOS$(x>dmwM0|l-6ATI*|0DF|4W-?;{162U6Qax|NFc97SD{gFqf}u+#q7I148)7J>L({=Yj^fJL zk>gNM;lI}(X^ZFp1J8@^?%liROK6gwL6X9x*Msyd(NS{(@bCjT#okr(Jl-h)1A(&o ztHP{C#b)E_2<9sc5j^SEln4{{2y?Avp|?(>6LAtSgBlIDLaR>W1&c;l909DXt(y_0 z+UYDcU-z|n_syZ(_re%db!-n7Xc{Nwn(qVCQ3DaCz?G<5*-hG${DN&kqP!TxzrCHhSevDMU<{k~dBFgpHO9EUh-ouQt|o@!?Xj{+y8mp%jv9 z0VpM;5^Gf6?~e_K*8vP69l{`>EE>fnJNoRc68>3m6Ii#7Rp?e#-0T9YTgNAt uvI(~sd)Qr#r$5+IY_VE!*<$v~+xYN=_iw6C9^7iKzMF5Jp-p&S0{{Tjf~fWY literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/Ydefault.gz b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/Ydefault.gz new file mode 100644 index 0000000000000000000000000000000000000000..8000cee238741495693cf4c733b2edaed8689526 GIT binary patch literal 344 zcmV-e0jK^SiwFo>W-?;{16gEcW?^+~bO5bVv2MaJ5Z(P1HwS@Hmr9@xh{~N11E^Ki zbhso(ab@htc4%qg-|N^xMJzDzyx6|Gcki9ev;GBSeVF!o(7%`%Qga6Ia0HxVAEJ4l z_8dTfBvt)KVP2CK^T})k%QeLlEKFldf~k0fr7@~7-+`ke2^27gnk;&0bjR^Rg_E8} z0Bi4SH{#p`o|VDPz}SzrI99i{Facei%7bUJE>MNy`U$uB=)`=49D?uW$Xrh(u%H>GF_Jno$D-Yjarnb(291nDQ=2SD!a1R zidNVtKV}EUIb^p2aL!mIH>6wHM>PR&LpWLQW5%TRWHl;r^7xIGtvLurSz#Joq20xJ qH;yk<%EetexA41~&Og`>S@UGElB9hye+Wiz?(`33Y~l1Y0{{TR(xa9D literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/alphat.gz b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/alphat.gz new file mode 100644 index 0000000000000000000000000000000000000000..10e23cc04c8395606ce187b238ed84e19936da9b GIT binary patch literal 374 zcmV-+0g3(}iwFo>W-?;{17U1%Xkl~!tx`R2!Y~ls{VPt4L8)n%N(+*6>aa7e)r&j_E?yKY=+~(3)99?Iq+ksbfuvX7CQW`{8af4Z*F_Ewyphic6{wFO@9Gx1)B7P6%VjZgwz6sNpS>ew8%f>pkS*PU3l+BE+R-T2evMcjzVetAbk_ zRjQYb+ce~oIGz>% literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/epsilon.gz b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/epsilon.gz new file mode 100644 index 0000000000000000000000000000000000000000..d1307e06ac8fb673101b6cfa96ed3e8bfd3d026c GIT binary patch literal 368 zcmV-$0gwJ4iwFo>W-?;{17&b?X>4z90IgCzZ^AGT-Tf<0j6uN>9jX#_Kvdok1E>s5 z2PZMbm9Zl`p+$xNUVjy$E--Lje7<+@?mZbN>6J)Qm<@-JUIkicfdHQW0{+L*R*NFs zF#rM1M185kqG6IOrt=A`w#;X+RGqFE%*YF@loF--wj7bfQosTlrfJKSj2vrL8s4%A zz_x80Gr?F{o{gfrk}5Mn1ZbP>%lA2#!}hlM~}2n4}>{T$(v5ZNk>%N;Kt37 zU_|VKgbRj#{NR09#Lpg&vfMvzl-|)c>{@b3^&z}hf*KPw?3GwnR8UQvx1lanb#`cw z4Z@=;KUo#YSYxx#AVC0q=Lln&`Iv3 z!jsjFO4Z5QO7+F)&KDKJ_*=+bw1W-?;{18V@SQax|NFc97SD^83-!6{26q7I148$v3m3{3|oF~!BP zQzxNCh5ufEl}24);Cb=+-o3kfGLGU4h+>!xhY(*R8fu0B9)1D;aWvU1^LGqDfHP74 zWnob>Nfy)j1Xf$-B3PgLJ#Lh)XzORqxup8w-wQ#TChV|RVp&i@HL>3Myimp2p+Pe6k1Bs> zMG)Ji=!7ta=w=6Fgi2m9X}1Woy(BP(cnpa@uPH)YwoFSZNcaeyW-?;{18#M60IgCzZ^AGT-Tf<0j6uOEOC_QXh{_vc0F|NX;3THF zHFo4Uw5agk>#su81qRNG&-d=#y(i-&y%I?Zv*8fZt3V4a5Wv%4!2dYfYEgtc1|Yzh zs4rDmG)$7kbUuOAmiY{ps?!yN8F_}4QleDfmLrl_3RpnHG&Nkw$gyT+%MF_VY>jE! z3C7CuY!uy%lzw;3zT5S}6lC3B4_=sVEtPG4^hgW!K$ruSyy--obVS7sZrmIRM#L^i zxM1kV58j7G{Os{4%l+d<=^Zs;*OE)B58=HMv~8n?y%Nic3aW|oHq?cx&JGQ-L3mW< z2dg5P>`abM2xCa@b}&Y$<~t^xj=0@x24hGcAPeU$M~F+qw4{Q>uh2>EWP+89O4Z5Q zs`RyJ%oi1+^|z3_Fo%ZqznPWuxwbgc$;#=@&&WL$T_4(;=F*cj0eKtl70!lVE9B`y HVgmpG@shG$ literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/p.gz b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/0/p.gz new file mode 100644 index 0000000000000000000000000000000000000000..33aac7d27029d9b855e099e8aa49961ce34a3dd8 GIT binary patch literal 341 zcmV-b0jmBViwFo>W-?;{18@MXQn7BrFc97S6*mV3Q>3<1PzOZiPACJY9hweKauip_ zj%23|bazIX55okNrK43ZRPg8`&xiJn>zfQKXCKlVOa6md@h7zmX0 zUlj5N70ajd43=vQCs^p#R0uQn2urPHslU8NFXAO2hXxIILaScm1xqU&W&msF8k!_g#MuC&>37rk;@2@$U=$*t{M*lM|`xa5X)qm6N0eqhz7H4}0mltOYX z0HuV~VuPyld$i&4dIPCnV;IHnZ9<4p4vpfHoxFRiMAsMG;$U>=Ii+q@&CM=w`e}S} nDQ(!ra|gF;@busMMx&n$uLUX>`#$(quion~%1cWfF9QGo7a*M^ literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allclean b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allclean new file mode 100755 index 000000000..2cd9e2246 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allclean @@ -0,0 +1,9 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + +echo "Cleaning log.*" +rm log.* +echo "Cleaning processor*" +rm -r processor* +echo "Cleaning polyMesh/" +rm -r constant/polyMesh diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allrun b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allrun new file mode 100755 index 000000000..0a0119f71 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/Allrun @@ -0,0 +1,11 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +application=dfSprayFoam + +runApplication blockMesh +runApplication decomposePar +runApplication mpirun -np 4 --allow-run-as-root $application -parallel diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/C7_oneStep.yaml b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/C7_oneStep.yaml new file mode 120000 index 000000000..c1698cb6c --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/C7_oneStep.yaml @@ -0,0 +1 @@ +../../../mechanisms/C7H16/C7_oneStep.yaml \ No newline at end of file diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/CanteraTorchProperties b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/CanteraTorchProperties new file mode 100644 index 000000000..9ffa283cf --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/CanteraTorchProperties @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object CanteraTorchProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +chemistry on; + +CanteraMechanismFile "C7_oneStep.yaml"; + +transportModel "Mix"; + +odeCoeffs +{ + "relTol" 1e-6; + "absTol" 1e-10; +} + +inertSpecie "N2"; + +splittingStrategy off; + +TorchSettings +{ + torch off; + GPU off; + log off; + torchModel ""; + coresPerNode 4; +} + +loadbalancing +{ + active true; + log false; + algorithm allAverage;//headTail; +} + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/combustionProperties b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/combustionProperties new file mode 100644 index 000000000..7418500d0 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/combustionProperties @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object combustionProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +combustionModel laminar; + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/g b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/sprayCloudProperties b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/sprayCloudProperties new file mode 100644 index 000000000..505d69eb0 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/sprayCloudProperties @@ -0,0 +1,234 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active true; + coupled true; + transient yes; + cellValueSourceCorrection on; + maxCo 0.3; + + sourceTerms + { + schemes + { + rho explicit 1; + U explicit 1; + Yi explicit 1; + h explicit 1; + radiation explicit 1; + } + } + + interpolationSchemes + { + rho cell; + U cellPoint; + thermo:mu cell; + T cell; + Cp cell; + kappa cell; + p cell; + } + + integrationSchemes + { + U Euler; + T analytical; + } +} + + +constantProperties +{ + T0 320; + + // place holders for rho0 and Cp0 + // - reset from liquid properties using T0 + rho0 1000; + Cp0 4187; + + constantVolume false; +} + + +subModels +{ + particleForces + { + sphereDrag; + } + + injectionModels + { + model1 + { + type coneInjection; + SOI 0; + massTotal 6.0e-6; + parcelBasisType mass; + injectionMethod disc; + flowType flowRateAndDischarge; + dInner 0; + dOuter 1.9e-4; + duration 1.25e-3; + position (0 0.0995 0); + direction (0 -1 0); + parcelsPerSecond 20000000; + flowRateProfile table + ( + (0 0.1272) + (4.16667e-05 6.1634) + (8.33333e-05 9.4778) + (0.000125 9.5806) + (0.000166667 9.4184) + (0.000208333 9.0926) + (0.00025 8.7011) + (0.000291667 8.2239) + (0.000333333 8.0401) + (0.000375 8.8450) + (0.000416667 8.9174) + (0.000458333 8.8688) + (0.0005 8.8882) + (0.000541667 8.6923) + (0.000583333 8.0014) + (0.000625 7.2582) + (0.000666667 7.2757) + (0.000708333 6.9680) + (0.00075 6.7608) + (0.000791667 6.6502) + (0.000833333 6.7695) + (0.000875 5.5774) + (0.000916667 4.8649) + (0.000958333 5.0805) + (0.001 4.9547) + (0.00104167 4.5613) + (0.00108333 4.4536) + (0.001125 5.2651) + (0.00116667 5.2560) + (0.00120833 5.1737) + (0.00125 3.9213) + (0.001251 0.0000) + (1000 0.0000) + ); + + Cd constant 0.9; + + thetaInner constant 0.0; + thetaOuter constant 10.0; + + sizeDistribution + { + type RosinRammler; + + RosinRammlerDistribution + { + minValue 1e-06; + maxValue 0.00015; + d 0.00015; + n 3; + } + } + } + } + + dispersionModel none; + + patchInteractionModel standardWallInteraction; + + heatTransferModel RanzMarshall; + + compositionModel singlePhaseMixture; + + phaseChangeModel liquidEvaporationBoil; + + surfaceFilmModel none; + + atomizationModel none; + + breakupModel ReitzDiwakar; // ReitzKHRT; + + stochasticCollisionModel none; + + radiation off; + + standardWallInteractionCoeffs + { + type rebound; + } + + RanzMarshallCoeffs + { + BirdCorrection true; + } + + singlePhaseMixtureCoeffs + { + phases + ( + liquid + { + C7H16 1; + } + ); + } + + liquidEvaporationBoilCoeffs + { + enthalpyTransfer enthalpyDifference; + + activeLiquids ( C7H16 ); + } + + ReitzDiwakarCoeffs + { + solveOscillationEq yes; + Cbag 6; + Cb 0.785; + Cstrip 0.5; + Cs 10; + } + +/* + ReitzKHRTCoeffs + { + solveOscillationEq yes; + B0 0.61; + B1 40; + Ctau 1; + CRT 0.1; + msLimit 0.2; + WeberLimit 6; + } +*/ + TABCoeffs + { + y0 0; + yDot0 0; + Cmu 10; + Comega 8; + WeCrit 12; + } +} + + +cloudFunctions +{} + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/thermophysicalProperties b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/thermophysicalProperties new file mode 100644 index 000000000..06be802bb --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/thermophysicalProperties @@ -0,0 +1,24 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +liquids +{ + C7H16; +} + +solids +{} +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/turbulenceProperties b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/turbulenceProperties new file mode 100644 index 000000000..762189e6a --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/constant/turbulenceProperties @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + RASModel kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/blockMeshDict b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/blockMeshDict new file mode 100644 index 000000000..b7bfbe91a --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/blockMeshDict @@ -0,0 +1,57 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 0.001; + +vertices +( + (-10 0 -10) + (-10 0 10) + (10 0 10) + (10 0 -10) + (-10 100 -10) + (-10 100 10) + (10 100 10) + (10 100 -10) +); + +blocks +( + hex (0 1 2 3 4 5 6 7) (41 41 100) simpleGrading (1 1 1) +); + +edges +( +); + +patches +( + wall walls + ( + (2 6 5 1) + (0 4 7 3) + (0 1 5 4) + (4 5 6 7) + (7 6 2 3) + (3 2 1 0) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/controlDict b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/controlDict new file mode 100644 index 000000000..d646345d5 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/controlDict @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application sprayFoam; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 1e-4; + +deltaT 2.5e-06; + +writeControl adjustableRunTime; + +writeInterval 1e-03; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression on; + +timeFormat general; + +timePrecision 6; + +adjustTimeStep yes; + +maxCo 0.1; + +runTimeModifiable yes; + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/decomposeParDict b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/decomposeParDict new file mode 100644 index 000000000..aa67a0627 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/decomposeParDict @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object decomposeParDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +numberOfSubdomains 4; + +method scotch; + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSchemes b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSchemes new file mode 100644 index 000000000..dd991a49b --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSchemes @@ -0,0 +1,59 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; + + div(phi,U) Gauss upwind; + div(phid,p) Gauss upwind; + div(phi,K) Gauss linear; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(U) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; + div(phi,Yi_h) Gauss upwind; + div(hDiffCorrFlux) Gauss cubic; +} + +laplacianSchemes +{ + default Gauss linear orthogonal; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default orthogonal; +} + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSolution b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSolution new file mode 100644 index 000000000..5790575b0 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_aachenBomb/system/fvSolution @@ -0,0 +1,100 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0.1; + } + + + rhoFinal + { + $rho; + tolerance 1e-05; + relTol 0; + } + + "(U|k|epsilon)" + { + solver smoothSolver; + smoother symGaussSeidel; + tolerance 1e-06; + relTol 0.1; + } + + p + { + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + } + + pFinal + { + $p; + tolerance 1e-06; + relTol 0; + } + + "(U|k|epsilon)Final" + { + $U; + tolerance 1e-06; + relTol 0; + } + + "(ha|Yi|O2|N2|H2O)" + { + solver PBiCGStab; + preconditioner DILU; + tolerance 1e-6; + relTol 0.1; + } + + "(ha|Yi|O2|N2|H2O)Final" + { + $Yi; + relTol 0; + } + + + +} + +PIMPLE +{ + transonic no; + nCorrectors 2; + nNonOrthogonalCorrectors 0; + momentumPredictor yes; +} + +relaxationFactors +{ + equations + { + ".*" 1; + } +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/g b/examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/sprayCloudProperties b/examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/threeD_reactingTGV/H2/cvodeIntegrator/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/g b/examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/sprayCloudProperties b/examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/twoD_HIT_flame/CH4/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_SandiaD_EDC_Trans/constant/sprayCloudProperties b/examples/dfLowMachFoam/notorch/twoD_SandiaD_EDC_Trans/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/twoD_SandiaD_EDC_Trans/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/g b/examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/sprayCloudProperties b/examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/twoD_reactingTGV/CH4/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/g b/examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/sprayCloudProperties b/examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/examples/dfLowMachFoam/notorch/twoD_supercirticalTGV/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // diff --git a/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/C2H5OH.gz b/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/C2H5OH.gz new file mode 100644 index 0000000000000000000000000000000000000000..5fda47883ffb2004a17c036dbb2e46d6ffc06b26 GIT binary patch literal 450 zcmV;z0X_a7iwFqROmkxZ14A-MHBU$YwUb|O+At8n-~B00eFQ`60gZ<#+$=s5j`4-T-F(J`6e?E7v94!p%zG6BK`?4&DyKILUt^dWVfF1{P;9BNRH7TCb zzvU5QJ6d`Xi;1sesgV6oeQ3SoSttetl$TjM^kS4!xBWSIM31d=QG@7fp zxq(j0x=g4_W+^!>xOwqsO=F~1Xk&-UYr$5FeaW#sp_P0_anF^*$=+vEt1X{>tl{YD zy6N#N^PiF{l{i~SfgOQ7Q)&KN0CKj9aB2ru shP0h(am%xxk2w_`oD#(o{vDw4={<4-e?#P)8VH$sf8IelqZHLzYD;y+{qv2MP zZg}@-ipm=SBRT!8TyBG||KDZ#WbjApzQ-Z7*3+0VsVy4KRor}m zPRqJYs9I(zIW4$(_h-#uq*iEShst{)R-1j#v3)}e`G(@2D~IE4&Z>4>Ia{sGfIpaj zlw7IA*+L5JQ2B+1t_>FwwcSI^Tzd5TzRmAakv(aj7sGv(i8QCw_(Oo4trU(O!orZY p6D_{-?DaXPqJvYSc)`B|G`{=~phEcn;Z#=t51$?YQ_B?w0031G*3AF_ literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/H2O.gz b/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/H2O.gz new file mode 100644 index 0000000000000000000000000000000000000000..081e153db35f065a5b7436737e37e96bb015512d GIT binary patch literal 448 zcmV;x0YCm9iwFqROmkxZ14uGY0IiczPunmM$KU-aPCOR1sX&^hR(mK#880Z4sNi8m zlM`Q=H`fe$jv)|}FxFKgUglT*UGa{AJ;~QQBtZqRUkzKo?p_RMO5RT!8TI~xqgKDZ#WbjApzMn&At@|-!Qd=~dtGM|B zotAZ*P_@iba$0cn?t)Q5S}IKE&@MzxS0Sy?%%E`fzo63jNN&I&{G{aIqD5E1Mll zmuza@ViE5NKnfC-Xz^wR>U1`}9>e@M1`Te=nH=FN{S0#=mC@rHUIVOgFoOaOw~}L+I)UaOWz|5 z2j?HpYkx*g3vQl*znP5G3T^681ufdV*rx*9D_Y7&6t`SCoV>=Yz1oUtYn<1i3_@BS4djzw*%a%;7RE-0K(kf_)LU9FsW z3I^8`Id%g}`R^OsDT=6e)2%u_#Pi5EuOt}^dt@+#%ky&>_69bgOSXk?JAtpV-Lv$` zw&5+8@ty#rAW?}9FDp@}+5Bb-izf^k+>tW{!ex2|3nG=%>la=NY;cf4iH2KAy5-%Y zsTyqxP%2j)R$l~q9LzzBt`~k_K8^Rfu1C9SM+L3_#cO~82RFdAES+jgJZ65&1J-u1 z3=)ExTVGyY)VQFEm- zXDcbNC(my*bZxkhsO=tN;qs&34~^bRMfQ}P?x&bbbJ|h*)pe4PvrU#`r?4`l?OcoR mymU2E19>C-`1`Te>nH=FVy@Cmm%IJBE*8poAjG;iott8#> z?$DIAHUKD;D|f3e0zD2!pv9&a?lBw0eN|PxRkgjG=Ktc=z<`5m;93?=H6`xTzv&KR z+gUmZONq}@sgS)fpI{Li7LuLx`omzHk(qNFE8t}=Wi;oCm#dyGNZsaKag+LqM!%wb zJ&U9MQ8ZHa2lIwC8M1elB+xn7N)pC|oTK)KXli@tgI{05v;T9*nA8@H<|=LeKBuKW zBAi@&t-TpJEx36J-li>5E3~OY6|`vcVqXf}oX<=?qqyVB;cy+Z@ajg)I@{TK40>nb zRdJ=p&X!VOOO{tO^uur=QQJ?5iOcr>J{=c#Y&c9xMehs?2+f}E{$?AwN! rA#F!meCPSouY$@JPKDwT{|?aj_&{etrxR|_$m<+*>C0r)?r|^*kv>r*UlyB6*r**US>iBcP4qco9UY595X{Y@f!`_ zC1sDhI2)V=C#64JTuAyfW)Ccmp?9(;jv33v3YBl7sqM=EhR`3vAUt2kj0t5>D=w4f z_p?g)9^s{rxQbq#yO@-$%DLXuG0k);F6GRoSRaDRo7oiD-jbqQDT>hV0}E|iBhhr^ z6&lOZYW$#F?6l69qnn~IoAG1PnoHZxda>8co~ZDgk3v$H@KW4kKKJ0~b@pa797eCt z549#jpIRwwqb1~b;AT^bylV}=P}6(ObAien)|yz9r!MyLYQNT{CS@inf6KF<-wG-_ g^eW8n@Ogm3yMF;VM18qVW&U#g0liaVfnEjx0Kuj47ytkO literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/Ydefault.gz b/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/Ydefault.gz new file mode 100644 index 0000000000000000000000000000000000000000..f168cce92d5321482ca80dda5c5414e44398934b GIT binary patch literal 441 zcmV;q0Y?5GiwFqROmkxZ16gEcW?^+~bO5!J-A}?W5WwI2S6qC=z=)3!A5b%&2qqAX z5o5ab(CX1HUCaEy|J`*RX2Ix?==G&{z5ed2jXK>H>2%@r@DRGKj-~6It>Jhhur2E^ zmNr?Jy!kxrBY+qrl4$TI8LD_P8V_LhfRzSQ?M#Yr8lS;TYfAL<7Ow`DIG8|&hFhss z&AUXCm)ZazBbV=%UjTX>j6jLzDO_PP2>YTadYf!}sb2oXD}fab#=w=#9MviA)4%x+ zW7}Ce5sNin#*&b|F&|(R8de26>h*_}aiPtU+mHdzQz?TvC7y43y3#aFIdK#FiH391 z>E|pC`UkM2h(jpytxBav z^gs~udZ(>nVz0b*mWuSh-m#0(c)&(uI5|Fs@!-a=b;Y*u zc4zR=w!e6WY#Vs1RUQ`r928Q$$6GY0`C@)r!txr^49<g;T8?ok!kbP${z$Ocpg1wqdXUTbK>{_^-foP>t*)2)5J54u+&ZQt> zdF*IjCnN8AaWp;3PE&nBxnogtE!>RVvZ8>|lYK?OSgqEmVa{nPw?nlYxd zL#qYx{t|kvVx4z90M%4YkJ>O0z2{eq_Q(oiU@3*D2g){8rLL&D zX!lU6%1I2kIChlSz_#pvuk!&ID4Vq9((%Qf8NbYXGmc%WmsqV1!|Q9PmnQ1eiM4?@ zTZ3cUoOsG?qwyw_d~XA|KnV*Byir8BI~v^eVLT_<3GRi8eF8)G7REv_Pppsd3P249 zBZx?hB^A8DdmwS5Pkn%hsiazcIbaG01K@!fg-7D`^ZjbIYHX`*_#%7>PXlIfa0i&v zNU@^CztL|}p>36|W?Qbnp-UODep=}VmbqZr$65{KWX`FGLoD+OaN<*%yM2a}t)@%C z?tRQ~?4}*f<4pLwURe7iVD9VXhFRV zC|_S4%c5M8m}BM^L#Q}SnL@ME>gup36c2Fxl!Xg?}JOslv&0hpVaegWfFc8Pz{V7g+?9?PJY@k*=ltIvhrcSKd9wG-`)Lva@cA&SgQ?Z$H&la478zRvVvE&!M3d) zd75lxdE>GF4*_Ce$g>UJFh>y&2NyjUeZg`CSJJ2y;VgawBPn?z@3wdq(BfbSIV!4| z6cz6pRbf{>fSj9Rzxq7T;a~tF+uVg4OnUx*u~-CkwLvQ9zvEe8iGvHEg5`!+CH{?m z<2|lzZ)=4lmUJF7j^qb%32wb$WwLG%^-JeOsyWrZ0$QYud3VZbQEPfD`Bh3eRk6EK zzt3g5zKf&i$U9~771N3}>yvvDhR{0L7lwpnY>vV;QPuV_f-bbX5c%&@pAaTADnWT% zjh_+B^$5>`Q@fi;BQmO%nMm$yDyvD>-53S*sdBT><+VQceI%l1)Wa!`wnI9?fVHc#S38l2LJ%?oC59u literal 0 HcmV?d00001 diff --git a/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/nut.gz b/examples/dfLowMachFoam/notorch/twoD_sydneySprayBurner/0/nut.gz new file mode 100644 index 0000000000000000000000000000000000000000..e5aeb2a8053f861e1c1e05a49a362ce93fe41f1b GIT binary patch literal 496 zcmV^ND|BGznzop`?Zz0dl-_e+j~(E$raFgrem(ZPrI>5^>VV`s2$ znBq=8E@KJDcTZ zXO?jopKZ|ad^)ImrM9 z*AqE5fkSzBd`VFYf|QEiS=f{DHy2OR>vyQvhvU6H=yy6g*BM*D;ZpEfi!YWgEgWw) zi~9s11A($!;Y})3*<^e+gy}to6I_th1;TN50#hQH)AJ`@3v@V`K!utcL8|5bLtVSm z5TKH_-YmZe^f(xUDp&u)CFaApZ<=PX%yv-F{3o6R1{|CLSE91AO>vw4%{F+pjnzw7 zMtq(LiR_j608g=DA=tqn9R=ep={Yws16~(GL~|i|z3k}|$%}$Zt~39l@xP?v<1Kd5 zooJ-|0gIMZjo2GY66pQeN)pCOF-PT#Xmh*Thras`AdTyK#F$V9wc;{s=g%tPi-i5u z%Q@s^Rmt^BaAKpw>O{bcd0+oq1zp+@lH4;t7Z9|63bB%Rv zHI6>qs&su2cGoIc3nP?^axNrwh59zpKo|?X?S0>9; 7 CO2 + 8 H2O # Reaction 1 + rate-constant: {A: 5.0e+08, b: 0.0, Ea: 1.578e+04} + orders: {C7H16: 0.25, O2: 1.5} + note: '1' diff --git a/test/aachenBomb_2D/constant/CanteraTorchProperties b/test/aachenBomb_2D/constant/CanteraTorchProperties new file mode 100644 index 000000000..9ffa283cf --- /dev/null +++ b/test/aachenBomb_2D/constant/CanteraTorchProperties @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object CanteraTorchProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +chemistry on; + +CanteraMechanismFile "C7_oneStep.yaml"; + +transportModel "Mix"; + +odeCoeffs +{ + "relTol" 1e-6; + "absTol" 1e-10; +} + +inertSpecie "N2"; + +splittingStrategy off; + +TorchSettings +{ + torch off; + GPU off; + log off; + torchModel ""; + coresPerNode 4; +} + +loadbalancing +{ + active true; + log false; + algorithm allAverage;//headTail; +} + + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/combustionProperties b/test/aachenBomb_2D/constant/combustionProperties new file mode 100644 index 000000000..7418500d0 --- /dev/null +++ b/test/aachenBomb_2D/constant/combustionProperties @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object combustionProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +combustionModel laminar; + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/g b/test/aachenBomb_2D/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/test/aachenBomb_2D/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/sprayCloudProperties b/test/aachenBomb_2D/constant/sprayCloudProperties new file mode 100644 index 000000000..67a4e7dfb --- /dev/null +++ b/test/aachenBomb_2D/constant/sprayCloudProperties @@ -0,0 +1,234 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active true; + coupled true; + transient yes; + cellValueSourceCorrection on; + maxCo 0.3; + + sourceTerms + { + schemes + { + rho explicit 1; + U explicit 1; + Yi explicit 1; + h explicit 1; + radiation explicit 1; + } + } + + interpolationSchemes + { + rho cell; + U cellPoint; + thermo:mu cell; + T cell; + Cp cell; + kappa cell; + p cell; + } + + integrationSchemes + { + U Euler; + T analytical; + } +} + + +constantProperties +{ + T0 380;//320; + + // place holders for rho0 and Cp0 + // - reset from liquid properties using T0 + rho0 1000; + Cp0 4187; + + constantVolume false; +} + + +subModels +{ + particleForces + { + sphereDrag; + } + + injectionModels + { + model1 + { + type coneInjection; + SOI 0; + massTotal 8e-8; + parcelBasisType mass; + injectionMethod disc; + flowType flowRateAndDischarge; + dInner 0; + dOuter 1.2e-04;//1.9e-4; + duration 1.25e-3; + position (0 0.0995 0); + direction (0 -1 0); + parcelsPerSecond 20000000; + flowRateProfile table + ( + (0 0.1272) + (4.16667e-05 6.1634) + (8.33333e-05 9.4778) + (0.000125 9.5806) + (0.000166667 9.4184) + (0.000208333 9.0926) + (0.00025 8.7011) + (0.000291667 8.2239) + (0.000333333 8.0401) + (0.000375 8.8450) + (0.000416667 8.9174) + (0.000458333 8.8688) + (0.0005 8.8882) + (0.000541667 8.6923) + (0.000583333 8.0014) + (0.000625 7.2582) + (0.000666667 7.2757) + (0.000708333 6.9680) + (0.00075 6.7608) + (0.000791667 6.6502) + (0.000833333 6.7695) + (0.000875 5.5774) + (0.000916667 4.8649) + (0.000958333 5.0805) + (0.001 4.9547) + (0.00104167 4.5613) + (0.00108333 4.4536) + (0.001125 5.2651) + (0.00116667 5.2560) + (0.00120833 5.1737) + (0.00125 3.9213) + (0.001251 0.0000) + (1000 0.0000) + ); + + Cd constant 0.9; + + thetaInner constant 0.0; + thetaOuter constant 10.0; + + sizeDistribution + { + type RosinRammler; + + RosinRammlerDistribution + { + minValue 1e-06; + maxValue 0.00015; + d 0.00015; + n 3; + } + } + } + } + + dispersionModel none; + + patchInteractionModel standardWallInteraction; + + heatTransferModel RanzMarshall; + + compositionModel singlePhaseMixture; + + phaseChangeModel liquidEvaporationBoil; + + surfaceFilmModel none; + + atomizationModel none; + + breakupModel ReitzDiwakar; // ReitzKHRT; + + stochasticCollisionModel none; + + radiation off; + + standardWallInteractionCoeffs + { + type rebound; + } + + RanzMarshallCoeffs + { + BirdCorrection true; + } + + singlePhaseMixtureCoeffs + { + phases + ( + liquid + { + C7H16 1; + } + ); + } + + liquidEvaporationBoilCoeffs + { + enthalpyTransfer enthalpyDifference; + + activeLiquids ( C7H16 ); + } + + ReitzDiwakarCoeffs + { + solveOscillationEq yes; + Cbag 6; + Cb 0.785; + Cstrip 0.5; + Cs 10; + } + +/* + ReitzKHRTCoeffs + { + solveOscillationEq yes; + B0 0.61; + B1 40; + Ctau 1; + CRT 0.1; + msLimit 0.2; + WeberLimit 6; + } +*/ + TABCoeffs + { + y0 0; + yDot0 0; + Cmu 10; + Comega 8; + WeCrit 12; + } +} + + +cloudFunctions +{} + + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/thermophysicalProperties b/test/aachenBomb_2D/constant/thermophysicalProperties new file mode 100644 index 000000000..06be802bb --- /dev/null +++ b/test/aachenBomb_2D/constant/thermophysicalProperties @@ -0,0 +1,24 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +liquids +{ + C7H16; +} + +solids +{} +// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/turbulenceProperties b/test/aachenBomb_2D/constant/turbulenceProperties new file mode 100644 index 000000000..762189e6a --- /dev/null +++ b/test/aachenBomb_2D/constant/turbulenceProperties @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + RASModel kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/blockMeshDict b/test/aachenBomb_2D/system/blockMeshDict new file mode 100644 index 000000000..db7524c8a --- /dev/null +++ b/test/aachenBomb_2D/system/blockMeshDict @@ -0,0 +1,68 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 0.001; + +vertices +( + (-10 0 -1e-3) + (-10 0 1e-3) + (10 0 1e-3) + (10 0 -1e-3) + (-10 100 -1e-3) + (-10 100 1e-3) + (10 100 1e-3) + (10 100 -1e-3) +); + +blocks +( + hex (0 1 2 3 4 5 6 7) (1 41 100) simpleGrading (1 1 1) +); + +edges +( +); + +boundary +( + walls + { + type wall; + faces + ( + (4 5 6 7) + (3 2 1 0) + (7 6 2 3) + (0 1 5 4) + ); + } + empty + { + type empty; + faces + ( + (2 6 5 1) + (0 4 7 3) + ); + } +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/controlDict b/test/aachenBomb_2D/system/controlDict new file mode 100644 index 000000000..3a8519476 --- /dev/null +++ b/test/aachenBomb_2D/system/controlDict @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +libs ( + "libEvaporationNew.so" + ); + +application dfLowMachFoam; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 2.3e-3; + +deltaT 2.5e-06; + +writeControl adjustableRunTime; + +writeInterval 1e-04; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression on; + +timeFormat general; + +timePrecision 6; + +adjustTimeStep yes; + +maxCo 0.1; + +runTimeModifiable yes; + + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/decomposeParDict b/test/aachenBomb_2D/system/decomposeParDict new file mode 100644 index 000000000..c63e471ef --- /dev/null +++ b/test/aachenBomb_2D/system/decomposeParDict @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object decomposeParDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +numberOfSubdomains 2; + +method scotch; + + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/fvSchemes b/test/aachenBomb_2D/system/fvSchemes new file mode 100644 index 000000000..dd991a49b --- /dev/null +++ b/test/aachenBomb_2D/system/fvSchemes @@ -0,0 +1,59 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default none; + + div(phi,U) Gauss upwind; + div(phid,p) Gauss upwind; + div(phi,K) Gauss linear; + div(phi,k) Gauss upwind; + div(phi,epsilon) Gauss upwind; + div(U) Gauss linear; + div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; + div(phi,Yi_h) Gauss upwind; + div(hDiffCorrFlux) Gauss cubic; +} + +laplacianSchemes +{ + default Gauss linear orthogonal; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default orthogonal; +} + + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/fvSolution b/test/aachenBomb_2D/system/fvSolution new file mode 100644 index 000000000..5790575b0 --- /dev/null +++ b/test/aachenBomb_2D/system/fvSolution @@ -0,0 +1,100 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + rho + { + solver PCG; + preconditioner DIC; + tolerance 1e-05; + relTol 0.1; + } + + + rhoFinal + { + $rho; + tolerance 1e-05; + relTol 0; + } + + "(U|k|epsilon)" + { + solver smoothSolver; + smoother symGaussSeidel; + tolerance 1e-06; + relTol 0.1; + } + + p + { + solver GAMG; + tolerance 0; + relTol 0.1; + smoother GaussSeidel; + } + + pFinal + { + $p; + tolerance 1e-06; + relTol 0; + } + + "(U|k|epsilon)Final" + { + $U; + tolerance 1e-06; + relTol 0; + } + + "(ha|Yi|O2|N2|H2O)" + { + solver PBiCGStab; + preconditioner DILU; + tolerance 1e-6; + relTol 0.1; + } + + "(ha|Yi|O2|N2|H2O)Final" + { + $Yi; + relTol 0; + } + + + +} + +PIMPLE +{ + transonic no; + nCorrectors 2; + nNonOrthogonalCorrectors 0; + momentumPredictor yes; +} + +relaxationFactors +{ + equations + { + ".*" 1; + } +} + +// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/sample b/test/aachenBomb_2D/system/sample new file mode 100644 index 000000000..2b19cfa13 --- /dev/null +++ b/test/aachenBomb_2D/system/sample @@ -0,0 +1,38 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + location "system"; + object sample; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +type sets; +libs ("libsampling.so"); + +interpolationScheme cellPoint; + +setFormat raw; + +sets +( + data + { + type lineUniform; + axis y; + start (0 0 0); + end (0 0.1 0); + nPoints 100; + } +); + +fields (T); + +// ************************************************************************* // \ No newline at end of file diff --git a/test/corrtest.cpp b/test/corrtest.cpp index f97ea9f83..224e62a6c 100644 --- a/test/corrtest.cpp +++ b/test/corrtest.cpp @@ -37,6 +37,11 @@ float T9 = readSandia(9,"2DSandia/data_T.xy"); float T10 = readSandia(10,"2DSandia/data_T.xy"); float T11 = readSandia(11,"2DSandia/data_T.xy"); +float readBomb(int k, string file); +float aachenBomb1 = readBomb(158,"aachenBomb2D/data_T.xy"); +float aachenBomb2 = readBomb(168,"aachenBomb2D/data_T.xy"); +float aachenBomb3 = readBomb(174,"aachenBomb2D/data_T.xy"); +float aachenBomb4 = readBomb(194,"aachenBomb2D/data_T.xy"); TEST(corrtest,dfHighSpeedFoam){ @@ -65,6 +70,13 @@ TEST(corrtest,2DSandia){ EXPECT_FLOAT_EQ(T11,1081.8983); } +TEST(corrtest,dfLowMachFoam_2DaachenBomb){ + EXPECT_FLOAT_EQ(aachenBomb1,813.718018); + EXPECT_FLOAT_EQ(aachenBomb2,1988.500000); + EXPECT_FLOAT_EQ(aachenBomb3,937.171021); + EXPECT_FLOAT_EQ(aachenBomb4,2523.860107); +} + float readmaxTH2(){ float a; string inFileName = "0DH2/T" ; @@ -221,6 +233,33 @@ float readSandia(int k, string file){ return b; } +float readBomb(int k, string file){ + + float a; + float b; + int i = 0; + + string inFileName = file; + ifstream inFile; + inFile.open(inFileName.c_str()); + + if (inFile.is_open()) + { + while (inFile >> a){ + i ++ ; + if (i == k){ + b = a; + } + } + + } + else { //Error message + cerr << "Can't find input file " << inFileName << endl; + } + + return b; +} + float readflameSpeed(int k, string file); float fs = readflameSpeed(3,"flameSpeed/fs"); diff --git a/test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/g b/test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/g new file mode 100644 index 000000000..28cfc2369 --- /dev/null +++ b/test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value (0 -9.81 0); + + +// ************************************************************************* // diff --git a/test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/sprayCloudProperties b/test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/sprayCloudProperties new file mode 100644 index 000000000..2010a8858 --- /dev/null +++ b/test/dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/constant/sprayCloudProperties @@ -0,0 +1,26 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 7 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class dictionary; + location "constant"; + object SprayCloudProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solution +{ + active false; + coupled false; + transient no; + cellValueSourceCorrection off; +} + +// ************************************************************************* // From 53606222a5ce2876d1ec77caeaa2ad624db7fb73 Mon Sep 17 00:00:00 2001 From: pkuLmq <1900011062@pku.edu.cn> Date: Mon, 19 Aug 2024 19:28:01 +0800 Subject: [PATCH 2/2] ignore gravity in dfLowMachFoam solver --- applications/solvers/dfLowMachFoam/EEqn.H | 4 +- applications/solvers/dfLowMachFoam/UEqn.H | 4 +- test/CMakeLists.txt | 1 - test/aachenBomb_2D/0/N2 | 33 --- test/aachenBomb_2D/0/O2 | 33 --- test/aachenBomb_2D/0/T | 33 --- test/aachenBomb_2D/0/U | 34 --- test/aachenBomb_2D/0/Ydefault | 33 --- test/aachenBomb_2D/0/alphat | 36 --- test/aachenBomb_2D/0/epsilon | 36 --- test/aachenBomb_2D/0/k | 36 --- test/aachenBomb_2D/0/nut | 36 --- test/aachenBomb_2D/0/p | 33 --- test/aachenBomb_2D/Allclean | 13 - test/aachenBomb_2D/Allrun | 14 -- test/aachenBomb_2D/C7_oneStep.yaml | 113 --------- .../constant/CanteraTorchProperties | 51 ---- .../constant/combustionProperties | 20 -- test/aachenBomb_2D/constant/g | 22 -- .../constant/sprayCloudProperties | 234 ------------------ .../constant/thermophysicalProperties | 24 -- .../constant/turbulenceProperties | 30 --- test/aachenBomb_2D/system/blockMeshDict | 68 ----- test/aachenBomb_2D/system/controlDict | 56 ----- test/aachenBomb_2D/system/decomposeParDict | 22 -- test/aachenBomb_2D/system/fvSchemes | 59 ----- test/aachenBomb_2D/system/fvSolution | 100 -------- test/aachenBomb_2D/system/sample | 38 --- test/corrtest.cpp | 40 --- 29 files changed, 4 insertions(+), 1252 deletions(-) delete mode 100644 test/aachenBomb_2D/0/N2 delete mode 100644 test/aachenBomb_2D/0/O2 delete mode 100644 test/aachenBomb_2D/0/T delete mode 100644 test/aachenBomb_2D/0/U delete mode 100644 test/aachenBomb_2D/0/Ydefault delete mode 100644 test/aachenBomb_2D/0/alphat delete mode 100644 test/aachenBomb_2D/0/epsilon delete mode 100644 test/aachenBomb_2D/0/k delete mode 100644 test/aachenBomb_2D/0/nut delete mode 100644 test/aachenBomb_2D/0/p delete mode 100755 test/aachenBomb_2D/Allclean delete mode 100755 test/aachenBomb_2D/Allrun delete mode 100644 test/aachenBomb_2D/C7_oneStep.yaml delete mode 100644 test/aachenBomb_2D/constant/CanteraTorchProperties delete mode 100644 test/aachenBomb_2D/constant/combustionProperties delete mode 100644 test/aachenBomb_2D/constant/g delete mode 100644 test/aachenBomb_2D/constant/sprayCloudProperties delete mode 100644 test/aachenBomb_2D/constant/thermophysicalProperties delete mode 100644 test/aachenBomb_2D/constant/turbulenceProperties delete mode 100644 test/aachenBomb_2D/system/blockMeshDict delete mode 100644 test/aachenBomb_2D/system/controlDict delete mode 100644 test/aachenBomb_2D/system/decomposeParDict delete mode 100644 test/aachenBomb_2D/system/fvSchemes delete mode 100644 test/aachenBomb_2D/system/fvSolution delete mode 100644 test/aachenBomb_2D/system/sample diff --git a/applications/solvers/dfLowMachFoam/EEqn.H b/applications/solvers/dfLowMachFoam/EEqn.H index 0238a15a6..0dae9da88 100644 --- a/applications/solvers/dfLowMachFoam/EEqn.H +++ b/applications/solvers/dfLowMachFoam/EEqn.H @@ -23,14 +23,14 @@ fvm::laplacian(turbulence->alpha(), he) - diffAlphaD + fvc::div(hDiffCorrFlux) - + rho*(U&g) + // + rho*(U&g) + parcels.Sh(he) + hcSource ) : ( fvm::laplacian(turbulence->alphaEff(), he) - + rho*(U&g) + // + rho*(U&g) + parcels.Sh(he) + hcSource ) diff --git a/applications/solvers/dfLowMachFoam/UEqn.H b/applications/solvers/dfLowMachFoam/UEqn.H index d269c5582..77ad8087e 100644 --- a/applications/solvers/dfLowMachFoam/UEqn.H +++ b/applications/solvers/dfLowMachFoam/UEqn.H @@ -5,8 +5,8 @@ fvm::ddt(rho, U) + fvm::div(phi, U) + turbulence->divDevRhoReff(U) == - rho()*g - + parcels.SU(U) + // rho()*g + parcels.SU(U) ); fvVectorMatrix& UEqn = tUEqn.ref(); end1 = std::clock(); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c8d884f13..ff80c105d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -23,7 +23,6 @@ file(COPY ./dfLowMachFoam/twoD_reactingTGV/H2/cvodeSolver/postProcessing/sample/ file(COPY ./dfLowMachFoam/twoD_SandiaD_flareFGM/postProcessing/sample/1.1/data_T.xy DESTINATION 2DSandia) file(COPY ./Tu500K-Phi1/fs DESTINATION flameSpeed) -file(COPY ./aachenBomb_2D/postProcessing/sample/0.0023/data_T.xy DESTINATION aachenBomb2D) enable_testing() diff --git a/test/aachenBomb_2D/0/N2 b/test/aachenBomb_2D/0/N2 deleted file mode 100644 index f12636384..000000000 --- a/test/aachenBomb_2D/0/N2 +++ /dev/null @@ -1,33 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object N2; -} -// ************************************************************************* // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.766; - -boundaryField -{ - walls - { - type zeroGradient; - } - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/O2 b/test/aachenBomb_2D/0/O2 deleted file mode 100644 index dcc0bcae6..000000000 --- a/test/aachenBomb_2D/0/O2 +++ /dev/null @@ -1,33 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object O2; -} -// ************************************************************************* // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.234; - -boundaryField -{ - walls - { - type zeroGradient; - } - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/T b/test/aachenBomb_2D/0/T deleted file mode 100644 index 36e55cfdb..000000000 --- a/test/aachenBomb_2D/0/T +++ /dev/null @@ -1,33 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// ************************************************************************* // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 800; - -boundaryField -{ - walls - { - type zeroGradient; - } - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/U b/test/aachenBomb_2D/0/U deleted file mode 100644 index e57719f13..000000000 --- a/test/aachenBomb_2D/0/U +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - object U; -} -// ************************************************************************* // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - walls - { - type fixedValue; - value uniform (0 0 0); - } - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/Ydefault b/test/aachenBomb_2D/0/Ydefault deleted file mode 100644 index 0959451ea..000000000 --- a/test/aachenBomb_2D/0/Ydefault +++ /dev/null @@ -1,33 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object Ydefault; -} -// ************************************************************************* // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type zeroGradient; - } - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/alphat b/test/aachenBomb_2D/0/alphat deleted file mode 100644 index 9db7805b2..000000000 --- a/test/aachenBomb_2D/0/alphat +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object alphat; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type compressible::alphatWallFunction; - value uniform 0; - } - empty - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/epsilon b/test/aachenBomb_2D/0/epsilon deleted file mode 100644 index c0d5a71f0..000000000 --- a/test/aachenBomb_2D/0/epsilon +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object epsilon; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform 90; - -boundaryField -{ - walls - { - type epsilonWallFunction; - value uniform 90; - } - empty - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/k b/test/aachenBomb_2D/0/k deleted file mode 100644 index 4c89e4d84..000000000 --- a/test/aachenBomb_2D/0/k +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - walls - { - type kqRWallFunction; - value uniform 1; - } - empty - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/nut b/test/aachenBomb_2D/0/nut deleted file mode 100644 index a873ca78d..000000000 --- a/test/aachenBomb_2D/0/nut +++ /dev/null @@ -1,36 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class volScalarField; - location "0"; - object nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type nutkWallFunction; - value uniform 0; - } - empty - { - type empty; - } -} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/0/p b/test/aachenBomb_2D/0/p deleted file mode 100644 index 29bb5c391..000000000 --- a/test/aachenBomb_2D/0/p +++ /dev/null @@ -1,33 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p; -} -// ************************************************************************* // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 5e+06; - -boundaryField -{ - walls - { - type zeroGradient; - } - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/Allclean b/test/aachenBomb_2D/Allclean deleted file mode 100755 index d77506304..000000000 --- a/test/aachenBomb_2D/Allclean +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -echo "Cleaning log.*" -rm log.* log* -echo "Cleaning processor*" -rm -r processor* -echo "Cleaning polyMesh/" -rm -r constant/polyMesh -echo "Cleaning time steps" -rm -r 0.00* -echo "Cleaning postProcessing" -rm -r postProcessing/ diff --git a/test/aachenBomb_2D/Allrun b/test/aachenBomb_2D/Allrun deleted file mode 100755 index 2c6b99203..000000000 --- a/test/aachenBomb_2D/Allrun +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial run functions -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -application=dfLowMachFoam - -runApplication blockMesh -runApplication decomposePar -runApplication /usr/bin/mpirun -np 2 --allow-run-as-root $application -parallel - -runApplication reconstructPar -runApplication postProcess -func sample diff --git a/test/aachenBomb_2D/C7_oneStep.yaml b/test/aachenBomb_2D/C7_oneStep.yaml deleted file mode 100644 index f96a21ce2..000000000 --- a/test/aachenBomb_2D/C7_oneStep.yaml +++ /dev/null @@ -1,113 +0,0 @@ -generator: ck2yaml -input-files: [chem.inp, therm.dat, trans.dat] -cantera-version: 2.5.1 -date: Sun, 29 May 2022 19:52:53 +0800 - -units: {length: cm, time: s, quantity: mol, activation-energy: cal/mol} - -phases: -- name: gas - thermo: ideal-gas - elements: [H, O, C, N, Ar] - species: [C7H16, O2, N2, CO2, H2O] - kinetics: gas - transport: mixture-averaged - state: {T: 300.0, P: 1 atm} - -species: -- name: C7H16 - composition: {C: 7, H: 16} - thermo: - model: NASA7 - temperature-ranges: [200.0, 1000.0, 6000.0] - data: - - [11.1532994, -9.49419773e-03, 1.95572075e-04, -2.49753662e-07, 9.84877715e-11, - -2.67688904e+04, -15.9096837] - - [20.4565203, 0.0348575357, -1.09226846e-05, 1.67201776e-09, -9.8102485e-14, - -3.25556365e+04, -80.4405017] - note: P10/85 - transport: - model: gas - geometry: nonlinear - well-depth: 459.6 - diameter: 6.253 - rotational-relaxation: 1.0 - note: TCPC -- name: O2 - composition: {O: 2} - thermo: - model: NASA7 - temperature-ranges: [200.0, 1000.0, 6000.0] - data: - - [3.78535371, -3.2192854e-03, 1.12323443e-05, -1.17254068e-08, 4.17659585e-12, - 1.02922572e+04, 3.27320239] - - [3.45852381, 1.04045351e-03, -2.79664041e-07, 3.11439672e-11, -8.55656058e-16, - 1.02229063e+04, 4.15264119] - note: ATcT06 - transport: - model: gas - geometry: linear - well-depth: 107.4 - diameter: 3.458 - polarizability: 1.6 - rotational-relaxation: 3.8 -- name: N2 - composition: {N: 2} - thermo: - model: NASA7 - temperature-ranges: [200.0, 1000.0, 6000.0] - data: - - [3.53100528, -1.23660988e-04, -5.02999433e-07, 2.43530612e-09, -1.40881235e-12, - -1046.97628, 2.96747038] - - [2.95257637, 1.3969004e-03, -4.92631603e-07, 7.86010195e-11, -4.60755204e-15, - -923.948688, 5.87188762] - note: G8/02 - transport: - model: gas - geometry: linear - well-depth: 97.53 - diameter: 3.621 - polarizability: 1.76 - rotational-relaxation: 4.0 -- name: CO2 - composition: {C: 1, O: 2} - thermo: - model: NASA7 - temperature-ranges: [200.0, 1000.0, 6000.0] - data: - - [2.356813, 8.9841299e-03, -7.1220632e-06, 2.4573008e-09, -1.4288548e-13, - -4.8371971e+04, 9.9009035] - - [4.6365111, 2.7414569e-03, -9.9589759e-07, 1.6038666e-10, -9.1619857e-15, - -4.9024904e+04, -1.9348955] - note: L7/88 - transport: - model: gas - geometry: linear - well-depth: 244.0 - diameter: 3.763 - polarizability: 2.65 - rotational-relaxation: 2.1 -- name: H2O - composition: {H: 2, O: 1} - thermo: - model: NASA7 - temperature-ranges: [200.0, 1000.0, 6000.0] - data: - - [4.1986352, -2.0364017e-03, 6.5203416e-06, -5.4879269e-09, 1.771968e-12, - -3.0293726e+04, -0.84900901] - - [2.6770389, 2.9731816e-03, -7.7376889e-07, 9.4433514e-11, -4.2689991e-15, - -2.9885894e+04, 6.88255] - note: L5/89 - transport: - model: gas - geometry: nonlinear - well-depth: 572.4 - diameter: 2.605 - dipole: 1.844 - rotational-relaxation: 4.0 - -reactions: -- equation: C7H16 + 11 O2 => 7 CO2 + 8 H2O # Reaction 1 - rate-constant: {A: 5.0e+08, b: 0.0, Ea: 1.578e+04} - orders: {C7H16: 0.25, O2: 1.5} - note: '1' diff --git a/test/aachenBomb_2D/constant/CanteraTorchProperties b/test/aachenBomb_2D/constant/CanteraTorchProperties deleted file mode 100644 index 9ffa283cf..000000000 --- a/test/aachenBomb_2D/constant/CanteraTorchProperties +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object CanteraTorchProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -chemistry on; - -CanteraMechanismFile "C7_oneStep.yaml"; - -transportModel "Mix"; - -odeCoeffs -{ - "relTol" 1e-6; - "absTol" 1e-10; -} - -inertSpecie "N2"; - -splittingStrategy off; - -TorchSettings -{ - torch off; - GPU off; - log off; - torchModel ""; - coresPerNode 4; -} - -loadbalancing -{ - active true; - log false; - algorithm allAverage;//headTail; -} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/combustionProperties b/test/aachenBomb_2D/constant/combustionProperties deleted file mode 100644 index 7418500d0..000000000 --- a/test/aachenBomb_2D/constant/combustionProperties +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object combustionProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -combustionModel laminar; - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/g b/test/aachenBomb_2D/constant/g deleted file mode 100644 index 28cfc2369..000000000 --- a/test/aachenBomb_2D/constant/g +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class uniformDimensionedVectorField; - location "constant"; - object g; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -2 0 0 0 0]; -value (0 -9.81 0); - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/sprayCloudProperties b/test/aachenBomb_2D/constant/sprayCloudProperties deleted file mode 100644 index 67a4e7dfb..000000000 --- a/test/aachenBomb_2D/constant/sprayCloudProperties +++ /dev/null @@ -1,234 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class dictionary; - location "constant"; - object SprayCloudProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solution -{ - active true; - coupled true; - transient yes; - cellValueSourceCorrection on; - maxCo 0.3; - - sourceTerms - { - schemes - { - rho explicit 1; - U explicit 1; - Yi explicit 1; - h explicit 1; - radiation explicit 1; - } - } - - interpolationSchemes - { - rho cell; - U cellPoint; - thermo:mu cell; - T cell; - Cp cell; - kappa cell; - p cell; - } - - integrationSchemes - { - U Euler; - T analytical; - } -} - - -constantProperties -{ - T0 380;//320; - - // place holders for rho0 and Cp0 - // - reset from liquid properties using T0 - rho0 1000; - Cp0 4187; - - constantVolume false; -} - - -subModels -{ - particleForces - { - sphereDrag; - } - - injectionModels - { - model1 - { - type coneInjection; - SOI 0; - massTotal 8e-8; - parcelBasisType mass; - injectionMethod disc; - flowType flowRateAndDischarge; - dInner 0; - dOuter 1.2e-04;//1.9e-4; - duration 1.25e-3; - position (0 0.0995 0); - direction (0 -1 0); - parcelsPerSecond 20000000; - flowRateProfile table - ( - (0 0.1272) - (4.16667e-05 6.1634) - (8.33333e-05 9.4778) - (0.000125 9.5806) - (0.000166667 9.4184) - (0.000208333 9.0926) - (0.00025 8.7011) - (0.000291667 8.2239) - (0.000333333 8.0401) - (0.000375 8.8450) - (0.000416667 8.9174) - (0.000458333 8.8688) - (0.0005 8.8882) - (0.000541667 8.6923) - (0.000583333 8.0014) - (0.000625 7.2582) - (0.000666667 7.2757) - (0.000708333 6.9680) - (0.00075 6.7608) - (0.000791667 6.6502) - (0.000833333 6.7695) - (0.000875 5.5774) - (0.000916667 4.8649) - (0.000958333 5.0805) - (0.001 4.9547) - (0.00104167 4.5613) - (0.00108333 4.4536) - (0.001125 5.2651) - (0.00116667 5.2560) - (0.00120833 5.1737) - (0.00125 3.9213) - (0.001251 0.0000) - (1000 0.0000) - ); - - Cd constant 0.9; - - thetaInner constant 0.0; - thetaOuter constant 10.0; - - sizeDistribution - { - type RosinRammler; - - RosinRammlerDistribution - { - minValue 1e-06; - maxValue 0.00015; - d 0.00015; - n 3; - } - } - } - } - - dispersionModel none; - - patchInteractionModel standardWallInteraction; - - heatTransferModel RanzMarshall; - - compositionModel singlePhaseMixture; - - phaseChangeModel liquidEvaporationBoil; - - surfaceFilmModel none; - - atomizationModel none; - - breakupModel ReitzDiwakar; // ReitzKHRT; - - stochasticCollisionModel none; - - radiation off; - - standardWallInteractionCoeffs - { - type rebound; - } - - RanzMarshallCoeffs - { - BirdCorrection true; - } - - singlePhaseMixtureCoeffs - { - phases - ( - liquid - { - C7H16 1; - } - ); - } - - liquidEvaporationBoilCoeffs - { - enthalpyTransfer enthalpyDifference; - - activeLiquids ( C7H16 ); - } - - ReitzDiwakarCoeffs - { - solveOscillationEq yes; - Cbag 6; - Cb 0.785; - Cstrip 0.5; - Cs 10; - } - -/* - ReitzKHRTCoeffs - { - solveOscillationEq yes; - B0 0.61; - B1 40; - Ctau 1; - CRT 0.1; - msLimit 0.2; - WeberLimit 6; - } -*/ - TABCoeffs - { - y0 0; - yDot0 0; - Cmu 10; - Comega 8; - WeCrit 12; - } -} - - -cloudFunctions -{} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/thermophysicalProperties b/test/aachenBomb_2D/constant/thermophysicalProperties deleted file mode 100644 index 06be802bb..000000000 --- a/test/aachenBomb_2D/constant/thermophysicalProperties +++ /dev/null @@ -1,24 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -liquids -{ - C7H16; -} - -solids -{} -// ************************************************************************* // diff --git a/test/aachenBomb_2D/constant/turbulenceProperties b/test/aachenBomb_2D/constant/turbulenceProperties deleted file mode 100644 index 762189e6a..000000000 --- a/test/aachenBomb_2D/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format binary; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - RASModel kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/blockMeshDict b/test/aachenBomb_2D/system/blockMeshDict deleted file mode 100644 index db7524c8a..000000000 --- a/test/aachenBomb_2D/system/blockMeshDict +++ /dev/null @@ -1,68 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -convertToMeters 0.001; - -vertices -( - (-10 0 -1e-3) - (-10 0 1e-3) - (10 0 1e-3) - (10 0 -1e-3) - (-10 100 -1e-3) - (-10 100 1e-3) - (10 100 1e-3) - (10 100 -1e-3) -); - -blocks -( - hex (0 1 2 3 4 5 6 7) (1 41 100) simpleGrading (1 1 1) -); - -edges -( -); - -boundary -( - walls - { - type wall; - faces - ( - (4 5 6 7) - (3 2 1 0) - (7 6 2 3) - (0 1 5 4) - ); - } - empty - { - type empty; - faces - ( - (2 6 5 1) - (0 4 7 3) - ); - } -); - -mergePatchPairs -( -); - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/controlDict b/test/aachenBomb_2D/system/controlDict deleted file mode 100644 index 3a8519476..000000000 --- a/test/aachenBomb_2D/system/controlDict +++ /dev/null @@ -1,56 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -libs ( - "libEvaporationNew.so" - ); - -application dfLowMachFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 2.3e-3; - -deltaT 2.5e-06; - -writeControl adjustableRunTime; - -writeInterval 1e-04; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression on; - -timeFormat general; - -timePrecision 6; - -adjustTimeStep yes; - -maxCo 0.1; - -runTimeModifiable yes; - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/decomposeParDict b/test/aachenBomb_2D/system/decomposeParDict deleted file mode 100644 index c63e471ef..000000000 --- a/test/aachenBomb_2D/system/decomposeParDict +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object decomposeParDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 2; - -method scotch; - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/fvSchemes b/test/aachenBomb_2D/system/fvSchemes deleted file mode 100644 index dd991a49b..000000000 --- a/test/aachenBomb_2D/system/fvSchemes +++ /dev/null @@ -1,59 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - - div(phi,U) Gauss upwind; - div(phid,p) Gauss upwind; - div(phi,K) Gauss linear; - div(phi,k) Gauss upwind; - div(phi,epsilon) Gauss upwind; - div(U) Gauss linear; - div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear; - div(phi,Yi_h) Gauss upwind; - div(hDiffCorrFlux) Gauss cubic; -} - -laplacianSchemes -{ - default Gauss linear orthogonal; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default orthogonal; -} - - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/fvSolution b/test/aachenBomb_2D/system/fvSolution deleted file mode 100644 index 5790575b0..000000000 --- a/test/aachenBomb_2D/system/fvSolution +++ /dev/null @@ -1,100 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - rho - { - solver PCG; - preconditioner DIC; - tolerance 1e-05; - relTol 0.1; - } - - - rhoFinal - { - $rho; - tolerance 1e-05; - relTol 0; - } - - "(U|k|epsilon)" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-06; - relTol 0.1; - } - - p - { - solver GAMG; - tolerance 0; - relTol 0.1; - smoother GaussSeidel; - } - - pFinal - { - $p; - tolerance 1e-06; - relTol 0; - } - - "(U|k|epsilon)Final" - { - $U; - tolerance 1e-06; - relTol 0; - } - - "(ha|Yi|O2|N2|H2O)" - { - solver PBiCGStab; - preconditioner DILU; - tolerance 1e-6; - relTol 0.1; - } - - "(ha|Yi|O2|N2|H2O)Final" - { - $Yi; - relTol 0; - } - - - -} - -PIMPLE -{ - transonic no; - nCorrectors 2; - nNonOrthogonalCorrectors 0; - momentumPredictor yes; -} - -relaxationFactors -{ - equations - { - ".*" 1; - } -} - -// ************************************************************************* // diff --git a/test/aachenBomb_2D/system/sample b/test/aachenBomb_2D/system/sample deleted file mode 100644 index 2b19cfa13..000000000 --- a/test/aachenBomb_2D/system/sample +++ /dev/null @@ -1,38 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 7 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object sample; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -type sets; -libs ("libsampling.so"); - -interpolationScheme cellPoint; - -setFormat raw; - -sets -( - data - { - type lineUniform; - axis y; - start (0 0 0); - end (0 0.1 0); - nPoints 100; - } -); - -fields (T); - -// ************************************************************************* // \ No newline at end of file diff --git a/test/corrtest.cpp b/test/corrtest.cpp index 224e62a6c..2ae8a26a5 100644 --- a/test/corrtest.cpp +++ b/test/corrtest.cpp @@ -37,12 +37,6 @@ float T9 = readSandia(9,"2DSandia/data_T.xy"); float T10 = readSandia(10,"2DSandia/data_T.xy"); float T11 = readSandia(11,"2DSandia/data_T.xy"); -float readBomb(int k, string file); -float aachenBomb1 = readBomb(158,"aachenBomb2D/data_T.xy"); -float aachenBomb2 = readBomb(168,"aachenBomb2D/data_T.xy"); -float aachenBomb3 = readBomb(174,"aachenBomb2D/data_T.xy"); -float aachenBomb4 = readBomb(194,"aachenBomb2D/data_T.xy"); - TEST(corrtest,dfHighSpeedFoam){ EXPECT_NEAR(v,1979.33,19.79); // within 1% of the theroetical value @@ -70,13 +64,6 @@ TEST(corrtest,2DSandia){ EXPECT_FLOAT_EQ(T11,1081.8983); } -TEST(corrtest,dfLowMachFoam_2DaachenBomb){ - EXPECT_FLOAT_EQ(aachenBomb1,813.718018); - EXPECT_FLOAT_EQ(aachenBomb2,1988.500000); - EXPECT_FLOAT_EQ(aachenBomb3,937.171021); - EXPECT_FLOAT_EQ(aachenBomb4,2523.860107); -} - float readmaxTH2(){ float a; string inFileName = "0DH2/T" ; @@ -233,33 +220,6 @@ float readSandia(int k, string file){ return b; } -float readBomb(int k, string file){ - - float a; - float b; - int i = 0; - - string inFileName = file; - ifstream inFile; - inFile.open(inFileName.c_str()); - - if (inFile.is_open()) - { - while (inFile >> a){ - i ++ ; - if (i == k){ - b = a; - } - } - - } - else { //Error message - cerr << "Can't find input file " << inFileName << endl; - } - - return b; -} - float readflameSpeed(int k, string file); float fs = readflameSpeed(3,"flameSpeed/fs");