diff --git a/.github/linters/.codespell-ignore-words b/.github/linters/.codespell-ignore-words index 45233343..df457763 100644 --- a/.github/linters/.codespell-ignore-words +++ b/.github/linters/.codespell-ignore-words @@ -2,3 +2,4 @@ nd inh lastR inpt +cocurrent diff --git a/.github/linters/.codespellrc b/.github/linters/.codespellrc index c20d80ca..c4036fa5 100644 --- a/.github/linters/.codespellrc +++ b/.github/linters/.codespellrc @@ -1,3 +1,3 @@ [codespell] -skip = None, .git,OFsolvers,build,__pycache__,data_conditional_mean,Figures,assets +skip = None, .git,OFsolvers,tutorial_cases,experimental_cases,build,__pycache__,data_conditional_mean,Figures,assets ignore-words = .github/linters/.codespell-ignore-words diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd64fe75..6e4fa4ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: run: working-directory: ${{github.workspace}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{matrix.python-version}} @@ -43,19 +43,19 @@ jobs: run: | source .github/linters/formatting.sh format . true - Test: - name: Test (${{ matrix.python-version }}, ${{ matrix.os }}) + Test-BiRD: + name: Test-BiRD (${{ matrix.python-version }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12'] os: ['ubuntu-latest', 'macos-latest'] defaults: run: working-directory: ${{github.workspace}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: ${{matrix.python-version}} @@ -73,3 +73,73 @@ jobs: - name: Test postprocessing run: | pytest tests/postprocess + Test-OF: + name: Test-OF (${{ matrix.python-version }}, ${{ matrix.os }}) + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + python-version: ['3.10'] + os: ['ubuntu-22.04'] + defaults: + run: + working-directory: ${{github.workspace}} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 + with: + python-version: ${{matrix.python-version}} + - uses: gerlero/setup-openfoam@v1 + with: + openfoam-version: 9 + - name: Install dependencies + run: | + pip install --upgrade pip + pip install . + - name: Compile solver + run: | + cd OFsolvers/birdmultiphaseEulerFoam + export WM_COMPILE_OPTION=Debug + ./Allwmake + cd ../../ + - name: Run deckwer17 PBE + run: | + cd experimental_cases/deckwer17 + bash run.sh + cd ../../ + - name: Run deckwer17 constantD + run: | + cd experimental_cases/deckwer17 + cp constant/phaseProperties_constantd constant/phaseProperties + bash run.sh + cd ../../ + - name: Run deckwer19 PBE + run: | + cd experimental_cases/deckwer19 + bash run.sh + cd ../../ + - name: Run side sparger tutorial + run: | + cd tutorial_cases/side_sparger + bash run.sh + cd ../../ + - name: Run bubble column tutorial + run: | + cd tutorial_cases/bubble_column_20L + bash run.sh + cd ../../ + - name: Run stirred-tank tutorial + run: | + cd tutorial_cases/stirred_tank + bash run.sh + cd ../../ + - name: Run reactive loop reactor tutorial + run: | + cd tutorial_cases/loop_reactor_reacting + bash run.sh + cd ../../ + - name: Run mixing loop reactor tutorial + run: | + cd tutorial_cases/loop_reactor_mixing + bash run.sh + cd ../../ diff --git a/.gitignore b/.gitignore index e1e609d4..c94a27f0 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,4 @@ dmypy.json # output .DS_Store *.stl + diff --git a/OFsolvers/applications/bdoFoam/Allwclean b/OFsolvers/bdoFoam/Allwclean similarity index 100% rename from OFsolvers/applications/bdoFoam/Allwclean rename to OFsolvers/bdoFoam/Allwclean diff --git a/OFsolvers/applications/bdoFoam/Allwmake b/OFsolvers/bdoFoam/Allwmake similarity index 100% rename from OFsolvers/applications/bdoFoam/Allwmake rename to OFsolvers/bdoFoam/Allwmake diff --git a/OFsolvers/applications/bdoFoam/CourantNos.H b/OFsolvers/bdoFoam/CourantNos.H similarity index 100% rename from OFsolvers/applications/bdoFoam/CourantNos.H rename to OFsolvers/bdoFoam/CourantNos.H diff --git a/OFsolvers/applications/bdoFoam/EEqns.H b/OFsolvers/bdoFoam/EEqns.H similarity index 100% rename from OFsolvers/applications/bdoFoam/EEqns.H rename to OFsolvers/bdoFoam/EEqns.H diff --git a/OFsolvers/applications/bdoFoam/Make/files b/OFsolvers/bdoFoam/Make/files similarity index 100% rename from OFsolvers/applications/bdoFoam/Make/files rename to OFsolvers/bdoFoam/Make/files diff --git a/OFsolvers/applications/bdoFoam/Make/options b/OFsolvers/bdoFoam/Make/options similarity index 100% rename from OFsolvers/applications/bdoFoam/Make/options rename to OFsolvers/bdoFoam/Make/options diff --git a/OFsolvers/applications/bdoFoam/README b/OFsolvers/bdoFoam/README similarity index 100% rename from OFsolvers/applications/bdoFoam/README rename to OFsolvers/bdoFoam/README diff --git a/OFsolvers/applications/bdoFoam/YEqns.H b/OFsolvers/bdoFoam/YEqns.H similarity index 100% rename from OFsolvers/applications/bdoFoam/YEqns.H rename to OFsolvers/bdoFoam/YEqns.H diff --git a/OFsolvers/applications/bdoFoam/bdoFoam.C b/OFsolvers/bdoFoam/bdoFoam.C similarity index 100% rename from OFsolvers/applications/bdoFoam/bdoFoam.C rename to OFsolvers/bdoFoam/bdoFoam.C diff --git a/OFsolvers/applications/bdoFoam/bdoMathFuncs.C b/OFsolvers/bdoFoam/bdoMathFuncs.C similarity index 100% rename from OFsolvers/applications/bdoFoam/bdoMathFuncs.C rename to OFsolvers/bdoFoam/bdoMathFuncs.C diff --git a/OFsolvers/applications/bdoFoam/bdoMathFuncs.H b/OFsolvers/bdoFoam/bdoMathFuncs.H similarity index 100% rename from OFsolvers/applications/bdoFoam/bdoMathFuncs.H rename to OFsolvers/bdoFoam/bdoMathFuncs.H diff --git a/OFsolvers/applications/bdoFoam/bioReact.H b/OFsolvers/bdoFoam/bioReact.H similarity index 100% rename from OFsolvers/applications/bdoFoam/bioReact.H rename to OFsolvers/bdoFoam/bioReact.H diff --git a/OFsolvers/applications/bdoFoam/createFieldRefs.H b/OFsolvers/bdoFoam/createFieldRefs.H similarity index 100% rename from OFsolvers/applications/bdoFoam/createFieldRefs.H rename to OFsolvers/bdoFoam/createFieldRefs.H diff --git a/OFsolvers/applications/bdoFoam/createFields.H b/OFsolvers/bdoFoam/createFields.H similarity index 100% rename from OFsolvers/applications/bdoFoam/createFields.H rename to OFsolvers/bdoFoam/createFields.H diff --git a/OFsolvers/applications/bdoFoam/microbeModel.C b/OFsolvers/bdoFoam/microbeModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/microbeModel.C rename to OFsolvers/bdoFoam/microbeModel.C diff --git a/OFsolvers/applications/bdoFoam/microbeModel.H b/OFsolvers/bdoFoam/microbeModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/microbeModel.H rename to OFsolvers/bdoFoam/microbeModel.H diff --git a/OFsolvers/applications/bdoFoam/pU/UEqns.H b/OFsolvers/bdoFoam/pU/UEqns.H similarity index 100% rename from OFsolvers/applications/bdoFoam/pU/UEqns.H rename to OFsolvers/bdoFoam/pU/UEqns.H diff --git a/OFsolvers/applications/bdoFoam/pU/pEqn.H b/OFsolvers/bdoFoam/pU/pEqn.H similarity index 100% rename from OFsolvers/applications/bdoFoam/pU/pEqn.H rename to OFsolvers/bdoFoam/pU/pEqn.H diff --git a/OFsolvers/applications/bdoFoam/pUf/UEqns.H b/OFsolvers/bdoFoam/pUf/UEqns.H similarity index 100% rename from OFsolvers/applications/bdoFoam/pUf/UEqns.H rename to OFsolvers/bdoFoam/pUf/UEqns.H diff --git a/OFsolvers/applications/bdoFoam/pUf/createRDeltaTf.H b/OFsolvers/bdoFoam/pUf/createRDeltaTf.H similarity index 100% rename from OFsolvers/applications/bdoFoam/pUf/createRDeltaTf.H rename to OFsolvers/bdoFoam/pUf/createRDeltaTf.H diff --git a/OFsolvers/applications/bdoFoam/pUf/pEqn.H b/OFsolvers/bdoFoam/pUf/pEqn.H similarity index 100% rename from OFsolvers/applications/bdoFoam/pUf/pEqn.H rename to OFsolvers/bdoFoam/pUf/pEqn.H diff --git a/OFsolvers/applications/bdoFoam/setRDeltaT.H b/OFsolvers/bdoFoam/setRDeltaT.H similarity index 100% rename from OFsolvers/applications/bdoFoam/setRDeltaT.H rename to OFsolvers/bdoFoam/setRDeltaT.H diff --git a/OFsolvers/applications/bdoFoam/setRDeltaTf.H b/OFsolvers/bdoFoam/setRDeltaTf.H similarity index 100% rename from OFsolvers/applications/bdoFoam/setRDeltaTf.H rename to OFsolvers/bdoFoam/setRDeltaTf.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/files b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/files similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/files rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/files diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/options similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/options rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/Make/options diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H rename to OFsolvers/bdoFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/Make/files b/OFsolvers/bdoFoam/twoPhaseSystem/Make/files similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/Make/files rename to OFsolvers/bdoFoam/twoPhaseSystem/Make/files diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/Make/options b/OFsolvers/bdoFoam/twoPhaseSystem/Make/options similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/Make/options rename to OFsolvers/bdoFoam/twoPhaseSystem/Make/options diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATE.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H b/OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H rename to OFsolvers/bdoFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/newTwoPhaseSystem.C b/OFsolvers/bdoFoam/twoPhaseSystem/newTwoPhaseSystem.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/newTwoPhaseSystem.C rename to OFsolvers/bdoFoam/twoPhaseSystem/newTwoPhaseSystem.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystem.C b/OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystem.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystem.C rename to OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystem.C diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystem.H b/OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystem.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystem.H rename to OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystem.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystemI.H b/OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystemI.H similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystemI.H rename to OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystemI.H diff --git a/OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystems.C b/OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystems.C similarity index 100% rename from OFsolvers/applications/bdoFoam/twoPhaseSystem/twoPhaseSystems.C rename to OFsolvers/bdoFoam/twoPhaseSystem/twoPhaseSystems.C diff --git a/OFsolvers/applications/bdoFoam/wellMixed.H b/OFsolvers/bdoFoam/wellMixed.H similarity index 100% rename from OFsolvers/applications/bdoFoam/wellMixed.H rename to OFsolvers/bdoFoam/wellMixed.H diff --git a/OFsolvers/birdmultiphaseEulerFoam/1 b/OFsolvers/birdmultiphaseEulerFoam/1 new file mode 100644 index 00000000..b62f0005 --- /dev/null +++ b/OFsolvers/birdmultiphaseEulerFoam/1 @@ -0,0 +1,20 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + +# Parse arguments for library compilation +. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments + +numcores=4 +wmake -j $numcores $targetType functionObjects +wmake -j $numcores $targetType interfacialCompositionModels +wmake -j $numcores $targetType interfacialModels +wmake -j $numcores $targetType phaseSystems + + +wmake -j $numcores $targetType multiphaseCompressibleMomentumTransportModels +wmake -j $numcores $targetType multiphaseReactions + +multiphaseEulerFoam/Allwmake $targetType $* + + +#------------------------------------------------------------------------------ diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/Allwclean b/OFsolvers/birdmultiphaseEulerFoam/Allwclean similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/Allwclean rename to OFsolvers/birdmultiphaseEulerFoam/Allwclean diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/Allwmake b/OFsolvers/birdmultiphaseEulerFoam/Allwmake similarity index 98% rename from OFsolvers/applications/birdmultiphaseEulerFoam/Allwmake rename to OFsolvers/birdmultiphaseEulerFoam/Allwmake index 059bd7ad..b62f0005 100755 --- a/OFsolvers/applications/birdmultiphaseEulerFoam/Allwmake +++ b/OFsolvers/birdmultiphaseEulerFoam/Allwmake @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Parse arguments for library compilation . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -numcores=20 +numcores=4 wmake -j $numcores $targetType functionObjects wmake -j $numcores $targetType interfacialCompositionModels wmake -j $numcores $targetType interfacialModels diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/README.md b/OFsolvers/birdmultiphaseEulerFoam/README.md similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/README.md rename to OFsolvers/birdmultiphaseEulerFoam/README.md diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/Make/files b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/Make/options b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.C b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.C rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.H b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.H rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/disengagement/disengagement.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.H b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.H rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseForces/phaseForces.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.H b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.H rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/phaseMap/phaseMap.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H b/OFsolvers/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H rename to OFsolvers/birdmultiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/include/createRDeltaTf.H b/OFsolvers/birdmultiphaseEulerFoam/include/createRDeltaTf.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/include/createRDeltaTf.H rename to OFsolvers/birdmultiphaseEulerFoam/include/createRDeltaTf.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/include/setRDeltaTf.H b/OFsolvers/birdmultiphaseEulerFoam/include/setRDeltaTf.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/include/setRDeltaTf.H rename to OFsolvers/birdmultiphaseEulerFoam/include/setRDeltaTf.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/files b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/options b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Frossling/Frossling.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie/Higbie.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/Higbie_limited/Higbie_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/diffusiveMassTransferModel/diffusiveMassTransferModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer/sphericalDiffusiveMassTransfer.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/diffusiveMassTransferModels/sphericalDiffusiveMassTransfer_limited/sphericalDiffusiveMassTransfer_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry_limited/Henry_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelI.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/saturated/saturated.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/ArdenBuck/ArdenBuck.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/saturationModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/Make/files b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/Make/options b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/Wellek/Wellek.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace/Grace.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Grace_limited/Grace_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Lain/Lain.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/aerosolDrag/aerosolDrag.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/dragModels/timeScaleFilteredDrag/timeScaleFilteredDrag.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/Gunn/Gunn.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall_limited/RanzMarshall_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/sphericalHeatTransfer_limited/sphericalHeatTransfer_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/heatTransferModels/timeScaleFilteredHeatTransfer/timeScaleFilteredHeatTransfer.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/Moraga/Moraga.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/TomiyamaLift_limited/TomiyamaLift_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/liftModel/liftModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/noLift/noLift.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/liftModels/wallDampedLift/wallDampedLift.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/deposition/deposition.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/phaseTransferModels/reactionDriven/reactionDriven.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/noSwarm/noSwarm.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrectionNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns_limited/Burns_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/cosine/cosineWallDamping.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/linear/linearWallDamping.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/sine/sineWallDamping.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallDependentModel/wallDependentModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Antal_limited/Antal_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwclean b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwclean similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwclean rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwclean diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwmake b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwmake similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwmake rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Allwmake diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/CourantNo.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/CourantNo.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/CourantNo.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/CourantNo.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/EEqns.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/EEqns.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/EEqns.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/EEqns.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/files b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/options b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/YEqns.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/YEqns.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/YEqns.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/YEqns.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFieldRefs.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFieldRefs.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFieldRefs.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFieldRefs.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFields.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFields.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFields.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/createFields.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/files b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/multiphaseSystems.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/multiphaseSystems.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/multiphaseSystems.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/multiphaseSystems.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pEqnComps.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pEqnComps.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pEqnComps.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pEqnComps.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/UEqns.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/UEqns.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/UEqns.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/UEqns.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pU/pEqn.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/UEqns.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/UEqns.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/UEqns.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/UEqns.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/pUf/pEqn.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/setRDeltaT.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/setRDeltaT.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseEulerFoam/setRDeltaT.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseEulerFoam/setRDeltaT.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/files b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/files b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/files rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C.dep b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C.dep similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C.dep rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C.dep diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.o b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.o similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.o rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/linux64GccDPInt32Opt/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.o diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/options b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/makephaseSurfaceArrheniusReactions.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/makephaseSurfaceArrheniusReactions.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/makephaseSurfaceArrheniusReactions.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/makephaseSurfaceArrheniusReactions.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRate.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRate.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRate.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRate.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRateI.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRateI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRateI.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/lnInclude/phaseSurfaceArrheniusReactionRateI.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/makephaseSurfaceArrheniusReactions.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRate.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H b/OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H rename to OFsolvers/birdmultiphaseEulerFoam/multiphaseReactions/phaseSurfaceArrheniusReactionRate/phaseSurfaceArrheniusReactionRateI.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethodNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/linear/linear.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/Make/files b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/Make/files similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/Make/files rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/Make/files diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/Make/options b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/Make/options similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/Make/options rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/Make/options diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/heatTransferPhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/OneResistanceHeatTransferPhaseSystem/OneResistanceHeatTransferPhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PhaseTransferPhaseSystem/PhaseTransferPhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/PopulationBalancePhaseSystem/PopulationBalancePhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/TwoResistanceHeatTransferPhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/PhaseSystems/TwoResistanceHeatTransferPhaseSystem/twoResistanceHeatTransferPhaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/alphaContactAngle/alphaContactAngleFvPatchScalarField.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/dummy/dummy.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/phaseChange/IATEphaseChange.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/IATErandomCoalescence.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/IATEturbulentBreakUp.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/IATEwakeEntrainmentCoalescence.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wallBoiling/IATEwallBoiling.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/linearTsubDiameter/linearTsubDiameter.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/sphericalDiameter/sphericalDiameter.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/SecondaryPropertyModel/SecondaryPropertyModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/fractal.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/KochFriedlander/KochFriedlander.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/noSintering/noSintering.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/fractal/sinteringModels/sinteringModel/sinteringModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/shapeModel/shapeModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/shapeModels/spherical/spherical.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroup.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/sizeGroup/sizeGroupI.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroup.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/diameterModels/velocityGroup/velocityGroupI.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/StationaryPhaseModel/StationaryPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModelNew.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModelNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModelNew.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModelNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModels.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/orderedPhasePair/orderedPhasePair.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePair.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePair/phasePairI.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phasePair/phasePairKey/phasePairKey.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemI.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemNew.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemNew.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemNew.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemNew.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemSolve.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/phaseSystem/phaseSystemTemplates.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen/Laakkonen.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/Laakkonen_limited/Laakkonen_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/breakupModel/breakupModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/exponential/exponential.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/powerLaw/powerLaw.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/BrownianCollisions/BrownianCollisions.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/DahnekeInterpolation/DahnekeInterpolation.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence_limited/LehrMilliesMewesCoalescence_limited.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/ballisticCollisions/ballisticCollisions.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/LaakkonenDaughterSizeDistribution/LaakkonenDaughterSizeDistribution.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/constantDrift/constantDrift.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/densityChange/densityChange.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/driftModel/driftModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/reactionDriven/reactionDriven.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H diff --git a/OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H b/OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H similarity index 100% rename from OFsolvers/applications/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H rename to OFsolvers/birdmultiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModelI.H diff --git a/OFsolvers/tutorial_cases/bubble_column/README.md b/OFsolvers/tutorial_cases/bubble_column/README.md deleted file mode 100644 index a63e286f..00000000 --- a/OFsolvers/tutorial_cases/bubble_column/README.md +++ /dev/null @@ -1,6 +0,0 @@ -### Bubble column - - -Single core exec - -1. `bash run.sh` diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/U.gas b/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/U.gas deleted file mode 100644 index ba250bcb..00000000 --- a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/U.gas +++ /dev/null @@ -1,88 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volVectorField; - object U.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0.0 0); - -#include "${FOAM_CASE}/constant/globalVars" - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - //type flowRateInletVelocity; - //massFlowRate $mflowRateGas; - //rho thermo:rho.gas; - //value $internalField; - //type fixedValue; - //value uniform (0 $uGasPhase 0); - type codedFixedValue; - value uniform (0 $uGasPhase 0); - name shutDownAtSteadyState; - - code - #{ - // Only activate when the mean of the holdup satisfies a certain - // condition on the norm. - // Requires tracking the temporal mean in controlDict - if (db().foundObject("alpha.gasMean")) - { - const volScalarField& alpha_mean = db().lookupObject("alpha.gasMean"); - - scalar volume = gSum(mesh().V()); - scalar gas_holdup_mean = gSum(fvc::volumeIntegrate(alpha_mean))/volume; - scalar gas_holdup_mean_old = gSum(fvc::volumeIntegrate(alpha_mean.oldTime()))/volume; - - if ( mag(gas_holdup_mean - gas_holdup_mean_old) < 1e-2 ) - { - if( mag((*this)[0]) > 1e-16 ) - { - Info << "Patch: steady state reached. Shutting down gas inflow.\n";q - } - - operator==(vector(0.,0.,0.)); - } - - } - #} - - codeInclude - #{ - #include "fvCFD.H" - #}; - - codeOptions - #{ - -I$(LIB_SRC)/finiteVolume/lnInclude - #}; - - - } - outlet - { - type pressureInletOutletVelocity; - phi phi.gas; - value $internalField; - } - defaultFaces - { - type slip; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/controlDict b/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/controlDict deleted file mode 100644 index 12efddbe..00000000 --- a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/controlDict +++ /dev/null @@ -1,112 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application multiphaseEulerFoam; - -startFrom latestTime;//startTime; - -startTime 0; - -stopAt endTime; - -endTime 100; - -deltaT 0.0001; - -writeControl adjustableRunTime; - -writeInterval 2; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression off; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - -adjustTimeStep yes; - -maxCo 0.5; - -maxDeltaT 0.0005; - - -functions -{ - - #includeFunc writeObjects(d.gas) - #includeFunc writeObjects(thermo:rho.gas) - #includeFunc writeObjects(thermo:rho.liquid) - - fieldAverage - { - type fieldAverage; - libs (fieldFunctionObjects); - writeControl writeTime; - timeStart 0; - fields - ( - alpha.gas - { - mean on; - prime2Mean off; - base time; - } - ); - }; - - writeHoldup - { - type coded; - libs (utilityFunctionObjects); - active true; - - // Name of on-the-fly generated functionObject - name writeHoldup; - codeWrite - #{ - const volScalarField& alpha_mean = db().lookupObject("alpha.gasMean"); - const volScalarField& alpha = db().lookupObject("alpha.gas"); - - scalar volume = gSum(mesh().V()); - scalar gas_holdup_mean = gSum(fvc::volumeIntegrate(alpha_mean))/volume; - scalar gas_holdup = gSum(fvc::volumeIntegrate(alpha))/volume; - - if (Pstream::master()){ - std::ofstream file; - file.open ("holdup.csv", std::ofstream::out | std::ofstream::app); - file << mesh().time().value() << " , " << gas_holdup - << " , " << gas_holdup_mean << std::endl; - file.close(); - } - #}; - - }; -} -//functions -//{ -// #includeFunc fieldAverage(U.air, U.water, alpha.air, p) -//} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/coflowing_column/README.md b/OFsolvers/tutorial_cases/coflowing_column/README.md deleted file mode 100644 index 2e0c4e59..00000000 --- a/OFsolvers/tutorial_cases/coflowing_column/README.md +++ /dev/null @@ -1,6 +0,0 @@ -### Coflowing column - - -Single core exec - -1. `bash run.sh` diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/OrigfvModels b/OFsolvers/tutorial_cases/coflowing_column/constant/OrigfvModels deleted file mode 100644 index cf6e24de..00000000 --- a/OFsolvers/tutorial_cases/coflowing_column/constant/OrigfvModels +++ /dev/null @@ -1,42 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object fvModels; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//massSource -//{ -// type massSource; -// -// selectionMode cellZone; -// cellZone injection; -// -// massFlowRate 6e-4; -// -// phase gas; -// rho thermo:rho.gas; -// -// fieldValues -// { -// f1.gas 0; -// f2.gas 0; -// f3.gas 1; -// f4.gas 0; -// f5.gas 0; -// U.gas (0 0 0); -// water.gas 0; -// e.gas 0; -// } -//} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/T.air b/OFsolvers/tutorial_cases/loop_reactor/0.orig/T.air deleted file mode 100644 index b71958b1..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/T.air +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - outlet - { - type inletOutlet; - phi phi.air; - inletValue $internalField; - value $internalField; - } - inlet - { - type fixedValue; - value $internalField; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/T.water b/OFsolvers/tutorial_cases/loop_reactor/0.orig/T.water deleted file mode 100644 index da0d6ff6..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/T.water +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 350; - -boundaryField -{ - outlet - { - type inletOutlet; - phi phi.water; - inletValue $internalField; - value $internalField; - } - inlet - { - type fixedValue; - value $internalField; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/U.air b/OFsolvers/tutorial_cases/loop_reactor/0.orig/U.air deleted file mode 100644 index 8bf67bd0..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/U.air +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0.0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0.0 0.025 0.0); - } - outlet - { - type pressureInletOutletVelocity; - phi phi.air; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/U.water b/OFsolvers/tutorial_cases/loop_reactor/0.orig/U.water deleted file mode 100644 index de2877d1..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/U.water +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value $internalField; - } - outlet - { - type pressureInletOutletVelocity; - phi phi.water; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/alpha.air.orig b/OFsolvers/tutorial_cases/loop_reactor/0.orig/alpha.air.orig deleted file mode 100644 index 576f080f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/alpha.air.orig +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object alpha.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0.5; - } - outlet - { - type inletOutlet; - phi phi.air; - inletValue uniform 1; - value uniform 1; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/alpha.water.orig b/OFsolvers/tutorial_cases/loop_reactor/0.orig/alpha.water.orig deleted file mode 100644 index b39ce2b9..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/alpha.water.orig +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alpha.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0.5; - } - outlet - { - type inletOutlet; - phi phi.water; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/p b/OFsolvers/tutorial_cases/loop_reactor/0.orig/p deleted file mode 100644 index b351061b..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/p +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 1e5; - -boundaryField -{ - inlet - { - type calculated; - value $internalField; - } - outlet - { - type calculated; - value $internalField; - } - defaultFaces - { - type calculated; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0.orig/p_rgh b/OFsolvers/tutorial_cases/loop_reactor/0.orig/p_rgh deleted file mode 100644 index 04d06df4..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0.orig/p_rgh +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p_rgh; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 1e5; - -boundaryField -{ - inlet - { - type fixedFluxPressure; - value $internalField; - } - outlet - { - type prghTotalPressure; - p0 $internalField; - U U.air; - phi phi.air; - rho thermo:rho.air; - value $internalField; - } - defaultFaces - { - type fixedFluxPressure; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/T.air b/OFsolvers/tutorial_cases/loop_reactor/0/T.air deleted file mode 100644 index b71958b1..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/T.air +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - outlet - { - type inletOutlet; - phi phi.air; - inletValue $internalField; - value $internalField; - } - inlet - { - type fixedValue; - value $internalField; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/T.water b/OFsolvers/tutorial_cases/loop_reactor/0/T.water deleted file mode 100644 index da0d6ff6..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/T.water +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 350; - -boundaryField -{ - outlet - { - type inletOutlet; - phi phi.water; - inletValue $internalField; - value $internalField; - } - inlet - { - type fixedValue; - value $internalField; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/U.air b/OFsolvers/tutorial_cases/loop_reactor/0/U.air deleted file mode 100644 index 8bf67bd0..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/U.air +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0.0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0.0 0.025 0.0); - } - outlet - { - type pressureInletOutletVelocity; - phi phi.air; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/U.water b/OFsolvers/tutorial_cases/loop_reactor/0/U.water deleted file mode 100644 index de2877d1..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/U.water +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value $internalField; - } - outlet - { - type pressureInletOutletVelocity; - phi phi.water; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/alpha.air.orig b/OFsolvers/tutorial_cases/loop_reactor/0/alpha.air.orig deleted file mode 100644 index 576f080f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/alpha.air.orig +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object alpha.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0.5; - } - outlet - { - type inletOutlet; - phi phi.air; - inletValue uniform 1; - value uniform 1; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/alpha.water.orig b/OFsolvers/tutorial_cases/loop_reactor/0/alpha.water.orig deleted file mode 100644 index b39ce2b9..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/alpha.water.orig +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alpha.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0.5; - } - outlet - { - type inletOutlet; - phi phi.water; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/p b/OFsolvers/tutorial_cases/loop_reactor/0/p deleted file mode 100644 index b351061b..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/p +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 1e5; - -boundaryField -{ - inlet - { - type calculated; - value $internalField; - } - outlet - { - type calculated; - value $internalField; - } - defaultFaces - { - type calculated; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/0/p_rgh b/OFsolvers/tutorial_cases/loop_reactor/0/p_rgh deleted file mode 100644 index 04d06df4..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/0/p_rgh +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p_rgh; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 1e5; - -boundaryField -{ - inlet - { - type fixedFluxPressure; - value $internalField; - } - outlet - { - type prghTotalPressure; - p0 $internalField; - U U.air; - phi phi.air; - rho thermo:rho.air; - value $internalField; - } - defaultFaces - { - type fixedFluxPressure; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/README.md b/OFsolvers/tutorial_cases/loop_reactor/README.md deleted file mode 100644 index bff3133b..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/README.md +++ /dev/null @@ -1,6 +0,0 @@ -### Loop reactor - - -Single core exec - -1. `bash run.sh` diff --git a/OFsolvers/tutorial_cases/loop_reactor/constant/momentumTransport.air b/OFsolvers/tutorial_cases/loop_reactor/constant/momentumTransport.air deleted file mode 100644 index bceba9af..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/constant/momentumTransport.air +++ /dev/null @@ -1,19 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object momentumTransport.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/constant/momentumTransport.water b/OFsolvers/tutorial_cases/loop_reactor/constant/momentumTransport.water deleted file mode 100644 index 05a1ed6f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/constant/momentumTransport.water +++ /dev/null @@ -1,19 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object momentumTransport.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/constant/phaseProperties b/OFsolvers/tutorial_cases/loop_reactor/constant/phaseProperties deleted file mode 100644 index ba8e290d..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/constant/phaseProperties +++ /dev/null @@ -1,147 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object phaseProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -type basicMultiphaseSystem; - -phases (air water); - -referencePhase water; - -air -{ - type purePhaseModel; - diameterModel isothermal; - isothermalCoeffs - { - d0 3e-3; - p0 1e5; - } - - residualAlpha 1e-6; -} - -water -{ - type purePhaseModel; - diameterModel constant; - constantCoeffs - { - d 1e-4; - } - - residualAlpha 1e-6; -} - -blending -{ - default - { - type linear; - minFullyContinuousAlpha.air 0.7; - minPartlyContinuousAlpha.air 0.3; - minFullyContinuousAlpha.water 0.7; - minPartlyContinuousAlpha.water 0.3; - } - - drag - { - type linear; - minFullyContinuousAlpha.air 0.7; - minPartlyContinuousAlpha.air 0.5; - minFullyContinuousAlpha.water 0.7; - minPartlyContinuousAlpha.water 0.5; - } -} - -surfaceTension -( - (air and water) - { - type constant; - sigma 0.07; - } -); - -interfaceCompression -(); - -aspectRatio -( - (air in water) - { - type Wellek; - } -); - -drag -( - (air in water) - { - type SchillerNaumann; - residualRe 1e-3; - } - - (water in air) - { - type SchillerNaumann; - residualRe 1e-3; - } - -); - -virtualMass -( - (air in water) - { - type constantCoefficient; - Cvm 0.5; - } - - (water in air) - { - type constantCoefficient; - Cvm 0.5; - } -); - -heatTransfer -( - (air in water) - { - type RanzMarshall; - residualAlpha 1e-4; - } - - (water in air) - { - type RanzMarshall; - residualAlpha 1e-4; - } -); - -phaseTransfer -(); - -lift -(); - -wallLubrication -(); - -turbulentDispersion -(); - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/constant/thermophysicalProperties.air b/OFsolvers/tutorial_cases/loop_reactor/constant/thermophysicalProperties.air deleted file mode 100644 index 8b6595ef..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/constant/thermophysicalProperties.air +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object physicalProperties.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo hConst; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 28.9; - } - thermodynamics - { - Cp 1007; - Hf 0; - } - transport - { - mu 1.84e-05; - Pr 0.7; - } -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/constant/thermophysicalProperties.water b/OFsolvers/tutorial_cases/loop_reactor/constant/thermophysicalProperties.water deleted file mode 100644 index 8843e086..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/constant/thermophysicalProperties.water +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object physicalProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture pureMixture; - transport const; - thermo eConst; - equationOfState rPolynomial; - specie specie; - energy sensibleInternalEnergy; -} - -mixture -{ - specie - { - molWeight 18; - } - equationOfState - { - C (0.001278 -2.1055e-06 3.9689e-09 4.3772e-13 -2.0225e-16); - } - thermodynamics - { - Cv 4195; - Hf 0; - } - transport - { - mu 3.645e-4; - Pr 2.289; - } -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/run.sh b/OFsolvers/tutorial_cases/loop_reactor/run.sh deleted file mode 100755 index f90c0bcc..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/run.sh +++ /dev/null @@ -1,57 +0,0 @@ -if ! type "python" &> /dev/null; then - echo " could not be found" - echo "Skipping Mesh generation" -else - # Generate blockmeshDict - python ../../../applications/write_block_rect_mesh.py -i ../../../bird/meshing/block_rect_mesh_templates/loopReactor/input.json -o system - - # Generate boundary stl - python ../../../applications/write_stl_patch.py -i ../../../bird/preprocess/stl_patch/bc_patch_mesh_template/loop_reactor_expl/inlets_outlets.json -fi - - -if ! type "blockMesh" &> /dev/null; then - echo " could not be found" - echo "OpenFoam is likely not installed, skipping run" -else - # Clean case - ./Allclean - - # Mesh gen - blockMesh -dict system/blockMeshDict - - # Inlet BC - surfaceToPatch -tol 1e-3 inlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - # Outlet BC - surfaceToPatch -tol 1e-3 outlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - - # Scale - transformPoints "scale=(0.05 0.05 0.05)" - - # setup IC - cp -r 0.orig 0 - setFields - - # Run - birdmultiphaseEulerFoam -fi - - - - diff --git a/OFsolvers/tutorial_cases/loop_reactor/system/blockMeshDict b/OFsolvers/tutorial_cases/loop_reactor/system/blockMeshDict deleted file mode 100644 index 94a55474..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/system/blockMeshDict +++ /dev/null @@ -1,594 +0,0 @@ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} - -convertToMeters 1.0; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -vertices -( -( 0.0 0.0 0.0) -( 1.0 0.0 0.0) -( 2.0 0.0 0.0) -( 3.0 0.0 0.0) -( 4.0 0.0 0.0) -( 5.0 0.0 0.0) -( 6.0 0.0 0.0) -( 7.0 0.0 0.0) -( 8.0 0.0 0.0) -( 9.0 0.0 0.0) -( 10.0 0.0 0.0) -( 0.0 1.0 0.0) -( 1.0 1.0 0.0) -( 2.0 1.0 0.0) -( 3.0 1.0 0.0) -( 4.0 1.0 0.0) -( 5.0 1.0 0.0) -( 6.0 1.0 0.0) -( 7.0 1.0 0.0) -( 8.0 1.0 0.0) -( 9.0 1.0 0.0) -( 10.0 1.0 0.0) -( 0.0 2.0 0.0) -( 1.0 2.0 0.0) -( 2.0 2.0 0.0) -( 3.0 2.0 0.0) -( 4.0 2.0 0.0) -( 5.0 2.0 0.0) -( 6.0 2.0 0.0) -( 7.0 2.0 0.0) -( 8.0 2.0 0.0) -( 9.0 2.0 0.0) -( 10.0 2.0 0.0) -( 0.0 3.0 0.0) -( 1.0 3.0 0.0) -( 2.0 3.0 0.0) -( 3.0 3.0 0.0) -( 4.0 3.0 0.0) -( 5.0 3.0 0.0) -( 6.0 3.0 0.0) -( 7.0 3.0 0.0) -( 8.0 3.0 0.0) -( 9.0 3.0 0.0) -( 10.0 3.0 0.0) -( 0.0 4.0 0.0) -( 1.0 4.0 0.0) -( 2.0 4.0 0.0) -( 3.0 4.0 0.0) -( 4.0 4.0 0.0) -( 5.0 4.0 0.0) -( 6.0 4.0 0.0) -( 7.0 4.0 0.0) -( 8.0 4.0 0.0) -( 9.0 4.0 0.0) -( 10.0 4.0 0.0) -( 0.0 5.0 0.0) -( 1.0 5.0 0.0) -( 2.0 5.0 0.0) -( 3.0 5.0 0.0) -( 4.0 5.0 0.0) -( 5.0 5.0 0.0) -( 6.0 5.0 0.0) -( 7.0 5.0 0.0) -( 8.0 5.0 0.0) -( 9.0 5.0 0.0) -( 10.0 5.0 0.0) -( 0.0 0.0 1.0) -( 1.0 0.0 1.0) -( 2.0 0.0 1.0) -( 3.0 0.0 1.0) -( 4.0 0.0 1.0) -( 5.0 0.0 1.0) -( 6.0 0.0 1.0) -( 7.0 0.0 1.0) -( 8.0 0.0 1.0) -( 9.0 0.0 1.0) -( 10.0 0.0 1.0) -( 0.0 1.0 1.0) -( 1.0 1.0 1.0) -( 2.0 1.0 1.0) -( 3.0 1.0 1.0) -( 4.0 1.0 1.0) -( 5.0 1.0 1.0) -( 6.0 1.0 1.0) -( 7.0 1.0 1.0) -( 8.0 1.0 1.0) -( 9.0 1.0 1.0) -( 10.0 1.0 1.0) -( 0.0 2.0 1.0) -( 1.0 2.0 1.0) -( 2.0 2.0 1.0) -( 3.0 2.0 1.0) -( 4.0 2.0 1.0) -( 5.0 2.0 1.0) -( 6.0 2.0 1.0) -( 7.0 2.0 1.0) -( 8.0 2.0 1.0) -( 9.0 2.0 1.0) -( 10.0 2.0 1.0) -( 0.0 3.0 1.0) -( 1.0 3.0 1.0) -( 2.0 3.0 1.0) -( 3.0 3.0 1.0) -( 4.0 3.0 1.0) -( 5.0 3.0 1.0) -( 6.0 3.0 1.0) -( 7.0 3.0 1.0) -( 8.0 3.0 1.0) -( 9.0 3.0 1.0) -( 10.0 3.0 1.0) -( 0.0 4.0 1.0) -( 1.0 4.0 1.0) -( 2.0 4.0 1.0) -( 3.0 4.0 1.0) -( 4.0 4.0 1.0) -( 5.0 4.0 1.0) -( 6.0 4.0 1.0) -( 7.0 4.0 1.0) -( 8.0 4.0 1.0) -( 9.0 4.0 1.0) -( 10.0 4.0 1.0) -( 0.0 5.0 1.0) -( 1.0 5.0 1.0) -( 2.0 5.0 1.0) -( 3.0 5.0 1.0) -( 4.0 5.0 1.0) -( 5.0 5.0 1.0) -( 6.0 5.0 1.0) -( 7.0 5.0 1.0) -( 8.0 5.0 1.0) -( 9.0 5.0 1.0) -( 10.0 5.0 1.0) -( 0.0 0.0 2.0) -( 1.0 0.0 2.0) -( 2.0 0.0 2.0) -( 3.0 0.0 2.0) -( 4.0 0.0 2.0) -( 5.0 0.0 2.0) -( 6.0 0.0 2.0) -( 7.0 0.0 2.0) -( 8.0 0.0 2.0) -( 9.0 0.0 2.0) -( 10.0 0.0 2.0) -( 0.0 1.0 2.0) -( 1.0 1.0 2.0) -( 2.0 1.0 2.0) -( 3.0 1.0 2.0) -( 4.0 1.0 2.0) -( 5.0 1.0 2.0) -( 6.0 1.0 2.0) -( 7.0 1.0 2.0) -( 8.0 1.0 2.0) -( 9.0 1.0 2.0) -( 10.0 1.0 2.0) -( 0.0 2.0 2.0) -( 1.0 2.0 2.0) -( 2.0 2.0 2.0) -( 3.0 2.0 2.0) -( 4.0 2.0 2.0) -( 5.0 2.0 2.0) -( 6.0 2.0 2.0) -( 7.0 2.0 2.0) -( 8.0 2.0 2.0) -( 9.0 2.0 2.0) -( 10.0 2.0 2.0) -( 0.0 3.0 2.0) -( 1.0 3.0 2.0) -( 2.0 3.0 2.0) -( 3.0 3.0 2.0) -( 4.0 3.0 2.0) -( 5.0 3.0 2.0) -( 6.0 3.0 2.0) -( 7.0 3.0 2.0) -( 8.0 3.0 2.0) -( 9.0 3.0 2.0) -( 10.0 3.0 2.0) -( 0.0 4.0 2.0) -( 1.0 4.0 2.0) -( 2.0 4.0 2.0) -( 3.0 4.0 2.0) -( 4.0 4.0 2.0) -( 5.0 4.0 2.0) -( 6.0 4.0 2.0) -( 7.0 4.0 2.0) -( 8.0 4.0 2.0) -( 9.0 4.0 2.0) -( 10.0 4.0 2.0) -( 0.0 5.0 2.0) -( 1.0 5.0 2.0) -( 2.0 5.0 2.0) -( 3.0 5.0 2.0) -( 4.0 5.0 2.0) -( 5.0 5.0 2.0) -( 6.0 5.0 2.0) -( 7.0 5.0 2.0) -( 8.0 5.0 2.0) -( 9.0 5.0 2.0) -( 10.0 5.0 2.0) -( 0.0 0.0 3.0) -( 1.0 0.0 3.0) -( 2.0 0.0 3.0) -( 3.0 0.0 3.0) -( 4.0 0.0 3.0) -( 5.0 0.0 3.0) -( 6.0 0.0 3.0) -( 7.0 0.0 3.0) -( 8.0 0.0 3.0) -( 9.0 0.0 3.0) -( 10.0 0.0 3.0) -( 0.0 1.0 3.0) -( 1.0 1.0 3.0) -( 2.0 1.0 3.0) -( 3.0 1.0 3.0) -( 4.0 1.0 3.0) -( 5.0 1.0 3.0) -( 6.0 1.0 3.0) -( 7.0 1.0 3.0) -( 8.0 1.0 3.0) -( 9.0 1.0 3.0) -( 10.0 1.0 3.0) -( 0.0 2.0 3.0) -( 1.0 2.0 3.0) -( 2.0 2.0 3.0) -( 3.0 2.0 3.0) -( 4.0 2.0 3.0) -( 5.0 2.0 3.0) -( 6.0 2.0 3.0) -( 7.0 2.0 3.0) -( 8.0 2.0 3.0) -( 9.0 2.0 3.0) -( 10.0 2.0 3.0) -( 0.0 3.0 3.0) -( 1.0 3.0 3.0) -( 2.0 3.0 3.0) -( 3.0 3.0 3.0) -( 4.0 3.0 3.0) -( 5.0 3.0 3.0) -( 6.0 3.0 3.0) -( 7.0 3.0 3.0) -( 8.0 3.0 3.0) -( 9.0 3.0 3.0) -( 10.0 3.0 3.0) -( 0.0 4.0 3.0) -( 1.0 4.0 3.0) -( 2.0 4.0 3.0) -( 3.0 4.0 3.0) -( 4.0 4.0 3.0) -( 5.0 4.0 3.0) -( 6.0 4.0 3.0) -( 7.0 4.0 3.0) -( 8.0 4.0 3.0) -( 9.0 4.0 3.0) -( 10.0 4.0 3.0) -( 0.0 5.0 3.0) -( 1.0 5.0 3.0) -( 2.0 5.0 3.0) -( 3.0 5.0 3.0) -( 4.0 5.0 3.0) -( 5.0 5.0 3.0) -( 6.0 5.0 3.0) -( 7.0 5.0 3.0) -( 8.0 5.0 3.0) -( 9.0 5.0 3.0) -( 10.0 5.0 3.0) -( 0.0 0.0 4.0) -( 1.0 0.0 4.0) -( 2.0 0.0 4.0) -( 3.0 0.0 4.0) -( 4.0 0.0 4.0) -( 5.0 0.0 4.0) -( 6.0 0.0 4.0) -( 7.0 0.0 4.0) -( 8.0 0.0 4.0) -( 9.0 0.0 4.0) -( 10.0 0.0 4.0) -( 0.0 1.0 4.0) -( 1.0 1.0 4.0) -( 2.0 1.0 4.0) -( 3.0 1.0 4.0) -( 4.0 1.0 4.0) -( 5.0 1.0 4.0) -( 6.0 1.0 4.0) -( 7.0 1.0 4.0) -( 8.0 1.0 4.0) -( 9.0 1.0 4.0) -( 10.0 1.0 4.0) -( 0.0 2.0 4.0) -( 1.0 2.0 4.0) -( 2.0 2.0 4.0) -( 3.0 2.0 4.0) -( 4.0 2.0 4.0) -( 5.0 2.0 4.0) -( 6.0 2.0 4.0) -( 7.0 2.0 4.0) -( 8.0 2.0 4.0) -( 9.0 2.0 4.0) -( 10.0 2.0 4.0) -( 0.0 3.0 4.0) -( 1.0 3.0 4.0) -( 2.0 3.0 4.0) -( 3.0 3.0 4.0) -( 4.0 3.0 4.0) -( 5.0 3.0 4.0) -( 6.0 3.0 4.0) -( 7.0 3.0 4.0) -( 8.0 3.0 4.0) -( 9.0 3.0 4.0) -( 10.0 3.0 4.0) -( 0.0 4.0 4.0) -( 1.0 4.0 4.0) -( 2.0 4.0 4.0) -( 3.0 4.0 4.0) -( 4.0 4.0 4.0) -( 5.0 4.0 4.0) -( 6.0 4.0 4.0) -( 7.0 4.0 4.0) -( 8.0 4.0 4.0) -( 9.0 4.0 4.0) -( 10.0 4.0 4.0) -( 0.0 5.0 4.0) -( 1.0 5.0 4.0) -( 2.0 5.0 4.0) -( 3.0 5.0 4.0) -( 4.0 5.0 4.0) -( 5.0 5.0 4.0) -( 6.0 5.0 4.0) -( 7.0 5.0 4.0) -( 8.0 5.0 4.0) -( 9.0 5.0 4.0) -( 10.0 5.0 4.0) -( 0.0 0.0 5.0) -( 1.0 0.0 5.0) -( 2.0 0.0 5.0) -( 3.0 0.0 5.0) -( 4.0 0.0 5.0) -( 5.0 0.0 5.0) -( 6.0 0.0 5.0) -( 7.0 0.0 5.0) -( 8.0 0.0 5.0) -( 9.0 0.0 5.0) -( 10.0 0.0 5.0) -( 0.0 1.0 5.0) -( 1.0 1.0 5.0) -( 2.0 1.0 5.0) -( 3.0 1.0 5.0) -( 4.0 1.0 5.0) -( 5.0 1.0 5.0) -( 6.0 1.0 5.0) -( 7.0 1.0 5.0) -( 8.0 1.0 5.0) -( 9.0 1.0 5.0) -( 10.0 1.0 5.0) -( 0.0 2.0 5.0) -( 1.0 2.0 5.0) -( 2.0 2.0 5.0) -( 3.0 2.0 5.0) -( 4.0 2.0 5.0) -( 5.0 2.0 5.0) -( 6.0 2.0 5.0) -( 7.0 2.0 5.0) -( 8.0 2.0 5.0) -( 9.0 2.0 5.0) -( 10.0 2.0 5.0) -( 0.0 3.0 5.0) -( 1.0 3.0 5.0) -( 2.0 3.0 5.0) -( 3.0 3.0 5.0) -( 4.0 3.0 5.0) -( 5.0 3.0 5.0) -( 6.0 3.0 5.0) -( 7.0 3.0 5.0) -( 8.0 3.0 5.0) -( 9.0 3.0 5.0) -( 10.0 3.0 5.0) -( 0.0 4.0 5.0) -( 1.0 4.0 5.0) -( 2.0 4.0 5.0) -( 3.0 4.0 5.0) -( 4.0 4.0 5.0) -( 5.0 4.0 5.0) -( 6.0 4.0 5.0) -( 7.0 4.0 5.0) -( 8.0 4.0 5.0) -( 9.0 4.0 5.0) -( 10.0 4.0 5.0) -( 0.0 5.0 5.0) -( 1.0 5.0 5.0) -( 2.0 5.0 5.0) -( 3.0 5.0 5.0) -( 4.0 5.0 5.0) -( 5.0 5.0 5.0) -( 6.0 5.0 5.0) -( 7.0 5.0 5.0) -( 8.0 5.0 5.0) -( 9.0 5.0 5.0) -( 10.0 5.0 5.0) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -blocks -( - - //block 0 -hex (0 1 12 11 66 67 78 77 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 1 -hex (1 2 13 12 67 68 79 78 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 2 -hex (2 3 14 13 68 69 80 79 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 3 -hex (3 4 15 14 69 70 81 80 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 4 -hex (4 5 16 15 70 71 82 81 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 5 -hex (5 6 17 16 71 72 83 82 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 6 -hex (6 7 18 17 72 73 84 83 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 7 -hex (7 8 19 18 73 74 85 84 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 8 -hex (8 9 20 19 74 75 86 85 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 9 -hex (9 10 21 20 75 76 87 86 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 10 -hex (75 76 87 86 141 142 153 152 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 11 -hex (141 142 153 152 207 208 219 218 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 12 -hex (207 208 219 218 273 274 285 284 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 13 -hex (273 274 285 284 339 340 351 350 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 14 -hex (272 273 284 283 338 339 350 349 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 15 -hex (271 272 283 282 337 338 349 348 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 16 -hex (270 271 282 281 336 337 348 347 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 17 -hex (269 270 281 280 335 336 347 346 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 18 -hex (268 269 280 279 334 335 346 345 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 19 -hex (267 268 279 278 333 334 345 344 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 20 -hex (266 267 278 277 332 333 344 343 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 21 -hex (265 266 277 276 331 332 343 342 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 22 -hex (264 265 276 275 330 331 342 341 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 23 -hex (275 276 287 286 341 342 353 352 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 24 -hex (286 287 298 297 352 353 364 363 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 25 -hex (297 298 309 308 363 364 375 374 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 26 -hex (308 309 320 319 374 375 386 385 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 27 -hex (242 243 254 253 308 309 320 319 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 28 -hex (176 177 188 187 242 243 254 253 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 29 -hex (110 111 122 121 176 177 188 187 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 30 -hex (44 45 56 55 110 111 122 121 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 31 -hex (33 34 45 44 99 100 111 110 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 32 -hex (22 23 34 33 88 89 100 99 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 33 -hex (11 12 23 22 77 78 89 88 ) -( 10 10 10 ) -SimpleGrading (1 1 1) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultPatch -{ type wall;} - -patches -( -); diff --git a/OFsolvers/tutorial_cases/loop_reactor/system/controlDict b/OFsolvers/tutorial_cases/loop_reactor/system/controlDict deleted file mode 100644 index 66306ff7..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/system/controlDict +++ /dev/null @@ -1,59 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application multiphaseEulerFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 100; - -deltaT 0.005; - -writeControl runTime; - -writeInterval 1; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression off; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - -adjustTimeStep yes; - -maxCo 0.5; - -maxDeltaT 1; - -//functions -//{ -// #includeFunc fieldAverage(U.air, U.water, alpha.air, p) -//} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/system/fvConstraints b/OFsolvers/tutorial_cases/loop_reactor/system/fvConstraints deleted file mode 100644 index 164c3e0b..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/system/fvConstraints +++ /dev/null @@ -1,23 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - object fvConstraints; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -limitp -{ - type limitPressure; - - min 1e4; -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/system/fvSchemes b/OFsolvers/tutorial_cases/loop_reactor/system/fvSchemes deleted file mode 100644 index 806a9d3d..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/system/fvSchemes +++ /dev/null @@ -1,63 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; -} - -divSchemes -{ - default none; - - "div\(phi,alpha.*\)" Gauss vanLeer; - - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; - - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - - "div\(alphaRhoPhi.*,e.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1; - - - - "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear uncorrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default uncorrected; -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/system/fvSolution b/OFsolvers/tutorial_cases/loop_reactor/system/fvSolution deleted file mode 100644 index 9523801f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/system/fvSolution +++ /dev/null @@ -1,75 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - "alpha.*" - { - nAlphaCorr 1; - nAlphaSubCycles 2; - } - - p_rgh - { - solver GAMG; - smoother DIC; - tolerance 1e-8; - relTol 0; - } - - p_rghFinal - { - $p_rgh; - relTol 0; - } - - "U.*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-5; - relTol 0; - minIter 1; - } - - "e.*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-8; - relTol 0; - minIter 1; - } -} - -PIMPLE -{ - nOuterCorrectors 3; - nCorrectors 1; - nNonOrthogonalCorrectors 0; - -} - -relaxationFactors -{ - equations - { - ".*" 1; - } -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor/system/setFieldsDict b/OFsolvers/tutorial_cases/loop_reactor/system/setFieldsDict deleted file mode 100644 index 97350461..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor/system/setFieldsDict +++ /dev/null @@ -1,37 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object setFieldsDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defaultFieldValues -( - volScalarFieldValue alpha.air 1 - volScalarFieldValue alpha.water 0 -); - -regions -( - boxToCell - { - box (-1.0 -1.0 -1.0) (10 0.15 10.0); - fieldValues - ( - volScalarFieldValue alpha.air 0 - volScalarFieldValue alpha.water 1 - ); - } -); - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/CO2.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/CO2.gas deleted file mode 100644 index 6636f550..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/CO2.gas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object CO2.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $f_CO2; - - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type fixedValue; - value uniform $f_CO2; - } - - outlet - { - //type inletOutlet; - //phi phi.gas; - //inletValue $f_CO2; - //value $f_CO2; - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/N2.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/N2.gas deleted file mode 100644 index b841c3df..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/N2.gas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object N2.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $f_N2; - - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type fixedValue; - value uniform $f_N2; - } - - outlet - { - //type inletOutlet; - //phi phi.gas; - //inletValue $f_N2; - //value $f_N2; - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.air b/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.air deleted file mode 100644 index 8bf67bd0..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.air +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0.0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0.0 0.025 0.0); - } - outlet - { - type pressureInletOutletVelocity; - phi phi.air; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.water b/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.water deleted file mode 100644 index de2877d1..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.water +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value $internalField; - } - outlet - { - type pressureInletOutletVelocity; - phi phi.water; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars_tempvar b/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars_tempvar deleted file mode 100644 index 61fa6e5e..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars_tempvar +++ /dev/null @@ -1,82 +0,0 @@ -T0 300; //initial T(K) which stays constant -//****water Liquid properties************** -CpMixLiq 4181; -muMixLiq #calc "2.414e-5 * pow(10,247.8/($T0 - 140.0))"; //viscosity (Pa.s) of water as a function of T(K) -kThermLiq 0.62; // W/m-K -rho0MixLiq 1000; // kg/m^3 -sigmaLiq 0.07; //surface tension N/m -//Wilke-Chang params for diffusion coefficient of a given solute in water (solvent) -WC_psi 2.6; -WC_M 18; // kg/kmol -WC_V_O2 25.6e-3; // m3/kmol molar volume at normal boiling temperature (Treybal 1968) -WC_V_H2 14.3e-3; -WC_V_CO2 34e-3; -WC_V_CO 30.7e-3; -WC_V_N2 31.2e-3; -WC_V_CH4 35e-3; // V_b[cm3/mol]=0.285*V_critical^1.048 (Tyn and Calus; ESTIMATING LIQUID MOLAL VOLUME; Processing, Volume 21, Issue 4, Pages 16 - 17) -//****** diffusion coeff *********** -D_H2 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_H2,0.6)"; -D_CO2 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_CO2,0.6)"; -D_CO #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_CO,0.6)"; -D_CH4 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_CH4,0.6)"; -D_N2 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_N2,0.6)"; -//****** Henry coeff *************** -H_O2_298 0.032; -DH_O2 1700; -H_CO2_298 0.83; -DH_CO2 2400; -H_CO_298 0.023; -DH_CO 1300; -H_H2_298 0.019; -DH_H2 500; -H_CH4_298 0.032; -DH_CH4 1900; -H_N2_298 0.015; -DH_N2 1300; -He_H2 #calc "$H_H2_298 * exp($DH_H2 *(1. / $T0 - 1./298.15))"; -He_CO #calc "$H_CO_298 * exp($DH_CO *(1. / $T0 - 1./298.15))"; -He_CO2 #calc "$H_CO2_298 * exp($DH_CO2 *(1. / $T0 - 1./298.15))"; -He_CH4 #calc "$H_CH4_298 * exp($DH_CH4 *(1. / $T0 - 1./298.15))"; -He_N2 #calc "$H_N2_298 * exp($DH_N2 *(1. / $T0 - 1./298.15))"; -//*******inlet gas frac************* -x_N2 0.522; -x_CO2 0.478; -f_N2 #calc "$x_N2*0.028 / ($x_CO2*0.044 + $x_N2*0.028)"; -f_CO2 #calc "$x_CO2*0.044 / ($x_CO2*0.044 + $x_N2*0.028)"; -//*******inlet gas frac************* -uGasPhase 0.025; -alphaGas 1; -alphaLiq 0; -uGasPhase #calc "$uGasPhase / $alphaGas"; -//********************************* -LeLiqH2 #calc "$kThermLiq / $rho0MixLiq / $D_H2 / $CpMixLiq"; -LeLiqCO #calc "$kThermLiq / $rho0MixLiq / $D_CO / $CpMixLiq"; -LeLiqCO2 #calc "$kThermLiq / $rho0MixLiq / $D_CO2 / $CpMixLiq"; // = 74 -LeLiqCH4 #calc "$kThermLiq / $rho0MixLiq / $D_CH4 / $CpMixLiq"; -LeLiqN2 #calc "$kThermLiq / $rho0MixLiq / $D_N2 / $CpMixLiq"; -LeLiqMix #calc "$f_CO2*$LeLiqCO2+$f_N2*$LeLiqN2"; -PrMixLiq #calc "$CpMixLiq * $muMixLiq / $kThermLiq"; -//********************************* -kH2 #calc "$D_H2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrH2 #calc "$muMixLiq*$CpMixLiq / $kH2"; - -kCO #calc "$D_CO*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrCO #calc "$muMixLiq*$CpMixLiq / $kCO"; - -kCO2 #calc "$D_CO2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrCO2 #calc "$muMixLiq*$CpMixLiq / $kCO2"; - -kCH4 #calc "$D_CH4*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrCH4 #calc "$muMixLiq*$CpMixLiq / $kCH4"; - -kN2 #calc "$D_N2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrN2 #calc "$muMixLiq*$CpMixLiq / $kN2"; -//********************************* -l_scale 0.5; -intensity 0.05; -k_inlet_gas #calc "1.5 * Foam::pow(($uGasPhase), 2) * Foam::pow($intensity, 2)"; -k_inlet_liq #calc "1.5 * Foam::pow(($uGasPhase), 2) * Foam::pow($intensity, 2)"; -eps_inlet_gas #calc "pow(0.09,0.75) * Foam::pow($k_inlet_gas, 1.5) / ($l_scale * 0.07)"; -eps_inlet_liq #calc "pow(0.09,0.75) * Foam::pow($k_inlet_liq, 1.5) / ($l_scale * 0.07)"; -omega_inlet_gas #calc "pow(0.09,-0.25) * pow($k_inlet_gas,0.5) / ($l_scale * 0.07)"; -omega_inlet_liq #calc "pow(0.09,-0.25) * pow($k_inlet_liq,0.5) / ($l_scale * 0.07)"; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/thermophysicalProperties.liquid b/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/thermophysicalProperties.liquid deleted file mode 100644 index e697904f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/thermophysicalProperties.liquid +++ /dev/null @@ -1,85 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "$FOAM_CASE/constant/globalVars" - -thermoType -{ - type heRhoThermo; - mixture multiComponentMixture; - transport const; - thermo eConst; - equationOfState rhoConst;//rPolynomial; - specie specie; - energy sensibleInternalEnergy; - //energy sensibleEnthalpy; -} - -species -( - CO2 - water -); - -inertSpecie water; - -"(mixture|water)" -{ - specie - { - molWeight 18.0153; - } - equationOfState - { - rho $rho0MixLiq; - } - thermodynamics - { - Cv $CpMixLiq; - Hf -1.5879e+07; - } - transport - { - mu $muMixLiq; - Pr 2.289; - } -} - -CO2 -{ - specie - { - molWeight 44.00995; - } - equationOfState - { - rho 997; - } - thermodynamics - { - Cv $CpMixLiq; - Hf -1.5879e+07; - } - transport - { - mu $muMixLiq; - Pr $PrCO2; - } -} - - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/run.sh b/OFsolvers/tutorial_cases/loop_reactor_pbe/run.sh deleted file mode 100644 index f90c0bcc..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/run.sh +++ /dev/null @@ -1,57 +0,0 @@ -if ! type "python" &> /dev/null; then - echo " could not be found" - echo "Skipping Mesh generation" -else - # Generate blockmeshDict - python ../../../applications/write_block_rect_mesh.py -i ../../../bird/meshing/block_rect_mesh_templates/loopReactor/input.json -o system - - # Generate boundary stl - python ../../../applications/write_stl_patch.py -i ../../../bird/preprocess/stl_patch/bc_patch_mesh_template/loop_reactor_expl/inlets_outlets.json -fi - - -if ! type "blockMesh" &> /dev/null; then - echo " could not be found" - echo "OpenFoam is likely not installed, skipping run" -else - # Clean case - ./Allclean - - # Mesh gen - blockMesh -dict system/blockMeshDict - - # Inlet BC - surfaceToPatch -tol 1e-3 inlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - # Outlet BC - surfaceToPatch -tol 1e-3 outlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - - # Scale - transformPoints "scale=(0.05 0.05 0.05)" - - # setup IC - cp -r 0.orig 0 - setFields - - # Run - birdmultiphaseEulerFoam -fi - - - - diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/blockMeshDict b/OFsolvers/tutorial_cases/loop_reactor_pbe/system/blockMeshDict deleted file mode 100644 index 94a55474..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/blockMeshDict +++ /dev/null @@ -1,594 +0,0 @@ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} - -convertToMeters 1.0; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -vertices -( -( 0.0 0.0 0.0) -( 1.0 0.0 0.0) -( 2.0 0.0 0.0) -( 3.0 0.0 0.0) -( 4.0 0.0 0.0) -( 5.0 0.0 0.0) -( 6.0 0.0 0.0) -( 7.0 0.0 0.0) -( 8.0 0.0 0.0) -( 9.0 0.0 0.0) -( 10.0 0.0 0.0) -( 0.0 1.0 0.0) -( 1.0 1.0 0.0) -( 2.0 1.0 0.0) -( 3.0 1.0 0.0) -( 4.0 1.0 0.0) -( 5.0 1.0 0.0) -( 6.0 1.0 0.0) -( 7.0 1.0 0.0) -( 8.0 1.0 0.0) -( 9.0 1.0 0.0) -( 10.0 1.0 0.0) -( 0.0 2.0 0.0) -( 1.0 2.0 0.0) -( 2.0 2.0 0.0) -( 3.0 2.0 0.0) -( 4.0 2.0 0.0) -( 5.0 2.0 0.0) -( 6.0 2.0 0.0) -( 7.0 2.0 0.0) -( 8.0 2.0 0.0) -( 9.0 2.0 0.0) -( 10.0 2.0 0.0) -( 0.0 3.0 0.0) -( 1.0 3.0 0.0) -( 2.0 3.0 0.0) -( 3.0 3.0 0.0) -( 4.0 3.0 0.0) -( 5.0 3.0 0.0) -( 6.0 3.0 0.0) -( 7.0 3.0 0.0) -( 8.0 3.0 0.0) -( 9.0 3.0 0.0) -( 10.0 3.0 0.0) -( 0.0 4.0 0.0) -( 1.0 4.0 0.0) -( 2.0 4.0 0.0) -( 3.0 4.0 0.0) -( 4.0 4.0 0.0) -( 5.0 4.0 0.0) -( 6.0 4.0 0.0) -( 7.0 4.0 0.0) -( 8.0 4.0 0.0) -( 9.0 4.0 0.0) -( 10.0 4.0 0.0) -( 0.0 5.0 0.0) -( 1.0 5.0 0.0) -( 2.0 5.0 0.0) -( 3.0 5.0 0.0) -( 4.0 5.0 0.0) -( 5.0 5.0 0.0) -( 6.0 5.0 0.0) -( 7.0 5.0 0.0) -( 8.0 5.0 0.0) -( 9.0 5.0 0.0) -( 10.0 5.0 0.0) -( 0.0 0.0 1.0) -( 1.0 0.0 1.0) -( 2.0 0.0 1.0) -( 3.0 0.0 1.0) -( 4.0 0.0 1.0) -( 5.0 0.0 1.0) -( 6.0 0.0 1.0) -( 7.0 0.0 1.0) -( 8.0 0.0 1.0) -( 9.0 0.0 1.0) -( 10.0 0.0 1.0) -( 0.0 1.0 1.0) -( 1.0 1.0 1.0) -( 2.0 1.0 1.0) -( 3.0 1.0 1.0) -( 4.0 1.0 1.0) -( 5.0 1.0 1.0) -( 6.0 1.0 1.0) -( 7.0 1.0 1.0) -( 8.0 1.0 1.0) -( 9.0 1.0 1.0) -( 10.0 1.0 1.0) -( 0.0 2.0 1.0) -( 1.0 2.0 1.0) -( 2.0 2.0 1.0) -( 3.0 2.0 1.0) -( 4.0 2.0 1.0) -( 5.0 2.0 1.0) -( 6.0 2.0 1.0) -( 7.0 2.0 1.0) -( 8.0 2.0 1.0) -( 9.0 2.0 1.0) -( 10.0 2.0 1.0) -( 0.0 3.0 1.0) -( 1.0 3.0 1.0) -( 2.0 3.0 1.0) -( 3.0 3.0 1.0) -( 4.0 3.0 1.0) -( 5.0 3.0 1.0) -( 6.0 3.0 1.0) -( 7.0 3.0 1.0) -( 8.0 3.0 1.0) -( 9.0 3.0 1.0) -( 10.0 3.0 1.0) -( 0.0 4.0 1.0) -( 1.0 4.0 1.0) -( 2.0 4.0 1.0) -( 3.0 4.0 1.0) -( 4.0 4.0 1.0) -( 5.0 4.0 1.0) -( 6.0 4.0 1.0) -( 7.0 4.0 1.0) -( 8.0 4.0 1.0) -( 9.0 4.0 1.0) -( 10.0 4.0 1.0) -( 0.0 5.0 1.0) -( 1.0 5.0 1.0) -( 2.0 5.0 1.0) -( 3.0 5.0 1.0) -( 4.0 5.0 1.0) -( 5.0 5.0 1.0) -( 6.0 5.0 1.0) -( 7.0 5.0 1.0) -( 8.0 5.0 1.0) -( 9.0 5.0 1.0) -( 10.0 5.0 1.0) -( 0.0 0.0 2.0) -( 1.0 0.0 2.0) -( 2.0 0.0 2.0) -( 3.0 0.0 2.0) -( 4.0 0.0 2.0) -( 5.0 0.0 2.0) -( 6.0 0.0 2.0) -( 7.0 0.0 2.0) -( 8.0 0.0 2.0) -( 9.0 0.0 2.0) -( 10.0 0.0 2.0) -( 0.0 1.0 2.0) -( 1.0 1.0 2.0) -( 2.0 1.0 2.0) -( 3.0 1.0 2.0) -( 4.0 1.0 2.0) -( 5.0 1.0 2.0) -( 6.0 1.0 2.0) -( 7.0 1.0 2.0) -( 8.0 1.0 2.0) -( 9.0 1.0 2.0) -( 10.0 1.0 2.0) -( 0.0 2.0 2.0) -( 1.0 2.0 2.0) -( 2.0 2.0 2.0) -( 3.0 2.0 2.0) -( 4.0 2.0 2.0) -( 5.0 2.0 2.0) -( 6.0 2.0 2.0) -( 7.0 2.0 2.0) -( 8.0 2.0 2.0) -( 9.0 2.0 2.0) -( 10.0 2.0 2.0) -( 0.0 3.0 2.0) -( 1.0 3.0 2.0) -( 2.0 3.0 2.0) -( 3.0 3.0 2.0) -( 4.0 3.0 2.0) -( 5.0 3.0 2.0) -( 6.0 3.0 2.0) -( 7.0 3.0 2.0) -( 8.0 3.0 2.0) -( 9.0 3.0 2.0) -( 10.0 3.0 2.0) -( 0.0 4.0 2.0) -( 1.0 4.0 2.0) -( 2.0 4.0 2.0) -( 3.0 4.0 2.0) -( 4.0 4.0 2.0) -( 5.0 4.0 2.0) -( 6.0 4.0 2.0) -( 7.0 4.0 2.0) -( 8.0 4.0 2.0) -( 9.0 4.0 2.0) -( 10.0 4.0 2.0) -( 0.0 5.0 2.0) -( 1.0 5.0 2.0) -( 2.0 5.0 2.0) -( 3.0 5.0 2.0) -( 4.0 5.0 2.0) -( 5.0 5.0 2.0) -( 6.0 5.0 2.0) -( 7.0 5.0 2.0) -( 8.0 5.0 2.0) -( 9.0 5.0 2.0) -( 10.0 5.0 2.0) -( 0.0 0.0 3.0) -( 1.0 0.0 3.0) -( 2.0 0.0 3.0) -( 3.0 0.0 3.0) -( 4.0 0.0 3.0) -( 5.0 0.0 3.0) -( 6.0 0.0 3.0) -( 7.0 0.0 3.0) -( 8.0 0.0 3.0) -( 9.0 0.0 3.0) -( 10.0 0.0 3.0) -( 0.0 1.0 3.0) -( 1.0 1.0 3.0) -( 2.0 1.0 3.0) -( 3.0 1.0 3.0) -( 4.0 1.0 3.0) -( 5.0 1.0 3.0) -( 6.0 1.0 3.0) -( 7.0 1.0 3.0) -( 8.0 1.0 3.0) -( 9.0 1.0 3.0) -( 10.0 1.0 3.0) -( 0.0 2.0 3.0) -( 1.0 2.0 3.0) -( 2.0 2.0 3.0) -( 3.0 2.0 3.0) -( 4.0 2.0 3.0) -( 5.0 2.0 3.0) -( 6.0 2.0 3.0) -( 7.0 2.0 3.0) -( 8.0 2.0 3.0) -( 9.0 2.0 3.0) -( 10.0 2.0 3.0) -( 0.0 3.0 3.0) -( 1.0 3.0 3.0) -( 2.0 3.0 3.0) -( 3.0 3.0 3.0) -( 4.0 3.0 3.0) -( 5.0 3.0 3.0) -( 6.0 3.0 3.0) -( 7.0 3.0 3.0) -( 8.0 3.0 3.0) -( 9.0 3.0 3.0) -( 10.0 3.0 3.0) -( 0.0 4.0 3.0) -( 1.0 4.0 3.0) -( 2.0 4.0 3.0) -( 3.0 4.0 3.0) -( 4.0 4.0 3.0) -( 5.0 4.0 3.0) -( 6.0 4.0 3.0) -( 7.0 4.0 3.0) -( 8.0 4.0 3.0) -( 9.0 4.0 3.0) -( 10.0 4.0 3.0) -( 0.0 5.0 3.0) -( 1.0 5.0 3.0) -( 2.0 5.0 3.0) -( 3.0 5.0 3.0) -( 4.0 5.0 3.0) -( 5.0 5.0 3.0) -( 6.0 5.0 3.0) -( 7.0 5.0 3.0) -( 8.0 5.0 3.0) -( 9.0 5.0 3.0) -( 10.0 5.0 3.0) -( 0.0 0.0 4.0) -( 1.0 0.0 4.0) -( 2.0 0.0 4.0) -( 3.0 0.0 4.0) -( 4.0 0.0 4.0) -( 5.0 0.0 4.0) -( 6.0 0.0 4.0) -( 7.0 0.0 4.0) -( 8.0 0.0 4.0) -( 9.0 0.0 4.0) -( 10.0 0.0 4.0) -( 0.0 1.0 4.0) -( 1.0 1.0 4.0) -( 2.0 1.0 4.0) -( 3.0 1.0 4.0) -( 4.0 1.0 4.0) -( 5.0 1.0 4.0) -( 6.0 1.0 4.0) -( 7.0 1.0 4.0) -( 8.0 1.0 4.0) -( 9.0 1.0 4.0) -( 10.0 1.0 4.0) -( 0.0 2.0 4.0) -( 1.0 2.0 4.0) -( 2.0 2.0 4.0) -( 3.0 2.0 4.0) -( 4.0 2.0 4.0) -( 5.0 2.0 4.0) -( 6.0 2.0 4.0) -( 7.0 2.0 4.0) -( 8.0 2.0 4.0) -( 9.0 2.0 4.0) -( 10.0 2.0 4.0) -( 0.0 3.0 4.0) -( 1.0 3.0 4.0) -( 2.0 3.0 4.0) -( 3.0 3.0 4.0) -( 4.0 3.0 4.0) -( 5.0 3.0 4.0) -( 6.0 3.0 4.0) -( 7.0 3.0 4.0) -( 8.0 3.0 4.0) -( 9.0 3.0 4.0) -( 10.0 3.0 4.0) -( 0.0 4.0 4.0) -( 1.0 4.0 4.0) -( 2.0 4.0 4.0) -( 3.0 4.0 4.0) -( 4.0 4.0 4.0) -( 5.0 4.0 4.0) -( 6.0 4.0 4.0) -( 7.0 4.0 4.0) -( 8.0 4.0 4.0) -( 9.0 4.0 4.0) -( 10.0 4.0 4.0) -( 0.0 5.0 4.0) -( 1.0 5.0 4.0) -( 2.0 5.0 4.0) -( 3.0 5.0 4.0) -( 4.0 5.0 4.0) -( 5.0 5.0 4.0) -( 6.0 5.0 4.0) -( 7.0 5.0 4.0) -( 8.0 5.0 4.0) -( 9.0 5.0 4.0) -( 10.0 5.0 4.0) -( 0.0 0.0 5.0) -( 1.0 0.0 5.0) -( 2.0 0.0 5.0) -( 3.0 0.0 5.0) -( 4.0 0.0 5.0) -( 5.0 0.0 5.0) -( 6.0 0.0 5.0) -( 7.0 0.0 5.0) -( 8.0 0.0 5.0) -( 9.0 0.0 5.0) -( 10.0 0.0 5.0) -( 0.0 1.0 5.0) -( 1.0 1.0 5.0) -( 2.0 1.0 5.0) -( 3.0 1.0 5.0) -( 4.0 1.0 5.0) -( 5.0 1.0 5.0) -( 6.0 1.0 5.0) -( 7.0 1.0 5.0) -( 8.0 1.0 5.0) -( 9.0 1.0 5.0) -( 10.0 1.0 5.0) -( 0.0 2.0 5.0) -( 1.0 2.0 5.0) -( 2.0 2.0 5.0) -( 3.0 2.0 5.0) -( 4.0 2.0 5.0) -( 5.0 2.0 5.0) -( 6.0 2.0 5.0) -( 7.0 2.0 5.0) -( 8.0 2.0 5.0) -( 9.0 2.0 5.0) -( 10.0 2.0 5.0) -( 0.0 3.0 5.0) -( 1.0 3.0 5.0) -( 2.0 3.0 5.0) -( 3.0 3.0 5.0) -( 4.0 3.0 5.0) -( 5.0 3.0 5.0) -( 6.0 3.0 5.0) -( 7.0 3.0 5.0) -( 8.0 3.0 5.0) -( 9.0 3.0 5.0) -( 10.0 3.0 5.0) -( 0.0 4.0 5.0) -( 1.0 4.0 5.0) -( 2.0 4.0 5.0) -( 3.0 4.0 5.0) -( 4.0 4.0 5.0) -( 5.0 4.0 5.0) -( 6.0 4.0 5.0) -( 7.0 4.0 5.0) -( 8.0 4.0 5.0) -( 9.0 4.0 5.0) -( 10.0 4.0 5.0) -( 0.0 5.0 5.0) -( 1.0 5.0 5.0) -( 2.0 5.0 5.0) -( 3.0 5.0 5.0) -( 4.0 5.0 5.0) -( 5.0 5.0 5.0) -( 6.0 5.0 5.0) -( 7.0 5.0 5.0) -( 8.0 5.0 5.0) -( 9.0 5.0 5.0) -( 10.0 5.0 5.0) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -blocks -( - - //block 0 -hex (0 1 12 11 66 67 78 77 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 1 -hex (1 2 13 12 67 68 79 78 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 2 -hex (2 3 14 13 68 69 80 79 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 3 -hex (3 4 15 14 69 70 81 80 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 4 -hex (4 5 16 15 70 71 82 81 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 5 -hex (5 6 17 16 71 72 83 82 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 6 -hex (6 7 18 17 72 73 84 83 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 7 -hex (7 8 19 18 73 74 85 84 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 8 -hex (8 9 20 19 74 75 86 85 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 9 -hex (9 10 21 20 75 76 87 86 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 10 -hex (75 76 87 86 141 142 153 152 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 11 -hex (141 142 153 152 207 208 219 218 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 12 -hex (207 208 219 218 273 274 285 284 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 13 -hex (273 274 285 284 339 340 351 350 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 14 -hex (272 273 284 283 338 339 350 349 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 15 -hex (271 272 283 282 337 338 349 348 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 16 -hex (270 271 282 281 336 337 348 347 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 17 -hex (269 270 281 280 335 336 347 346 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 18 -hex (268 269 280 279 334 335 346 345 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 19 -hex (267 268 279 278 333 334 345 344 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 20 -hex (266 267 278 277 332 333 344 343 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 21 -hex (265 266 277 276 331 332 343 342 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 22 -hex (264 265 276 275 330 331 342 341 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 23 -hex (275 276 287 286 341 342 353 352 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 24 -hex (286 287 298 297 352 353 364 363 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 25 -hex (297 298 309 308 363 364 375 374 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 26 -hex (308 309 320 319 374 375 386 385 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 27 -hex (242 243 254 253 308 309 320 319 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 28 -hex (176 177 188 187 242 243 254 253 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 29 -hex (110 111 122 121 176 177 188 187 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 30 -hex (44 45 56 55 110 111 122 121 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 31 -hex (33 34 45 44 99 100 111 110 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 32 -hex (22 23 34 33 88 89 100 99 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 33 -hex (11 12 23 22 77 78 89 88 ) -( 10 10 10 ) -SimpleGrading (1 1 1) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultPatch -{ type wall;} - -patches -( -); diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvSchemes b/OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvSchemes deleted file mode 100644 index c094dedb..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvSchemes +++ /dev/null @@ -1,71 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object fvSchemes; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -ddtSchemes -{ - default Euler; -} - -gradSchemes -{ - default Gauss linear; - limited cellLimited Gauss linear 1; -} - -divSchemes -{ - default none; - - "div\(phi,alpha.*\)" Gauss vanLeer; - - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; - - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; - "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(K|k|epsilon|omega).*\)" Gauss limitedLinear 1; - "div\(alphaPhi.*,f.*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1; - - - "div\(phim,(k|epsilon)m\)" Gauss limitedLinear 1; - "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; -} - -laplacianSchemes -{ - default Gauss linear corrected; -} - -interpolationSchemes -{ - default linear; -} - -snGradSchemes -{ - default uncorrected; -} - -wallDist -{ - method Poisson; - nRequired true; -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/setFieldsDict b/OFsolvers/tutorial_cases/loop_reactor_pbe/system/setFieldsDict deleted file mode 100644 index 07cb1d6d..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/setFieldsDict +++ /dev/null @@ -1,37 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object setFieldsDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defaultFieldValues -( - volScalarFieldValue alpha.gas 1 - volScalarFieldValue alpha.liquid 0 -); - -regions -( - boxToCell - { - box (-1.0 -1.0 -1.0) (10 0.15 10.0); - fieldValues - ( - volScalarFieldValue alpha.gas 0 - volScalarFieldValue alpha.liquid 1 - ); - } -); - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/CO2.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/CO2.gas deleted file mode 100644 index 6636f550..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/CO2.gas +++ /dev/null @@ -1,47 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object CO2.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $f_CO2; - - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type fixedValue; - value uniform $f_CO2; - } - - outlet - { - //type inletOutlet; - //phi phi.gas; - //inletValue $f_CO2; - //value $f_CO2; - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.air b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.air deleted file mode 100644 index 8bf67bd0..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.air +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0.0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0.0 0.025 0.0); - } - outlet - { - type pressureInletOutletVelocity; - phi phi.air; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.liquid b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.liquid deleted file mode 100644 index 637e6ac2..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.liquid +++ /dev/null @@ -1,49 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volVectorField; - object U.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform (0 0 0); - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - //type flowRateInletVelocity; - //massFlowRate $mflowRateLiq; - //rho thermo:rho.liquid; - //value $internalField; - type fixedValue; - value uniform (0 0 0); - } - outlet - { - type pressureInletOutletVelocity; - phi phi.liquid; - value uniform (0 0 0); - //value $internalField; - } - defaultFaces - { - type noSlip; - } - -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.water b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.water deleted file mode 100644 index de2877d1..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.water +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value $internalField; - } - outlet - { - type pressureInletOutletVelocity; - phi phi.water; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alpha.liquid b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alpha.liquid deleted file mode 100644 index 7a301a82..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alpha.liquid +++ /dev/null @@ -1,42 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alpha.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform 1; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform $alphaLiq; - } - outlet - { - type inletOutlet; - phi phi.liquid; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/Allclean b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/Allclean deleted file mode 100755 index 4003a12b..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/Allclean +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -# Remove surface, features and solution -#rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -#rm -f constant/triSurface/*.eMesh > /dev/null 2>&1 -#rm -rf constant/polyMesh > /dev/null 2>&1 -#rm -rf processor* > /dev/null 2>&1 -rm -rf 0 -cleanCase - -#------------------------------------------------------------------------------ diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/fvModels b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/fvModels deleted file mode 100644 index 41ddc998..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/fvModels +++ /dev/null @@ -1,69 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 3.0.x | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 9.0; - format ascii; - class dictionary; - location "constant"; - object fvModels; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -codedSource -{ - type coded; - selectionMode all; - field U.liquid; - name sourceTime; - - //codeAddSup - codeAddAlphaRhoSup - #{ - const Time& time = mesh().time(); - const scalarField& V = mesh().V(); - vectorField& Usource = eqn.source(); - const vectorField& C = mesh().C(); - const volScalarField& rhoL = - mesh().lookupObject("thermo:rho.liquid"); - - const volScalarField& alphaL = - mesh().lookupObject("alpha.liquid"); - - double pi=3.141592654; - double source_pt_x=0.025; - double source_pt_y=0.07; - double source_pt_z=0.025; - double disk_rad=0.015; - double disk_area=pi*disk_rad*disk_rad; - double power=300; - double smear_factor=3.0; - const scalar startTime = 1.0; - if (time.value() > startTime) - { - forAll(C,i) - { - double v2=pow((4.0*power/rhoL[i]/disk_area),0.333333); - double Thrust=0.5*rhoL[i]*v2*v2*disk_area; - - double dist2=(C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); - dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); - dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); - - double epsilon=pow(V[i],0.33333)*smear_factor; - double sourceterm=alphaL[i]*(Thrust/pow(pi,1.5)/pow(epsilon,3.0))* - exp(-dist2/(epsilon*epsilon)); - - Usource[i][1] += sourceterm*V[i]; - - } - } - - #}; -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/globalVars b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/globalVars deleted file mode 100644 index 61fa6e5e..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/globalVars +++ /dev/null @@ -1,82 +0,0 @@ -T0 300; //initial T(K) which stays constant -//****water Liquid properties************** -CpMixLiq 4181; -muMixLiq #calc "2.414e-5 * pow(10,247.8/($T0 - 140.0))"; //viscosity (Pa.s) of water as a function of T(K) -kThermLiq 0.62; // W/m-K -rho0MixLiq 1000; // kg/m^3 -sigmaLiq 0.07; //surface tension N/m -//Wilke-Chang params for diffusion coefficient of a given solute in water (solvent) -WC_psi 2.6; -WC_M 18; // kg/kmol -WC_V_O2 25.6e-3; // m3/kmol molar volume at normal boiling temperature (Treybal 1968) -WC_V_H2 14.3e-3; -WC_V_CO2 34e-3; -WC_V_CO 30.7e-3; -WC_V_N2 31.2e-3; -WC_V_CH4 35e-3; // V_b[cm3/mol]=0.285*V_critical^1.048 (Tyn and Calus; ESTIMATING LIQUID MOLAL VOLUME; Processing, Volume 21, Issue 4, Pages 16 - 17) -//****** diffusion coeff *********** -D_H2 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_H2,0.6)"; -D_CO2 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_CO2,0.6)"; -D_CO #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_CO,0.6)"; -D_CH4 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_CH4,0.6)"; -D_N2 #calc "1.173e-16 * pow($WC_psi * $WC_M,0.5) * $T0 / $muMixLiq / pow($WC_V_N2,0.6)"; -//****** Henry coeff *************** -H_O2_298 0.032; -DH_O2 1700; -H_CO2_298 0.83; -DH_CO2 2400; -H_CO_298 0.023; -DH_CO 1300; -H_H2_298 0.019; -DH_H2 500; -H_CH4_298 0.032; -DH_CH4 1900; -H_N2_298 0.015; -DH_N2 1300; -He_H2 #calc "$H_H2_298 * exp($DH_H2 *(1. / $T0 - 1./298.15))"; -He_CO #calc "$H_CO_298 * exp($DH_CO *(1. / $T0 - 1./298.15))"; -He_CO2 #calc "$H_CO2_298 * exp($DH_CO2 *(1. / $T0 - 1./298.15))"; -He_CH4 #calc "$H_CH4_298 * exp($DH_CH4 *(1. / $T0 - 1./298.15))"; -He_N2 #calc "$H_N2_298 * exp($DH_N2 *(1. / $T0 - 1./298.15))"; -//*******inlet gas frac************* -x_N2 0.522; -x_CO2 0.478; -f_N2 #calc "$x_N2*0.028 / ($x_CO2*0.044 + $x_N2*0.028)"; -f_CO2 #calc "$x_CO2*0.044 / ($x_CO2*0.044 + $x_N2*0.028)"; -//*******inlet gas frac************* -uGasPhase 0.025; -alphaGas 1; -alphaLiq 0; -uGasPhase #calc "$uGasPhase / $alphaGas"; -//********************************* -LeLiqH2 #calc "$kThermLiq / $rho0MixLiq / $D_H2 / $CpMixLiq"; -LeLiqCO #calc "$kThermLiq / $rho0MixLiq / $D_CO / $CpMixLiq"; -LeLiqCO2 #calc "$kThermLiq / $rho0MixLiq / $D_CO2 / $CpMixLiq"; // = 74 -LeLiqCH4 #calc "$kThermLiq / $rho0MixLiq / $D_CH4 / $CpMixLiq"; -LeLiqN2 #calc "$kThermLiq / $rho0MixLiq / $D_N2 / $CpMixLiq"; -LeLiqMix #calc "$f_CO2*$LeLiqCO2+$f_N2*$LeLiqN2"; -PrMixLiq #calc "$CpMixLiq * $muMixLiq / $kThermLiq"; -//********************************* -kH2 #calc "$D_H2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrH2 #calc "$muMixLiq*$CpMixLiq / $kH2"; - -kCO #calc "$D_CO*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrCO #calc "$muMixLiq*$CpMixLiq / $kCO"; - -kCO2 #calc "$D_CO2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrCO2 #calc "$muMixLiq*$CpMixLiq / $kCO2"; - -kCH4 #calc "$D_CH4*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrCH4 #calc "$muMixLiq*$CpMixLiq / $kCH4"; - -kN2 #calc "$D_N2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; -PrN2 #calc "$muMixLiq*$CpMixLiq / $kN2"; -//********************************* -l_scale 0.5; -intensity 0.05; -k_inlet_gas #calc "1.5 * Foam::pow(($uGasPhase), 2) * Foam::pow($intensity, 2)"; -k_inlet_liq #calc "1.5 * Foam::pow(($uGasPhase), 2) * Foam::pow($intensity, 2)"; -eps_inlet_gas #calc "pow(0.09,0.75) * Foam::pow($k_inlet_gas, 1.5) / ($l_scale * 0.07)"; -eps_inlet_liq #calc "pow(0.09,0.75) * Foam::pow($k_inlet_liq, 1.5) / ($l_scale * 0.07)"; -omega_inlet_gas #calc "pow(0.09,-0.25) * pow($k_inlet_gas,0.5) / ($l_scale * 0.07)"; -omega_inlet_liq #calc "pow(0.09,-0.25) * pow($k_inlet_liq,0.5) / ($l_scale * 0.07)"; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/thermophysicalProperties.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/thermophysicalProperties.gas deleted file mode 100644 index 10b5b74b..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/thermophysicalProperties.gas +++ /dev/null @@ -1,116 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object thermophysicalProperties.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -thermoType -{ - type heRhoThermo; - mixture multiComponentMixture; - transport sutherland; - thermo janaf; - equationOfState perfectGas; - specie specie; - energy sensibleInternalEnergy; - //energy sensibleEnthalpy; -} - - -species -( - CO2 - N2 -); - -defaultSpecie CO2; - -CO2 -{ - specie - { - molWeight 44.00995; - } - thermodynamics - { - Tlow 200; - Thigh 3500; - Tcommon 1000; - highCpCoeffs ( 3.85746029 0.00441437026 -2.21481404e-06 5.23490188e-10 -4.72084164e-14 -48759.166 2.27163806 ); - lowCpCoeffs ( 2.35677352 0.00898459677 -7.12356269e-06 2.45919022e-09 -1.43699548e-13 -48371.9697 9.90105222 ); - } - transport - { - As 1.572e-06; - Ts 240; - } - elements - { - C 1; - O 2; - } -} - -water -{ - specie - { - molWeight 18.01534; - } - thermodynamics - { - Tlow 200; - Thigh 3500; - Tcommon 1000; - highCpCoeffs ( 3.03399249 0.00217691804 -1.64072518e-07 -9.7041987e-11 1.68200992e-14 -30004.2971 4.9667701 ); - lowCpCoeffs ( 4.19864056 -0.0020364341 6.52040211e-06 -5.48797062e-09 1.77197817e-12 -30293.7267 -0.849032208 ); - } - transport - { - As 1.512e-06; - Ts 120; - } - elements - { - H 2; - O 1; - } -} - -N2 -{ - specie - { - molWeight 28.0134; - } - thermodynamics - { - Tlow 250; - Thigh 5000; - Tcommon 1000; - highCpCoeffs ( 2.92664 0.0014879768 -5.68476e-07 1.0097038e-10 -6.753351e-15 -922.7977 5.980528 ); - lowCpCoeffs ( 3.298677 0.0014082404 -3.963222e-06 5.641515e-09 -2.444854e-12 -1020.8999 3.950372 ); - } - transport - { - As 1.512e-06; - Ts 120; - } - elements - { - N 2; - } -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/run.sh b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/run.sh deleted file mode 100644 index f90c0bcc..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/run.sh +++ /dev/null @@ -1,57 +0,0 @@ -if ! type "python" &> /dev/null; then - echo " could not be found" - echo "Skipping Mesh generation" -else - # Generate blockmeshDict - python ../../../applications/write_block_rect_mesh.py -i ../../../bird/meshing/block_rect_mesh_templates/loopReactor/input.json -o system - - # Generate boundary stl - python ../../../applications/write_stl_patch.py -i ../../../bird/preprocess/stl_patch/bc_patch_mesh_template/loop_reactor_expl/inlets_outlets.json -fi - - -if ! type "blockMesh" &> /dev/null; then - echo " could not be found" - echo "OpenFoam is likely not installed, skipping run" -else - # Clean case - ./Allclean - - # Mesh gen - blockMesh -dict system/blockMeshDict - - # Inlet BC - surfaceToPatch -tol 1e-3 inlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - # Outlet BC - surfaceToPatch -tol 1e-3 outlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - - # Scale - transformPoints "scale=(0.05 0.05 0.05)" - - # setup IC - cp -r 0.orig 0 - setFields - - # Run - birdmultiphaseEulerFoam -fi - - - - diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/blockMeshDict b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/blockMeshDict deleted file mode 100644 index 94a55474..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/blockMeshDict +++ /dev/null @@ -1,594 +0,0 @@ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} - -convertToMeters 1.0; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -vertices -( -( 0.0 0.0 0.0) -( 1.0 0.0 0.0) -( 2.0 0.0 0.0) -( 3.0 0.0 0.0) -( 4.0 0.0 0.0) -( 5.0 0.0 0.0) -( 6.0 0.0 0.0) -( 7.0 0.0 0.0) -( 8.0 0.0 0.0) -( 9.0 0.0 0.0) -( 10.0 0.0 0.0) -( 0.0 1.0 0.0) -( 1.0 1.0 0.0) -( 2.0 1.0 0.0) -( 3.0 1.0 0.0) -( 4.0 1.0 0.0) -( 5.0 1.0 0.0) -( 6.0 1.0 0.0) -( 7.0 1.0 0.0) -( 8.0 1.0 0.0) -( 9.0 1.0 0.0) -( 10.0 1.0 0.0) -( 0.0 2.0 0.0) -( 1.0 2.0 0.0) -( 2.0 2.0 0.0) -( 3.0 2.0 0.0) -( 4.0 2.0 0.0) -( 5.0 2.0 0.0) -( 6.0 2.0 0.0) -( 7.0 2.0 0.0) -( 8.0 2.0 0.0) -( 9.0 2.0 0.0) -( 10.0 2.0 0.0) -( 0.0 3.0 0.0) -( 1.0 3.0 0.0) -( 2.0 3.0 0.0) -( 3.0 3.0 0.0) -( 4.0 3.0 0.0) -( 5.0 3.0 0.0) -( 6.0 3.0 0.0) -( 7.0 3.0 0.0) -( 8.0 3.0 0.0) -( 9.0 3.0 0.0) -( 10.0 3.0 0.0) -( 0.0 4.0 0.0) -( 1.0 4.0 0.0) -( 2.0 4.0 0.0) -( 3.0 4.0 0.0) -( 4.0 4.0 0.0) -( 5.0 4.0 0.0) -( 6.0 4.0 0.0) -( 7.0 4.0 0.0) -( 8.0 4.0 0.0) -( 9.0 4.0 0.0) -( 10.0 4.0 0.0) -( 0.0 5.0 0.0) -( 1.0 5.0 0.0) -( 2.0 5.0 0.0) -( 3.0 5.0 0.0) -( 4.0 5.0 0.0) -( 5.0 5.0 0.0) -( 6.0 5.0 0.0) -( 7.0 5.0 0.0) -( 8.0 5.0 0.0) -( 9.0 5.0 0.0) -( 10.0 5.0 0.0) -( 0.0 0.0 1.0) -( 1.0 0.0 1.0) -( 2.0 0.0 1.0) -( 3.0 0.0 1.0) -( 4.0 0.0 1.0) -( 5.0 0.0 1.0) -( 6.0 0.0 1.0) -( 7.0 0.0 1.0) -( 8.0 0.0 1.0) -( 9.0 0.0 1.0) -( 10.0 0.0 1.0) -( 0.0 1.0 1.0) -( 1.0 1.0 1.0) -( 2.0 1.0 1.0) -( 3.0 1.0 1.0) -( 4.0 1.0 1.0) -( 5.0 1.0 1.0) -( 6.0 1.0 1.0) -( 7.0 1.0 1.0) -( 8.0 1.0 1.0) -( 9.0 1.0 1.0) -( 10.0 1.0 1.0) -( 0.0 2.0 1.0) -( 1.0 2.0 1.0) -( 2.0 2.0 1.0) -( 3.0 2.0 1.0) -( 4.0 2.0 1.0) -( 5.0 2.0 1.0) -( 6.0 2.0 1.0) -( 7.0 2.0 1.0) -( 8.0 2.0 1.0) -( 9.0 2.0 1.0) -( 10.0 2.0 1.0) -( 0.0 3.0 1.0) -( 1.0 3.0 1.0) -( 2.0 3.0 1.0) -( 3.0 3.0 1.0) -( 4.0 3.0 1.0) -( 5.0 3.0 1.0) -( 6.0 3.0 1.0) -( 7.0 3.0 1.0) -( 8.0 3.0 1.0) -( 9.0 3.0 1.0) -( 10.0 3.0 1.0) -( 0.0 4.0 1.0) -( 1.0 4.0 1.0) -( 2.0 4.0 1.0) -( 3.0 4.0 1.0) -( 4.0 4.0 1.0) -( 5.0 4.0 1.0) -( 6.0 4.0 1.0) -( 7.0 4.0 1.0) -( 8.0 4.0 1.0) -( 9.0 4.0 1.0) -( 10.0 4.0 1.0) -( 0.0 5.0 1.0) -( 1.0 5.0 1.0) -( 2.0 5.0 1.0) -( 3.0 5.0 1.0) -( 4.0 5.0 1.0) -( 5.0 5.0 1.0) -( 6.0 5.0 1.0) -( 7.0 5.0 1.0) -( 8.0 5.0 1.0) -( 9.0 5.0 1.0) -( 10.0 5.0 1.0) -( 0.0 0.0 2.0) -( 1.0 0.0 2.0) -( 2.0 0.0 2.0) -( 3.0 0.0 2.0) -( 4.0 0.0 2.0) -( 5.0 0.0 2.0) -( 6.0 0.0 2.0) -( 7.0 0.0 2.0) -( 8.0 0.0 2.0) -( 9.0 0.0 2.0) -( 10.0 0.0 2.0) -( 0.0 1.0 2.0) -( 1.0 1.0 2.0) -( 2.0 1.0 2.0) -( 3.0 1.0 2.0) -( 4.0 1.0 2.0) -( 5.0 1.0 2.0) -( 6.0 1.0 2.0) -( 7.0 1.0 2.0) -( 8.0 1.0 2.0) -( 9.0 1.0 2.0) -( 10.0 1.0 2.0) -( 0.0 2.0 2.0) -( 1.0 2.0 2.0) -( 2.0 2.0 2.0) -( 3.0 2.0 2.0) -( 4.0 2.0 2.0) -( 5.0 2.0 2.0) -( 6.0 2.0 2.0) -( 7.0 2.0 2.0) -( 8.0 2.0 2.0) -( 9.0 2.0 2.0) -( 10.0 2.0 2.0) -( 0.0 3.0 2.0) -( 1.0 3.0 2.0) -( 2.0 3.0 2.0) -( 3.0 3.0 2.0) -( 4.0 3.0 2.0) -( 5.0 3.0 2.0) -( 6.0 3.0 2.0) -( 7.0 3.0 2.0) -( 8.0 3.0 2.0) -( 9.0 3.0 2.0) -( 10.0 3.0 2.0) -( 0.0 4.0 2.0) -( 1.0 4.0 2.0) -( 2.0 4.0 2.0) -( 3.0 4.0 2.0) -( 4.0 4.0 2.0) -( 5.0 4.0 2.0) -( 6.0 4.0 2.0) -( 7.0 4.0 2.0) -( 8.0 4.0 2.0) -( 9.0 4.0 2.0) -( 10.0 4.0 2.0) -( 0.0 5.0 2.0) -( 1.0 5.0 2.0) -( 2.0 5.0 2.0) -( 3.0 5.0 2.0) -( 4.0 5.0 2.0) -( 5.0 5.0 2.0) -( 6.0 5.0 2.0) -( 7.0 5.0 2.0) -( 8.0 5.0 2.0) -( 9.0 5.0 2.0) -( 10.0 5.0 2.0) -( 0.0 0.0 3.0) -( 1.0 0.0 3.0) -( 2.0 0.0 3.0) -( 3.0 0.0 3.0) -( 4.0 0.0 3.0) -( 5.0 0.0 3.0) -( 6.0 0.0 3.0) -( 7.0 0.0 3.0) -( 8.0 0.0 3.0) -( 9.0 0.0 3.0) -( 10.0 0.0 3.0) -( 0.0 1.0 3.0) -( 1.0 1.0 3.0) -( 2.0 1.0 3.0) -( 3.0 1.0 3.0) -( 4.0 1.0 3.0) -( 5.0 1.0 3.0) -( 6.0 1.0 3.0) -( 7.0 1.0 3.0) -( 8.0 1.0 3.0) -( 9.0 1.0 3.0) -( 10.0 1.0 3.0) -( 0.0 2.0 3.0) -( 1.0 2.0 3.0) -( 2.0 2.0 3.0) -( 3.0 2.0 3.0) -( 4.0 2.0 3.0) -( 5.0 2.0 3.0) -( 6.0 2.0 3.0) -( 7.0 2.0 3.0) -( 8.0 2.0 3.0) -( 9.0 2.0 3.0) -( 10.0 2.0 3.0) -( 0.0 3.0 3.0) -( 1.0 3.0 3.0) -( 2.0 3.0 3.0) -( 3.0 3.0 3.0) -( 4.0 3.0 3.0) -( 5.0 3.0 3.0) -( 6.0 3.0 3.0) -( 7.0 3.0 3.0) -( 8.0 3.0 3.0) -( 9.0 3.0 3.0) -( 10.0 3.0 3.0) -( 0.0 4.0 3.0) -( 1.0 4.0 3.0) -( 2.0 4.0 3.0) -( 3.0 4.0 3.0) -( 4.0 4.0 3.0) -( 5.0 4.0 3.0) -( 6.0 4.0 3.0) -( 7.0 4.0 3.0) -( 8.0 4.0 3.0) -( 9.0 4.0 3.0) -( 10.0 4.0 3.0) -( 0.0 5.0 3.0) -( 1.0 5.0 3.0) -( 2.0 5.0 3.0) -( 3.0 5.0 3.0) -( 4.0 5.0 3.0) -( 5.0 5.0 3.0) -( 6.0 5.0 3.0) -( 7.0 5.0 3.0) -( 8.0 5.0 3.0) -( 9.0 5.0 3.0) -( 10.0 5.0 3.0) -( 0.0 0.0 4.0) -( 1.0 0.0 4.0) -( 2.0 0.0 4.0) -( 3.0 0.0 4.0) -( 4.0 0.0 4.0) -( 5.0 0.0 4.0) -( 6.0 0.0 4.0) -( 7.0 0.0 4.0) -( 8.0 0.0 4.0) -( 9.0 0.0 4.0) -( 10.0 0.0 4.0) -( 0.0 1.0 4.0) -( 1.0 1.0 4.0) -( 2.0 1.0 4.0) -( 3.0 1.0 4.0) -( 4.0 1.0 4.0) -( 5.0 1.0 4.0) -( 6.0 1.0 4.0) -( 7.0 1.0 4.0) -( 8.0 1.0 4.0) -( 9.0 1.0 4.0) -( 10.0 1.0 4.0) -( 0.0 2.0 4.0) -( 1.0 2.0 4.0) -( 2.0 2.0 4.0) -( 3.0 2.0 4.0) -( 4.0 2.0 4.0) -( 5.0 2.0 4.0) -( 6.0 2.0 4.0) -( 7.0 2.0 4.0) -( 8.0 2.0 4.0) -( 9.0 2.0 4.0) -( 10.0 2.0 4.0) -( 0.0 3.0 4.0) -( 1.0 3.0 4.0) -( 2.0 3.0 4.0) -( 3.0 3.0 4.0) -( 4.0 3.0 4.0) -( 5.0 3.0 4.0) -( 6.0 3.0 4.0) -( 7.0 3.0 4.0) -( 8.0 3.0 4.0) -( 9.0 3.0 4.0) -( 10.0 3.0 4.0) -( 0.0 4.0 4.0) -( 1.0 4.0 4.0) -( 2.0 4.0 4.0) -( 3.0 4.0 4.0) -( 4.0 4.0 4.0) -( 5.0 4.0 4.0) -( 6.0 4.0 4.0) -( 7.0 4.0 4.0) -( 8.0 4.0 4.0) -( 9.0 4.0 4.0) -( 10.0 4.0 4.0) -( 0.0 5.0 4.0) -( 1.0 5.0 4.0) -( 2.0 5.0 4.0) -( 3.0 5.0 4.0) -( 4.0 5.0 4.0) -( 5.0 5.0 4.0) -( 6.0 5.0 4.0) -( 7.0 5.0 4.0) -( 8.0 5.0 4.0) -( 9.0 5.0 4.0) -( 10.0 5.0 4.0) -( 0.0 0.0 5.0) -( 1.0 0.0 5.0) -( 2.0 0.0 5.0) -( 3.0 0.0 5.0) -( 4.0 0.0 5.0) -( 5.0 0.0 5.0) -( 6.0 0.0 5.0) -( 7.0 0.0 5.0) -( 8.0 0.0 5.0) -( 9.0 0.0 5.0) -( 10.0 0.0 5.0) -( 0.0 1.0 5.0) -( 1.0 1.0 5.0) -( 2.0 1.0 5.0) -( 3.0 1.0 5.0) -( 4.0 1.0 5.0) -( 5.0 1.0 5.0) -( 6.0 1.0 5.0) -( 7.0 1.0 5.0) -( 8.0 1.0 5.0) -( 9.0 1.0 5.0) -( 10.0 1.0 5.0) -( 0.0 2.0 5.0) -( 1.0 2.0 5.0) -( 2.0 2.0 5.0) -( 3.0 2.0 5.0) -( 4.0 2.0 5.0) -( 5.0 2.0 5.0) -( 6.0 2.0 5.0) -( 7.0 2.0 5.0) -( 8.0 2.0 5.0) -( 9.0 2.0 5.0) -( 10.0 2.0 5.0) -( 0.0 3.0 5.0) -( 1.0 3.0 5.0) -( 2.0 3.0 5.0) -( 3.0 3.0 5.0) -( 4.0 3.0 5.0) -( 5.0 3.0 5.0) -( 6.0 3.0 5.0) -( 7.0 3.0 5.0) -( 8.0 3.0 5.0) -( 9.0 3.0 5.0) -( 10.0 3.0 5.0) -( 0.0 4.0 5.0) -( 1.0 4.0 5.0) -( 2.0 4.0 5.0) -( 3.0 4.0 5.0) -( 4.0 4.0 5.0) -( 5.0 4.0 5.0) -( 6.0 4.0 5.0) -( 7.0 4.0 5.0) -( 8.0 4.0 5.0) -( 9.0 4.0 5.0) -( 10.0 4.0 5.0) -( 0.0 5.0 5.0) -( 1.0 5.0 5.0) -( 2.0 5.0 5.0) -( 3.0 5.0 5.0) -( 4.0 5.0 5.0) -( 5.0 5.0 5.0) -( 6.0 5.0 5.0) -( 7.0 5.0 5.0) -( 8.0 5.0 5.0) -( 9.0 5.0 5.0) -( 10.0 5.0 5.0) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -blocks -( - - //block 0 -hex (0 1 12 11 66 67 78 77 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 1 -hex (1 2 13 12 67 68 79 78 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 2 -hex (2 3 14 13 68 69 80 79 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 3 -hex (3 4 15 14 69 70 81 80 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 4 -hex (4 5 16 15 70 71 82 81 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 5 -hex (5 6 17 16 71 72 83 82 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 6 -hex (6 7 18 17 72 73 84 83 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 7 -hex (7 8 19 18 73 74 85 84 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 8 -hex (8 9 20 19 74 75 86 85 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 9 -hex (9 10 21 20 75 76 87 86 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 10 -hex (75 76 87 86 141 142 153 152 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 11 -hex (141 142 153 152 207 208 219 218 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 12 -hex (207 208 219 218 273 274 285 284 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 13 -hex (273 274 285 284 339 340 351 350 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 14 -hex (272 273 284 283 338 339 350 349 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 15 -hex (271 272 283 282 337 338 349 348 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 16 -hex (270 271 282 281 336 337 348 347 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 17 -hex (269 270 281 280 335 336 347 346 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 18 -hex (268 269 280 279 334 335 346 345 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 19 -hex (267 268 279 278 333 334 345 344 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 20 -hex (266 267 278 277 332 333 344 343 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 21 -hex (265 266 277 276 331 332 343 342 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 22 -hex (264 265 276 275 330 331 342 341 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 23 -hex (275 276 287 286 341 342 353 352 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 24 -hex (286 287 298 297 352 353 364 363 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 25 -hex (297 298 309 308 363 364 375 374 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 26 -hex (308 309 320 319 374 375 386 385 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 27 -hex (242 243 254 253 308 309 320 319 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 28 -hex (176 177 188 187 242 243 254 253 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 29 -hex (110 111 122 121 176 177 188 187 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 30 -hex (44 45 56 55 110 111 122 121 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 31 -hex (33 34 45 44 99 100 111 110 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 32 -hex (22 23 34 33 88 89 100 99 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 33 -hex (11 12 23 22 77 78 89 88 ) -( 10 10 10 ) -SimpleGrading (1 1 1) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultPatch -{ type wall;} - -patches -( -); diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/controlDict b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/controlDict deleted file mode 100644 index f5166614..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/controlDict +++ /dev/null @@ -1,59 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object controlDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -application multiphaseEulerFoam; - -startFrom startTime; - -startTime 0; - -stopAt endTime; - -endTime 100; - -deltaT 0.0001; - -writeControl runTime; - -writeInterval 1; - -purgeWrite 0; - -writeFormat ascii; - -writePrecision 6; - -writeCompression off; - -timeFormat general; - -timePrecision 6; - -runTimeModifiable yes; - -adjustTimeStep yes; - -maxCo 0.5; - -maxDeltaT 0.0005; - -//functions -//{ -// #includeFunc fieldAverage(U.air, U.water, alpha.air, p) -//} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/decomposeParDict b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/decomposeParDict deleted file mode 100755 index a1cfef65..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/decomposeParDict +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 3.0.x | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object decomposeParDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 16; - -method hierarchical; - -hierarchicalCoeffs -{ - n (4 4 1); - delta 0.001; - order xyz; -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvSolution b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvSolution deleted file mode 100644 index 12592abf..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvSolution +++ /dev/null @@ -1,119 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object fvSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - "alpha.*" - { - nAlphaCorr 1; - nAlphaSubCycles 4; - } - - bubbles - { - nCorr 1; - tolerance 1e-4; - scale true; - solveOnFinalIterOnly true; - sourceUpdateInterval 1; - } - - p_rgh - { - solver GAMG; - smoother DIC; - tolerance 1e-8; - relTol 0; - } - - p_rghFinal - { - $p_rgh; - relTol 0; - } - - "(k|omega).*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-7; - relTol 0; - minIter 1; - } - - "(e|h).*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-8; - relTol 0; - minIter 1; - } - - "f.*" - { - solver PBiCGStab; - preconditioner DILU; - tolerance 1e-6; - relTol 0; - } - - "Yi.*" - { - solver PBiCGStab; - preconditioner DILU; - tolerance 1e-12; - relTol 0; - residualAlpha 1e-8; - } - - "U.*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-5; - relTol 0; - minIter 1; - } - - yPsi - { - solver PCG; - preconditioner DIC; - tolerance 1e-10; - relTol 0; - } - -} - -PIMPLE -{ - nOuterCorrectors 3; - nCorrectors 1; - nNonOrthogonalCorrectors 0; - -} - -relaxationFactors -{ - equations - { - ".*" 1; - } -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/CO2.liquid b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/CO2.liquid deleted file mode 100644 index 4b8ea6a0..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/CO2.liquid +++ /dev/null @@ -1,42 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object CO2.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.0; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type zeroGradient; - //type fixedValue; - //value uniform 0.0; - } - - outlet - { - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/T.liquid b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/T.liquid deleted file mode 100644 index 7101ea31..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/T.liquid +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - outlet - { - type inletOutlet; - phi phi.liquid; - inletValue $internalField; - value $internalField; - } - inlet - { - type fixedValue; - value $internalField; - } - defaultFaces - { - type zeroGradient; - } - -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.air b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.air deleted file mode 100644 index 8bf67bd0..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.air +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0.0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0.0 0.025 0.0); - } - outlet - { - type pressureInletOutletVelocity; - phi phi.air; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.water b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.water deleted file mode 100644 index de2877d1..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.water +++ /dev/null @@ -1,40 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format binary; - class volVectorField; - object U.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value $internalField; - } - outlet - { - type pressureInletOutletVelocity; - phi phi.water; - value $internalField; - } - defaultFaces - { - type fixedValue; - value uniform (0 0 0); - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alpha.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alpha.gas deleted file mode 100644 index 1e303fbe..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alpha.gas +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object alpha.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $alphaGas; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform $alphaGas; - } - outlet - { - type inletOutlet; - phi phi.gas; - inletValue uniform 1; - value uniform 1; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alpha.liquid b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alpha.liquid deleted file mode 100644 index 7a301a82..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alpha.liquid +++ /dev/null @@ -1,42 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alpha.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform 1; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform $alphaLiq; - } - outlet - { - type inletOutlet; - phi phi.liquid; - inletValue uniform 0; - value uniform 0; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alphat.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alphat.gas deleted file mode 100644 index b867958f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alphat.gas +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alphat.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type calculated; - value $internalField; - } - - outlet - { - type calculated; - value $internalField; - } - - defaultFaces - { - type calculated; - value $internalField; - //type compressible::alphatWallFunction; - //Prt 0.85; - //value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/epsilon.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/epsilon.gas deleted file mode 100644 index 707a1cda..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/epsilon.gas +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object epsilon.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -3 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $eps_inlet_gas; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform $eps_inlet_gas; - } - - outlet - { - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - //type epsilonWallFunction; - //value $internalField; - } - - // defaultFaces - // { - // type empty; - // } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/k.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/k.gas deleted file mode 100644 index 4a3d44ca..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/k.gas +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object k.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $k_inlet_gas; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type fixedValue; - value uniform $k_inlet_gas; - } - - outlet - { - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/nut.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/nut.gas deleted file mode 100644 index ba16dd4c..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/nut.gas +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object nut.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 1e-8; - -boundaryField -{ - inlet - { - type calculated; - value $internalField; - } - - outlet - { - type calculated; - value $internalField; - } - - defaultFaces - { - //type nutkWallFunction; - //value $internalField; - type calculated; - value $internalField; - } - - // defaultFaces - // { - // type empty; - // } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/p b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/p deleted file mode 100644 index b3a295fb..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/p +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 101325; - -boundaryField -{ - inlet - { - type calculated; - value $internalField; - } - outlet - { - type calculated; - value $internalField; - } - defaultFaces - { - type calculated; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/p_rgh b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/p_rgh deleted file mode 100644 index 88ee7d80..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/p_rgh +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p_rgh; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 101325; - -boundaryField -{ - inlet - { - type fixedFluxPressure; - value $internalField; - } - outlet - { - type prghTotalPressure; - p0 $internalField; - U U.gas; - phi phi.gas; - rho thermo:rho.gas; - value $internalField; - } - defaultFaces - { - type fixedFluxPressure; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/fvModels b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/fvModels deleted file mode 100644 index be989a25..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/fvModels +++ /dev/null @@ -1,128 +0,0 @@ -FoamFile -{ - version 9.0; - format ascii; - class dictionary; - location "constant"; - object fvModels; -} - -codedSource -{ - type coded; - selectionMode all; - field U.liquid; - name sourceTime; - - codeInclude - #{ - #include "dynamicMix_util.H" - #}; - - codeOptions - #{ - -I${FOAM_CASE}/constant - #}; - codeAddAlphaRhoSup - #{ - const Time& time = mesh().time(); - const scalarField& V = mesh().V(); - vectorField& Usource = eqn.source(); - const vectorField& C = mesh().C(); - const volScalarField& rhoL = - mesh().lookupObject("thermo:rho.liquid"); - const volScalarField& alphaL = - mesh().lookupObject("alpha.liquid"); - const volVectorField& UL = - mesh().lookupObject("U.liquid"); - double pi=3.141592654; - double source_pt_x=0.25; - double source_pt_y=0.025; - double source_pt_z=0.225; - double disk_rad=0.017499999999999998; - double disk_area=pi*disk_rad*disk_rad; - double power=2.5; - double smear_factor=3.0; - const scalar startTime = 1; - if (time.value() > startTime) - { - // Get V1 - double source_sign_factor = 1.0; - double V1 = 0; - double V2 = 0; - double rhoV; - double dist_tol = disk_rad*5; - - double dist_n; - double upV = 0; - double uprhoV = 0; - double upVvol = 0; - double downV = 0; - double downrhoV = 0; - double downVvol = 0; - double dist2; - forAll(C,i) - { - dist2 = (C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); - dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); - dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); - - dist_n = (C[i].x()-source_pt_x); - - if (dist2 < dist_tol*dist_tol && dist_n < -dist_tol/2) { - upVvol += V[i] * alphaL[i]; - upV += V[i] * alphaL[i] * UL[i][0]; - uprhoV += V[i] * alphaL[i] * rhoL[i]; - } - if (dist2 < dist_tol*dist_tol && dist_n > dist_tol/2) { - downVvol += V[i] * alphaL[i]; - downV += V[i] * alphaL[i] * UL[i][0]; - downrhoV += V[i] * alphaL[i] * rhoL[i]; - } - } - - reduce(uprhoV, sumOp()); - reduce(downrhoV, sumOp()); - reduce(upV, sumOp()); - reduce(downV, sumOp()); - reduce(downVvol, sumOp()); - reduce(upVvol, sumOp()); - - downV /= downVvol; - upV /= upVvol; - downrhoV /= downVvol; - uprhoV /= upVvol; - - if (upV <= 0 && downV <= 0) { - source_sign_factor = -1.0; - V1 = std::abs(upV); - rhoV = uprhoV; - } else if (upV >= 0 && downV >= 0) { - source_sign_factor = 1.0; - V1 = std::abs(downV); - rhoV = downrhoV; - } else { - V1 = 0.0; - source_sign_factor = -1.0; - rhoV = uprhoV; - Foam::Info << "[BIRD:DYNMIX WARN] " << "upV = " << upV << " downV = " << downV << " for source at " << source_pt_x << ", " << source_pt_y << ", " << source_pt_z << endl; - } - Foam::Info << "[BIRD:DYNMIX INFO] V1 = " << V1 << endl; - - // Get V2 - V2 = findV2(power, rhoV, disk_area, V1); - - forAll(C,i) - { - double Thrust=0.5*rhoL[i]*(V2*V2 - V1*V1)*disk_area; - double dist2=(C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); - dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); - dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); - double epsilon=pow(V[i],0.33333)*smear_factor; - double sourceterm=alphaL[i]*(Thrust/pow(pi,1.5)/pow(epsilon,3.0))* - exp(-dist2/(epsilon*epsilon)); - Usource[i][0] -= source_sign_factor*sourceterm*V[i]; - } - } - #}; -}; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/g b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/g deleted file mode 100644 index 770a5619..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/g +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class uniformDimensionedVectorField; - location "constant"; - object g; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -2 0 0 0 0]; -value (0 -9.81 0); - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/momentumTransport.gas b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/momentumTransport.gas deleted file mode 100644 index ca916714..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/momentumTransport.gas +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object momentumTransport.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//simulationType laminar; -simulationType RAS; -RAS -{ - model mixtureKEpsilon; - turbulence on; - printCoeff on; -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/momentumTransport.liquid b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/momentumTransport.liquid deleted file mode 100644 index 2063de0d..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/momentumTransport.liquid +++ /dev/null @@ -1,27 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "constant"; - object momentumTransport.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -//simulationType laminar; -simulationType RAS; - -RAS -{ - model mixtureKEpsilon; - turbulence on; - printCoeffs on; -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/run.sh b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/run.sh deleted file mode 100644 index 8686dbd6..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/run.sh +++ /dev/null @@ -1,61 +0,0 @@ -if ! type "python" &> /dev/null; then - echo " could not be found" - echo "Skipping Mesh generation" -else - # Generate blockmeshDict - python ../../../applications/write_block_rect_mesh.py -i system/mesh.json -o system - - # Generate boundary stl - python ../../../applications/write_stl_patch.py -i system/inlets_outlets.json - - # Generate mixers - python ../../../applications/write_dynMix_fvModels.py -i system/mixers.json -o constant - -fi - - -if ! type "blockMesh" &> /dev/null; then - echo " could not be found" - echo "OpenFoam is likely not installed, skipping run" -else - # Clean case - ./Allclean - - # Mesh gen - blockMesh -dict system/blockMeshDict - - # Inlet BC - surfaceToPatch -tol 1e-3 inlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - # Outlet BC - surfaceToPatch -tol 1e-3 outlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - - # Scale - transformPoints "scale=(0.05 0.05 0.05)" - - # setup IC - cp -r 0.orig 0 - setFields - - # Run - birdmultiphaseEulerFoam -fi - - - - diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/blockMeshDict b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/blockMeshDict deleted file mode 100644 index 94a55474..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/blockMeshDict +++ /dev/null @@ -1,594 +0,0 @@ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} - -convertToMeters 1.0; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -vertices -( -( 0.0 0.0 0.0) -( 1.0 0.0 0.0) -( 2.0 0.0 0.0) -( 3.0 0.0 0.0) -( 4.0 0.0 0.0) -( 5.0 0.0 0.0) -( 6.0 0.0 0.0) -( 7.0 0.0 0.0) -( 8.0 0.0 0.0) -( 9.0 0.0 0.0) -( 10.0 0.0 0.0) -( 0.0 1.0 0.0) -( 1.0 1.0 0.0) -( 2.0 1.0 0.0) -( 3.0 1.0 0.0) -( 4.0 1.0 0.0) -( 5.0 1.0 0.0) -( 6.0 1.0 0.0) -( 7.0 1.0 0.0) -( 8.0 1.0 0.0) -( 9.0 1.0 0.0) -( 10.0 1.0 0.0) -( 0.0 2.0 0.0) -( 1.0 2.0 0.0) -( 2.0 2.0 0.0) -( 3.0 2.0 0.0) -( 4.0 2.0 0.0) -( 5.0 2.0 0.0) -( 6.0 2.0 0.0) -( 7.0 2.0 0.0) -( 8.0 2.0 0.0) -( 9.0 2.0 0.0) -( 10.0 2.0 0.0) -( 0.0 3.0 0.0) -( 1.0 3.0 0.0) -( 2.0 3.0 0.0) -( 3.0 3.0 0.0) -( 4.0 3.0 0.0) -( 5.0 3.0 0.0) -( 6.0 3.0 0.0) -( 7.0 3.0 0.0) -( 8.0 3.0 0.0) -( 9.0 3.0 0.0) -( 10.0 3.0 0.0) -( 0.0 4.0 0.0) -( 1.0 4.0 0.0) -( 2.0 4.0 0.0) -( 3.0 4.0 0.0) -( 4.0 4.0 0.0) -( 5.0 4.0 0.0) -( 6.0 4.0 0.0) -( 7.0 4.0 0.0) -( 8.0 4.0 0.0) -( 9.0 4.0 0.0) -( 10.0 4.0 0.0) -( 0.0 5.0 0.0) -( 1.0 5.0 0.0) -( 2.0 5.0 0.0) -( 3.0 5.0 0.0) -( 4.0 5.0 0.0) -( 5.0 5.0 0.0) -( 6.0 5.0 0.0) -( 7.0 5.0 0.0) -( 8.0 5.0 0.0) -( 9.0 5.0 0.0) -( 10.0 5.0 0.0) -( 0.0 0.0 1.0) -( 1.0 0.0 1.0) -( 2.0 0.0 1.0) -( 3.0 0.0 1.0) -( 4.0 0.0 1.0) -( 5.0 0.0 1.0) -( 6.0 0.0 1.0) -( 7.0 0.0 1.0) -( 8.0 0.0 1.0) -( 9.0 0.0 1.0) -( 10.0 0.0 1.0) -( 0.0 1.0 1.0) -( 1.0 1.0 1.0) -( 2.0 1.0 1.0) -( 3.0 1.0 1.0) -( 4.0 1.0 1.0) -( 5.0 1.0 1.0) -( 6.0 1.0 1.0) -( 7.0 1.0 1.0) -( 8.0 1.0 1.0) -( 9.0 1.0 1.0) -( 10.0 1.0 1.0) -( 0.0 2.0 1.0) -( 1.0 2.0 1.0) -( 2.0 2.0 1.0) -( 3.0 2.0 1.0) -( 4.0 2.0 1.0) -( 5.0 2.0 1.0) -( 6.0 2.0 1.0) -( 7.0 2.0 1.0) -( 8.0 2.0 1.0) -( 9.0 2.0 1.0) -( 10.0 2.0 1.0) -( 0.0 3.0 1.0) -( 1.0 3.0 1.0) -( 2.0 3.0 1.0) -( 3.0 3.0 1.0) -( 4.0 3.0 1.0) -( 5.0 3.0 1.0) -( 6.0 3.0 1.0) -( 7.0 3.0 1.0) -( 8.0 3.0 1.0) -( 9.0 3.0 1.0) -( 10.0 3.0 1.0) -( 0.0 4.0 1.0) -( 1.0 4.0 1.0) -( 2.0 4.0 1.0) -( 3.0 4.0 1.0) -( 4.0 4.0 1.0) -( 5.0 4.0 1.0) -( 6.0 4.0 1.0) -( 7.0 4.0 1.0) -( 8.0 4.0 1.0) -( 9.0 4.0 1.0) -( 10.0 4.0 1.0) -( 0.0 5.0 1.0) -( 1.0 5.0 1.0) -( 2.0 5.0 1.0) -( 3.0 5.0 1.0) -( 4.0 5.0 1.0) -( 5.0 5.0 1.0) -( 6.0 5.0 1.0) -( 7.0 5.0 1.0) -( 8.0 5.0 1.0) -( 9.0 5.0 1.0) -( 10.0 5.0 1.0) -( 0.0 0.0 2.0) -( 1.0 0.0 2.0) -( 2.0 0.0 2.0) -( 3.0 0.0 2.0) -( 4.0 0.0 2.0) -( 5.0 0.0 2.0) -( 6.0 0.0 2.0) -( 7.0 0.0 2.0) -( 8.0 0.0 2.0) -( 9.0 0.0 2.0) -( 10.0 0.0 2.0) -( 0.0 1.0 2.0) -( 1.0 1.0 2.0) -( 2.0 1.0 2.0) -( 3.0 1.0 2.0) -( 4.0 1.0 2.0) -( 5.0 1.0 2.0) -( 6.0 1.0 2.0) -( 7.0 1.0 2.0) -( 8.0 1.0 2.0) -( 9.0 1.0 2.0) -( 10.0 1.0 2.0) -( 0.0 2.0 2.0) -( 1.0 2.0 2.0) -( 2.0 2.0 2.0) -( 3.0 2.0 2.0) -( 4.0 2.0 2.0) -( 5.0 2.0 2.0) -( 6.0 2.0 2.0) -( 7.0 2.0 2.0) -( 8.0 2.0 2.0) -( 9.0 2.0 2.0) -( 10.0 2.0 2.0) -( 0.0 3.0 2.0) -( 1.0 3.0 2.0) -( 2.0 3.0 2.0) -( 3.0 3.0 2.0) -( 4.0 3.0 2.0) -( 5.0 3.0 2.0) -( 6.0 3.0 2.0) -( 7.0 3.0 2.0) -( 8.0 3.0 2.0) -( 9.0 3.0 2.0) -( 10.0 3.0 2.0) -( 0.0 4.0 2.0) -( 1.0 4.0 2.0) -( 2.0 4.0 2.0) -( 3.0 4.0 2.0) -( 4.0 4.0 2.0) -( 5.0 4.0 2.0) -( 6.0 4.0 2.0) -( 7.0 4.0 2.0) -( 8.0 4.0 2.0) -( 9.0 4.0 2.0) -( 10.0 4.0 2.0) -( 0.0 5.0 2.0) -( 1.0 5.0 2.0) -( 2.0 5.0 2.0) -( 3.0 5.0 2.0) -( 4.0 5.0 2.0) -( 5.0 5.0 2.0) -( 6.0 5.0 2.0) -( 7.0 5.0 2.0) -( 8.0 5.0 2.0) -( 9.0 5.0 2.0) -( 10.0 5.0 2.0) -( 0.0 0.0 3.0) -( 1.0 0.0 3.0) -( 2.0 0.0 3.0) -( 3.0 0.0 3.0) -( 4.0 0.0 3.0) -( 5.0 0.0 3.0) -( 6.0 0.0 3.0) -( 7.0 0.0 3.0) -( 8.0 0.0 3.0) -( 9.0 0.0 3.0) -( 10.0 0.0 3.0) -( 0.0 1.0 3.0) -( 1.0 1.0 3.0) -( 2.0 1.0 3.0) -( 3.0 1.0 3.0) -( 4.0 1.0 3.0) -( 5.0 1.0 3.0) -( 6.0 1.0 3.0) -( 7.0 1.0 3.0) -( 8.0 1.0 3.0) -( 9.0 1.0 3.0) -( 10.0 1.0 3.0) -( 0.0 2.0 3.0) -( 1.0 2.0 3.0) -( 2.0 2.0 3.0) -( 3.0 2.0 3.0) -( 4.0 2.0 3.0) -( 5.0 2.0 3.0) -( 6.0 2.0 3.0) -( 7.0 2.0 3.0) -( 8.0 2.0 3.0) -( 9.0 2.0 3.0) -( 10.0 2.0 3.0) -( 0.0 3.0 3.0) -( 1.0 3.0 3.0) -( 2.0 3.0 3.0) -( 3.0 3.0 3.0) -( 4.0 3.0 3.0) -( 5.0 3.0 3.0) -( 6.0 3.0 3.0) -( 7.0 3.0 3.0) -( 8.0 3.0 3.0) -( 9.0 3.0 3.0) -( 10.0 3.0 3.0) -( 0.0 4.0 3.0) -( 1.0 4.0 3.0) -( 2.0 4.0 3.0) -( 3.0 4.0 3.0) -( 4.0 4.0 3.0) -( 5.0 4.0 3.0) -( 6.0 4.0 3.0) -( 7.0 4.0 3.0) -( 8.0 4.0 3.0) -( 9.0 4.0 3.0) -( 10.0 4.0 3.0) -( 0.0 5.0 3.0) -( 1.0 5.0 3.0) -( 2.0 5.0 3.0) -( 3.0 5.0 3.0) -( 4.0 5.0 3.0) -( 5.0 5.0 3.0) -( 6.0 5.0 3.0) -( 7.0 5.0 3.0) -( 8.0 5.0 3.0) -( 9.0 5.0 3.0) -( 10.0 5.0 3.0) -( 0.0 0.0 4.0) -( 1.0 0.0 4.0) -( 2.0 0.0 4.0) -( 3.0 0.0 4.0) -( 4.0 0.0 4.0) -( 5.0 0.0 4.0) -( 6.0 0.0 4.0) -( 7.0 0.0 4.0) -( 8.0 0.0 4.0) -( 9.0 0.0 4.0) -( 10.0 0.0 4.0) -( 0.0 1.0 4.0) -( 1.0 1.0 4.0) -( 2.0 1.0 4.0) -( 3.0 1.0 4.0) -( 4.0 1.0 4.0) -( 5.0 1.0 4.0) -( 6.0 1.0 4.0) -( 7.0 1.0 4.0) -( 8.0 1.0 4.0) -( 9.0 1.0 4.0) -( 10.0 1.0 4.0) -( 0.0 2.0 4.0) -( 1.0 2.0 4.0) -( 2.0 2.0 4.0) -( 3.0 2.0 4.0) -( 4.0 2.0 4.0) -( 5.0 2.0 4.0) -( 6.0 2.0 4.0) -( 7.0 2.0 4.0) -( 8.0 2.0 4.0) -( 9.0 2.0 4.0) -( 10.0 2.0 4.0) -( 0.0 3.0 4.0) -( 1.0 3.0 4.0) -( 2.0 3.0 4.0) -( 3.0 3.0 4.0) -( 4.0 3.0 4.0) -( 5.0 3.0 4.0) -( 6.0 3.0 4.0) -( 7.0 3.0 4.0) -( 8.0 3.0 4.0) -( 9.0 3.0 4.0) -( 10.0 3.0 4.0) -( 0.0 4.0 4.0) -( 1.0 4.0 4.0) -( 2.0 4.0 4.0) -( 3.0 4.0 4.0) -( 4.0 4.0 4.0) -( 5.0 4.0 4.0) -( 6.0 4.0 4.0) -( 7.0 4.0 4.0) -( 8.0 4.0 4.0) -( 9.0 4.0 4.0) -( 10.0 4.0 4.0) -( 0.0 5.0 4.0) -( 1.0 5.0 4.0) -( 2.0 5.0 4.0) -( 3.0 5.0 4.0) -( 4.0 5.0 4.0) -( 5.0 5.0 4.0) -( 6.0 5.0 4.0) -( 7.0 5.0 4.0) -( 8.0 5.0 4.0) -( 9.0 5.0 4.0) -( 10.0 5.0 4.0) -( 0.0 0.0 5.0) -( 1.0 0.0 5.0) -( 2.0 0.0 5.0) -( 3.0 0.0 5.0) -( 4.0 0.0 5.0) -( 5.0 0.0 5.0) -( 6.0 0.0 5.0) -( 7.0 0.0 5.0) -( 8.0 0.0 5.0) -( 9.0 0.0 5.0) -( 10.0 0.0 5.0) -( 0.0 1.0 5.0) -( 1.0 1.0 5.0) -( 2.0 1.0 5.0) -( 3.0 1.0 5.0) -( 4.0 1.0 5.0) -( 5.0 1.0 5.0) -( 6.0 1.0 5.0) -( 7.0 1.0 5.0) -( 8.0 1.0 5.0) -( 9.0 1.0 5.0) -( 10.0 1.0 5.0) -( 0.0 2.0 5.0) -( 1.0 2.0 5.0) -( 2.0 2.0 5.0) -( 3.0 2.0 5.0) -( 4.0 2.0 5.0) -( 5.0 2.0 5.0) -( 6.0 2.0 5.0) -( 7.0 2.0 5.0) -( 8.0 2.0 5.0) -( 9.0 2.0 5.0) -( 10.0 2.0 5.0) -( 0.0 3.0 5.0) -( 1.0 3.0 5.0) -( 2.0 3.0 5.0) -( 3.0 3.0 5.0) -( 4.0 3.0 5.0) -( 5.0 3.0 5.0) -( 6.0 3.0 5.0) -( 7.0 3.0 5.0) -( 8.0 3.0 5.0) -( 9.0 3.0 5.0) -( 10.0 3.0 5.0) -( 0.0 4.0 5.0) -( 1.0 4.0 5.0) -( 2.0 4.0 5.0) -( 3.0 4.0 5.0) -( 4.0 4.0 5.0) -( 5.0 4.0 5.0) -( 6.0 4.0 5.0) -( 7.0 4.0 5.0) -( 8.0 4.0 5.0) -( 9.0 4.0 5.0) -( 10.0 4.0 5.0) -( 0.0 5.0 5.0) -( 1.0 5.0 5.0) -( 2.0 5.0 5.0) -( 3.0 5.0 5.0) -( 4.0 5.0 5.0) -( 5.0 5.0 5.0) -( 6.0 5.0 5.0) -( 7.0 5.0 5.0) -( 8.0 5.0 5.0) -( 9.0 5.0 5.0) -( 10.0 5.0 5.0) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -blocks -( - - //block 0 -hex (0 1 12 11 66 67 78 77 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 1 -hex (1 2 13 12 67 68 79 78 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 2 -hex (2 3 14 13 68 69 80 79 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 3 -hex (3 4 15 14 69 70 81 80 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 4 -hex (4 5 16 15 70 71 82 81 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 5 -hex (5 6 17 16 71 72 83 82 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 6 -hex (6 7 18 17 72 73 84 83 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 7 -hex (7 8 19 18 73 74 85 84 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 8 -hex (8 9 20 19 74 75 86 85 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 9 -hex (9 10 21 20 75 76 87 86 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 10 -hex (75 76 87 86 141 142 153 152 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 11 -hex (141 142 153 152 207 208 219 218 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 12 -hex (207 208 219 218 273 274 285 284 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 13 -hex (273 274 285 284 339 340 351 350 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 14 -hex (272 273 284 283 338 339 350 349 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 15 -hex (271 272 283 282 337 338 349 348 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 16 -hex (270 271 282 281 336 337 348 347 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 17 -hex (269 270 281 280 335 336 347 346 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 18 -hex (268 269 280 279 334 335 346 345 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 19 -hex (267 268 279 278 333 334 345 344 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 20 -hex (266 267 278 277 332 333 344 343 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 21 -hex (265 266 277 276 331 332 343 342 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 22 -hex (264 265 276 275 330 331 342 341 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 23 -hex (275 276 287 286 341 342 353 352 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 24 -hex (286 287 298 297 352 353 364 363 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 25 -hex (297 298 309 308 363 364 375 374 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 26 -hex (308 309 320 319 374 375 386 385 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 27 -hex (242 243 254 253 308 309 320 319 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 28 -hex (176 177 188 187 242 243 254 253 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 29 -hex (110 111 122 121 176 177 188 187 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 30 -hex (44 45 56 55 110 111 122 121 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 31 -hex (33 34 45 44 99 100 111 110 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 32 -hex (22 23 34 33 88 89 100 99 ) -( 10 10 10 ) -SimpleGrading (1 1 1) - - //block 33 -hex (11 12 23 22 77 78 89 88 ) -( 10 10 10 ) -SimpleGrading (1 1 1) -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultPatch -{ type wall;} - -patches -( -); diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/decomposeParDict b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/decomposeParDict deleted file mode 100755 index a1cfef65..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/decomposeParDict +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 3.0.x | -| \\ / A nd | Web: www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object decomposeParDict; -} - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -numberOfSubdomains 16; - -method hierarchical; - -hierarchicalCoeffs -{ - n (4 4 1); - delta 0.001; - order xyz; -} - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/inlets_outlets.json b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/inlets_outlets.json deleted file mode 100644 index 05018282..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/inlets_outlets.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "inlets": [ - {"type": "circle", "centx": 5.0, "centy": 0.0, "centz": 0.5, "radius": 0.4, "normal_dir": 1,"nelements": 50}, - {"type": "circle", "centx": 2.5, "centy": 0.0, "centz": 0.5, "radius": 0.4, "normal_dir": 1,"nelements": 50}, - {"type": "circle", "centx": 7.5, "centy": 0.0, "centz": 0.5, "radius": 0.4, "normal_dir": 1,"nelements": 50} - ], - "outlets": [ - {"type": "circle", "centx": 0.5, "centy": 5.0, "centz": 0.5, "radius": 0.4, "normal_dir": 1,"nelements": 50}, - {"type": "circle", "centx": 0.5, "centy": 5.0, "centz": 4.5, "radius": 0.4, "normal_dir": 1,"nelements": 50} - ] -} diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/mixers.json b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/mixers.json deleted file mode 100644 index 38992940..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/mixers.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "Meshing": { - "Blockwise": { - "x" : 10, - "y" : 10, - "z" : 10 - } - }, - "Geometry": { - "OverallDomain": { - "x" : {"nblocks": 10, "size_per_block": 1.0, "rescale": 0.05}, - "y" : {"nblocks": 5, "size_per_block": 1.0, "rescale": 0.05}, - "z" : {"nblocks": 5, "size_per_block": 1.0, "rescale": 0.05} - }, - "Fluids": [ - [ [0,0,0], [9,0,0], [9,0,4], [0,0,4] ], - [ [0,1,4], [0,4,4], [0,4,0], [0,1,0] ] - ] - - }, - "mixers": [ - {"branch_id": 2, "frac_space": 0.5, "start_time": 1, "power": 2.5, "sign": "+"} - ] -} diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/setFieldsDict b/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/setFieldsDict deleted file mode 100644 index 07cb1d6d..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/setFieldsDict +++ /dev/null @@ -1,37 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class dictionary; - location "system"; - object setFieldsDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -defaultFieldValues -( - volScalarFieldValue alpha.gas 1 - volScalarFieldValue alpha.liquid 0 -); - -regions -( - boxToCell - { - box (-1.0 -1.0 -1.0) (10 0.15 10.0); - fieldValues - ( - volScalarFieldValue alpha.gas 0 - volScalarFieldValue alpha.liquid 1 - ); - } -); - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/T.gas b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/T.gas deleted file mode 100644 index bf0199a0..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/T.gas +++ /dev/null @@ -1,44 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type fixedValue; - value $internalField; - } - - outlet - { - type inletOutlet; - phi phi.gas; - inletValue $internalField; - value $internalField; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/T.liquid b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/T.liquid deleted file mode 100644 index 7101ea31..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/T.liquid +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object T.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 300; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - outlet - { - type inletOutlet; - phi phi.liquid; - inletValue $internalField; - value $internalField; - } - inlet - { - type fixedValue; - value $internalField; - } - defaultFaces - { - type zeroGradient; - } - -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alpha.gas b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alpha.gas deleted file mode 100644 index 1e303fbe..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alpha.gas +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - location "0"; - object alpha.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $alphaGas; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform $alphaGas; - } - outlet - { - type inletOutlet; - phi phi.gas; - inletValue uniform 1; - value uniform 1; - } - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alphat.gas b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alphat.gas deleted file mode 100644 index b867958f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alphat.gas +++ /dev/null @@ -1,46 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object alphat.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type calculated; - value $internalField; - } - - outlet - { - type calculated; - value $internalField; - } - - defaultFaces - { - type calculated; - value $internalField; - //type compressible::alphatWallFunction; - //Prt 0.85; - //value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.gas b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.gas deleted file mode 100644 index 707a1cda..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.gas +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object epsilon.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -3 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $eps_inlet_gas; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform $eps_inlet_gas; - } - - outlet - { - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - //type epsilonWallFunction; - //value $internalField; - } - - // defaultFaces - // { - // type empty; - // } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/f.gas b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/f.gas deleted file mode 100644 index 76ee77a9..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/f.gas +++ /dev/null @@ -1,41 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object f.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 1.0; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type fixedValue; - value uniform 1.0; //$internalField; // - } - - outlet - { - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/k.gas b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/k.gas deleted file mode 100644 index 4a3d44ca..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/k.gas +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: 9 - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object k.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $k_inlet_gas; - -boundaryField -{ - #includeEtc "caseDicts/setConstraintTypes" - - inlet - { - type fixedValue; - value uniform $k_inlet_gas; - } - - outlet - { - type zeroGradient; - } - - defaultFaces - { - type zeroGradient; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/p b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/p deleted file mode 100644 index b3a295fb..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/p +++ /dev/null @@ -1,39 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 101325; - -boundaryField -{ - inlet - { - type calculated; - value $internalField; - } - outlet - { - type calculated; - value $internalField; - } - defaultFaces - { - type calculated; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/p_rgh b/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/p_rgh deleted file mode 100644 index 88ee7d80..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/p_rgh +++ /dev/null @@ -1,43 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class volScalarField; - object p_rgh; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 101325; - -boundaryField -{ - inlet - { - type fixedFluxPressure; - value $internalField; - } - outlet - { - type prghTotalPressure; - p0 $internalField; - U U.gas; - phi phi.gas; - rho thermo:rho.gas; - value $internalField; - } - defaultFaces - { - type fixedFluxPressure; - value $internalField; - } -} - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/Allclean b/OFsolvers/tutorial_cases/loop_reactor_reacting/Allclean deleted file mode 100755 index 4003a12b..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/Allclean +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -# Remove surface, features and solution -#rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1 -#rm -f constant/triSurface/*.eMesh > /dev/null 2>&1 -#rm -rf constant/polyMesh > /dev/null 2>&1 -#rm -rf processor* > /dev/null 2>&1 -rm -rf 0 -cleanCase - -#------------------------------------------------------------------------------ diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/g b/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/g deleted file mode 100644 index 770a5619..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/g +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - format ascii; - class uniformDimensionedVectorField; - location "constant"; - object g; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -2 0 0 0 0]; -value (0 -9.81 0); - - -// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/run.sh b/OFsolvers/tutorial_cases/loop_reactor_reacting/run.sh deleted file mode 100644 index 9e3bbf6f..00000000 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/run.sh +++ /dev/null @@ -1,70 +0,0 @@ -if ! type "python" &> /dev/null; then - echo " could not be found" - echo "Skipping Mesh generation" -else - # Generate blockmeshDict - python ../../../applications/write_block_rect_mesh.py -i system/mesh.json -o system - - # Generate boundary stl - python ../../../applications/write_stl_patch.py -i system/inlets_outlets.json - - # Generate mixers - #python ../../../applications/write_dynMix_fvModels.py -i system/mixers.json -o constant - -fi - - -if ! type "blockMesh" &> /dev/null; then - echo " could not be found" - echo "OpenFoam is likely not installed, skipping run" -else - # Clean case - ./Allclean - - # Mesh gen - blockMesh -dict system/blockMeshDict - - # Inlet BC - surfaceToPatch -tol 1e-3 inlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - # Outlet BC - surfaceToPatch -tol 1e-3 outlets.stl - export newmeshdir=$(foamListTimes -latestTime) - rm -rf constant/polyMesh/ - cp -r $newmeshdir/polyMesh ./constant - rm -rf $newmeshdir - cp constant/polyMesh/boundary /tmp - sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary - cat /tmp/boundary > constant/polyMesh/boundary - - # Scale - transformPoints "scale=(2.7615275385627096 2.7615275385627096 2.7615275385627096)" - - # setup IC - cp -r 0.orig 0 - setFields - - # Setup mass flow rate - # Get inlet area - postProcess -func 'patchIntegrate(patch="inlet", field="alpha.gas")' - postProcess -func writeCellVolumes - writeMeshObj - - echo PRESTEP 3 - python writeGlobalVars.py - cp constant/phaseProperties_constantd constant/phaseProperties - - # Run - birdmultiphaseEulerFoam -fi - - - - diff --git a/OFsolvers/tutorial_cases/stir_tank/README.md b/OFsolvers/tutorial_cases/stir_tank/README.md deleted file mode 100644 index 6c961e8d..00000000 --- a/OFsolvers/tutorial_cases/stir_tank/README.md +++ /dev/null @@ -1,6 +0,0 @@ -### Stir tank - - -Single core exec - -1. `bash run.sh` diff --git a/README.md b/README.md index effc2fb7..a8f74985 100644 --- a/README.md +++ b/README.md @@ -30,10 +30,10 @@ We provide a new drag model `Grace`, a new interfacial composition model `Higbie ### Generate Stir tank mesh ```bash -inp=bird/meshing/stir_tank_mesh_templates/base_tank/tank_par.yaml -out=bird/meshing/stir_tank_case_templates/base/system/blockMeshDict +inp=bird/meshing/stirred_tank_mesh_templates/base_tank/tank_par.yaml +out=bird/meshing/stirred_tank_case_templates/base/system/blockMeshDict -python applications/write_stir_tank_mesh.py -i $inp -o $out +python applications/write_stirred_tank_mesh.py -i $inp -o $out ``` Generates a blockMeshDict @@ -49,7 +49,7 @@ transformPoints "rotate=((0 0 1)(0 1 0))": Mesh visualized in Paraview

- +

diff --git a/applications/write_dynMix_fvModels.py b/applications/write_dynMix_fvModels.py index e2a5278b..f6d7f3be 100644 --- a/applications/write_dynMix_fvModels.py +++ b/applications/write_dynMix_fvModels.py @@ -33,6 +33,16 @@ help="fvModels folder output", default=".", ) + parser.add_argument( + "-fs", + "--force_sign", + action="store_true", + help="Force mixing source sign", + ) args = parser.parse_args() dynMix_dict = parseJsonFile(args.input) - write_fvModel(dynMix_dict, output_folder=args.output_folder) + write_fvModel( + dynMix_dict, + output_folder=args.output_folder, + force_sign=args.force_sign, + ) diff --git a/applications/write_stir_tank_mesh.py b/applications/write_stirred_tank_mesh.py similarity index 86% rename from applications/write_stir_tank_mesh.py rename to applications/write_stirred_tank_mesh.py index 15b8b9c2..299df1f6 100644 --- a/applications/write_stir_tank_mesh.py +++ b/applications/write_stirred_tank_mesh.py @@ -4,8 +4,8 @@ import numpy as np -from bird import BIRD_STIR_TANK_MESH_TEMP_DIR -from bird.meshing.stir_tank_mesh import ( +from bird import BIRD_STIRRED_TANK_MESH_TEMP_DIR +from bird.meshing.stirred_tank_mesh import ( get_reactor_geom, write_blocks, write_edges, @@ -34,7 +34,7 @@ def main(): required=True, help="YAML file containing geometry details of reactor", default=os.path.join( - BIRD_STIR_TANK_MESH_TEMP_DIR, "base_tank", "tank_par.yaml" + BIRD_STIRRED_TANK_MESH_TEMP_DIR, "base_tank", "tank_par.yaml" ), ) args = parser.parse_args() diff --git a/assets/stir_tank.png b/assets/stirred_tank.png similarity index 100% rename from assets/stir_tank.png rename to assets/stirred_tank.png diff --git a/bird/__init__.py b/bird/__init__.py index 3365eb11..afc80437 100644 --- a/bird/__init__.py +++ b/bird/__init__.py @@ -20,11 +20,11 @@ BIRD_BLOCK_RECT_CASE_TEMP_DIR = os.path.join( BIRD_MESH_DIR, "block_rect_case_templates" ) -BIRD_STIR_TANK_MESH_TEMP_DIR = os.path.join( - BIRD_MESH_DIR, "stir_tank_mesh_templates" +BIRD_STIRRED_TANK_MESH_TEMP_DIR = os.path.join( + BIRD_MESH_DIR, "stirred_tank_mesh_templates" ) -BIRD_STIR_TANK_CASE_TEMP_DIR = os.path.join( - BIRD_MESH_DIR, "stir_tank_case_templates" +BIRD_STIRRED_TANK_CASE_TEMP_DIR = os.path.join( + BIRD_MESH_DIR, "stirred_tank_case_templates" ) BIRD_PRE_PATCH_TEMP_DIR = os.path.join( BIRD_PRE_DIR, "stl_patch", "bc_patch_mesh_template" diff --git a/bird/meshing/_stir_tank_reactor.py b/bird/meshing/_stirred_tank_reactor.py similarity index 99% rename from bird/meshing/_stir_tank_reactor.py rename to bird/meshing/_stirred_tank_reactor.py index b0dc13ae..dc3f2db5 100644 --- a/bird/meshing/_stir_tank_reactor.py +++ b/bird/meshing/_stirred_tank_reactor.py @@ -5,7 +5,7 @@ from ruamel.yaml import YAML -class StirTankReactor: +class StirredTankReactor: def __init__( self, Dt, diff --git a/bird/meshing/block_cyl_mesh.py b/bird/meshing/block_cyl_mesh.py index 39fd7c4c..6a16be65 100644 --- a/bird/meshing/block_cyl_mesh.py +++ b/bird/meshing/block_cyl_mesh.py @@ -106,7 +106,7 @@ def assemble_mesh(input_file, geomDict): ), 1, ) - print(NR) + # print(NR) NS = [NR[0] * 2] # Now figure out grading of each block for ir in range(len(R)): @@ -519,6 +519,11 @@ def writeBlockMeshDict(out_folder, geomDict, meshDict): fw.write("(\n") fw.write(");\n") + fw.write( + "\n// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //\n" + ) + fw.write("defaultPatch\n{type wall;}\n\n") + fw.close() diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/MRFProperties b/bird/meshing/stirred_tank_case_templates/base/constant/MRFProperties similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/MRFProperties rename to bird/meshing/stirred_tank_case_templates/base/constant/MRFProperties diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/g b/bird/meshing/stirred_tank_case_templates/base/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/g rename to bird/meshing/stirred_tank_case_templates/base/constant/g diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/globalTransport b/bird/meshing/stirred_tank_case_templates/base/constant/globalTransport similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/globalTransport rename to bird/meshing/stirred_tank_case_templates/base/constant/globalTransport diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/globalVars b/bird/meshing/stirred_tank_case_templates/base/constant/globalVars similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/globalVars rename to bird/meshing/stirred_tank_case_templates/base/constant/globalVars diff --git a/bird/meshing/stir_tank_case_templates/base/constant/phaseProperties b/bird/meshing/stirred_tank_case_templates/base/constant/phaseProperties similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/phaseProperties rename to bird/meshing/stirred_tank_case_templates/base/constant/phaseProperties diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/thermophysicalProperties.gas b/bird/meshing/stirred_tank_case_templates/base/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/thermophysicalProperties.gas rename to bird/meshing/stirred_tank_case_templates/base/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/thermophysicalProperties.liquid b/bird/meshing/stirred_tank_case_templates/base/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/thermophysicalProperties.liquid rename to bird/meshing/stirred_tank_case_templates/base/constant/thermophysicalProperties.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.gas b/bird/meshing/stirred_tank_case_templates/base/constant/turbulenceProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.gas rename to bird/meshing/stirred_tank_case_templates/base/constant/turbulenceProperties.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.liquid b/bird/meshing/stirred_tank_case_templates/base/constant/turbulenceProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.liquid rename to bird/meshing/stirred_tank_case_templates/base/constant/turbulenceProperties.liquid diff --git a/bird/meshing/stir_tank_case_templates/base/opt_coeff.foam b/bird/meshing/stirred_tank_case_templates/base/opt_coeff.foam similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/opt_coeff.foam rename to bird/meshing/stirred_tank_case_templates/base/opt_coeff.foam diff --git a/OFsolvers/tutorial_cases/stir_tank/system/controlDict b/bird/meshing/stirred_tank_case_templates/base/system/controlDict similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/system/controlDict rename to bird/meshing/stirred_tank_case_templates/base/system/controlDict diff --git a/OFsolvers/tutorial_cases/stir_tank/system/decomposeParDict b/bird/meshing/stirred_tank_case_templates/base/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/system/decomposeParDict rename to bird/meshing/stirred_tank_case_templates/base/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/stir_tank/system/fvSchemes b/bird/meshing/stirred_tank_case_templates/base/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/system/fvSchemes rename to bird/meshing/stirred_tank_case_templates/base/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/stir_tank/system/fvSolution b/bird/meshing/stirred_tank_case_templates/base/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/system/fvSolution rename to bird/meshing/stirred_tank_case_templates/base/system/fvSolution diff --git a/OFsolvers/tutorial_cases/stir_tank/system/setFieldsDict b/bird/meshing/stirred_tank_case_templates/base/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/system/setFieldsDict rename to bird/meshing/stirred_tank_case_templates/base/system/setFieldsDict diff --git a/bird/meshing/stir_tank_mesh.py b/bird/meshing/stirred_tank_mesh.py similarity index 99% rename from bird/meshing/stir_tank_mesh.py rename to bird/meshing/stirred_tank_mesh.py index ac8535fd..5b9a30b8 100644 --- a/bird/meshing/stir_tank_mesh.py +++ b/bird/meshing/stirred_tank_mesh.py @@ -3,11 +3,11 @@ import numpy as np -from bird.meshing._stir_tank_reactor import StirTankReactor +from bird.meshing._stirred_tank_reactor import StirredTankReactor def get_reactor_geom(yamlfile): - return StirTankReactor.from_file(yamlfile) + return StirredTankReactor.from_file(yamlfile) def write_ofoam_preamble(outfile, react): @@ -772,7 +772,7 @@ def write_patches(outfile, react): if __name__ == "__main__": react = get_reactor_geom( - "stir_tank_mesh_templates/base_tank/tank_par.yaml" + "stirred_tank_mesh_templates/base_tank/tank_par.yaml" ) with open("tmp", "w") as outfile: write_ofoam_preamble(outfile, react) diff --git a/bird/meshing/stir_tank_mesh_templates/base_tank/tank_par.yaml b/bird/meshing/stirred_tank_mesh_templates/base_tank/tank_par.yaml similarity index 100% rename from bird/meshing/stir_tank_mesh_templates/base_tank/tank_par.yaml rename to bird/meshing/stirred_tank_mesh_templates/base_tank/tank_par.yaml diff --git a/bird/meshing/stir_tank_mesh_templates/mesh.sh b/bird/meshing/stirred_tank_mesh_templates/mesh.sh similarity index 100% rename from bird/meshing/stir_tank_mesh_templates/mesh.sh rename to bird/meshing/stirred_tank_mesh_templates/mesh.sh diff --git a/bird/postprocess/early_pred.py b/bird/postprocess/early_pred.py index 23420073..0dae2d44 100644 --- a/bird/postprocess/early_pred.py +++ b/bird/postprocess/early_pred.py @@ -148,18 +148,12 @@ def sigm_fit_jax(theta, x): F = ( 2 * M - * ( - 0.5 - - 1 / (1 + jnp.exp(jnp.clip((a * x) ** b, a_min=None, a_max=20))) - ) + * (0.5 - 1 / (1 + jnp.exp(jnp.clip((a * x) ** b, min=None, max=20)))) ) F += ( 2 * N - * ( - 0.5 - - 1 / (1 + jnp.exp(jnp.clip((c * x) ** d, a_min=None, a_max=20))) - ) + * (0.5 - 1 / (1 + jnp.exp(jnp.clip((c * x) ** d, min=None, max=20)))) ) return F diff --git a/bird/preprocess/dynamic_mixer/io_fvModels.py b/bird/preprocess/dynamic_mixer/io_fvModels.py index 46092969..f41b701d 100644 --- a/bird/preprocess/dynamic_mixer/io_fvModels.py +++ b/bird/preprocess/dynamic_mixer/io_fvModels.py @@ -184,6 +184,139 @@ def write_mixer(mixer, output_folder): f.write("\t\t}\n") +def write_mixer_force_sign(mixer, output_folder): + with open(os.path.join(output_folder, "fvModels"), "a+") as f: + f.write(f"\t\tsource_pt_x={mixer.x};\n") + f.write(f"\t\tsource_pt_y={mixer.y};\n") + f.write(f"\t\tsource_pt_z={mixer.z};\n") + f.write(f"\t\tdisk_rad={mixer.rad};\n") + f.write("\t\tdisk_area=pi*disk_rad*disk_rad;\n") + f.write(f"\t\tpower={mixer.power};\n") + f.write(f"\t\tsmear_factor={float(mixer.smear)};\n") + f.write(f"\t\tstartTime = {mixer.start_time};\n") + f.write("\t\tif (time.value() > startTime)\n") + f.write("\t\t{\n") + f.write("\t\t\t// Get V1\n") + f.write("\t\t\tdouble source_sign_factor = 1.0;\n") + f.write("\t\t\tdouble V1 = 0;\n") + f.write("\t\t\tdouble V2 = 0;\n") + f.write("\t\t\tdouble rhoV;\n") + f.write("\t\t\tdouble dist_tol = disk_rad*3;\n") + f.write("\n") + f.write("\t\t\tdouble dist_n;\n") + f.write("\t\t\tdouble upV = 0;\n") + f.write("\t\t\tdouble uprhoV = 0;\n") + f.write("\t\t\tdouble upVvol = 0;\n") + f.write("\t\t\tdouble downV = 0;\n") + f.write("\t\t\tdouble downrhoV = 0;\n") + f.write("\t\t\tdouble downVvol = 0;\n") + f.write("\t\t\tdouble dist2;\n") + + f.write("\t\t\tforAll(C,i)\n") + f.write("\t\t\t{\n") + f.write( + "\t\t\t\tdist2 = (C[i].x()-source_pt_x)*(C[i].x()-source_pt_x);\n" + ) + f.write( + "\t\t\t\tdist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y);\n" + ) + f.write( + "\t\t\t\tdist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z);\n" + ) + f.write("\n") + if mixer.normal_dir == 0: + f.write("\t\t\t\tdist_n = (C[i].x()-source_pt_x);\n") + elif mixer.normal_dir == 1: + f.write("\t\t\t\tdist_n = (C[i].y()-source_pt_y);\n") + elif mixer.normal_dir == 2: + f.write("\t\t\t\tdist_n = (C[i].z()-source_pt_z);\n") + f.write("\n") + + f.write( + "\t\t\t\tif (dist2 < dist_tol*dist_tol && dist_n < -dist_tol/2) {\n" + ) + f.write("\t\t\t\t\tupVvol += V[i] * alphaL[i];\n") + f.write( + f"\t\t\t\t\tupV += V[i] * alphaL[i] * UL[i][{int(mixer.normal_dir)}];\n" + ) + f.write("\t\t\t\t\tuprhoV += V[i] * alphaL[i] * rhoL[i];\n") + f.write("\t\t\t\t}\n") + f.write( + "\t\t\t\tif (dist2 < dist_tol*dist_tol && dist_n > dist_tol/2) {\n" + ) + f.write("\t\t\t\t\tdownVvol += V[i] * alphaL[i];\n") + f.write( + f"\t\t\t\t\tdownV += V[i] * alphaL[i] * UL[i][{int(mixer.normal_dir)}];\n" + ) + f.write("\t\t\t\t\tdownrhoV += V[i] * alphaL[i] * rhoL[i];\n") + f.write("\t\t\t\t}\n") + f.write("\t\t\t}\n") + f.write("\n") + f.write("\t\t\treduce(uprhoV, sumOp());\n") + f.write("\t\t\treduce(downrhoV, sumOp());\n") + f.write("\t\t\treduce(upV, sumOp());\n") + f.write("\t\t\treduce(downV, sumOp());\n") + f.write("\t\t\treduce(downVvol, sumOp());\n") + f.write("\t\t\treduce(upVvol, sumOp());\n") + f.write("\n") + f.write("\t\t\tdownV /= downVvol;\n") + f.write("\t\t\tupV /= upVvol;\n") + f.write("\t\t\tdownrhoV /= downVvol;\n") + f.write("\t\t\tuprhoV /= upVvol;\n") + f.write("\n") + if mixer.sign == "+": + f.write("\t\t\tsource_sign_factor = -1.0;\n") + f.write("\t\t\tif (upV >= 0){\n") + f.write("\t\t\t\tV1 = 0.0;\n") + f.write("\t\t\t} else {\n") + f.write("\t\t\t\tV1 = std::abs(upV);\n") + f.write("\t\t\t}\n") + f.write("\t\t\trhoV = uprhoV;\n") + elif mixer.sign == "-": + f.write("\t\t\tsource_sign_factor = 1.0;\n") + f.write("\t\t\tif (downV <= 0){\n") + f.write("\t\t\t\tV1 = 0.0;\n") + f.write("\t\t\t} else {\n") + f.write("\t\t\t\tV1 = std::abs(downV);\n") + f.write("\t\t\t}\n") + f.write("\t\t\trhoV = downrhoV;\n") + # f.write("\t\t\t}\n") + f.write( + '\t\t\tFoam::Info << "[BIRD:DYNMIX INFO] V1 = " << V1 << endl;\n' + ) + f.write("\t\t\t\n") + f.write("\t\t\t// Get V2\n") + f.write("\t\t\tV2 = findV2(power, rhoV, disk_area, V1);\n") + f.write("\n") + f.write("\t\t\tforAll(C,i)\n") + f.write("\t\t\t{\n") + f.write( + "\t\t\t\tdouble Thrust=0.5*rhoL[i]*(V2*V2 - V1*V1)*disk_area;\n" + ) + f.write( + "\t\t\t\tdouble dist2=(C[i].x()-source_pt_x)*(C[i].x()-source_pt_x);\n" + ) + f.write( + "\t\t\t\tdist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y);\n" + ) + f.write( + "\t\t\t\tdist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z);\n" + ) + + f.write("\t\t\t\tdouble epsilon=pow(V[i],0.33333)*smear_factor;\n") + f.write( + "\t\t\t\tdouble sourceterm=alphaL[i]*(Thrust/pow(pi,1.5)/pow(epsilon,3.0))*\n" + ) + f.write("\t\t\t\t\texp(-dist2/(epsilon*epsilon));\n") + + f.write( + f"\t\t\t\tUsource[i][{int(mixer.normal_dir)}] -= source_sign_factor*sourceterm*V[i];\n" + ) + + f.write("\t\t\t}\n") + f.write("\t\t}\n") + + def write_end(output_folder): with open(os.path.join(output_folder, "fvModels"), "a+") as f: f.write("\t#};\n") diff --git a/bird/requirements.txt b/bird/requirements.txt index 5361f4be..789a560b 100644 --- a/bird/requirements.txt +++ b/bird/requirements.txt @@ -5,4 +5,4 @@ numpy-stl==2.17.0 scipy corner jax -numpyro +numpyro>=0.16.1 diff --git a/bird/version.py b/bird/version.py index 2ed1d089..4b814da6 100644 --- a/bird/version.py +++ b/bird/version.py @@ -1,3 +1,3 @@ """Bio reactor design version""" -__version__ = "0.0.14" +__version__ = "0.0.15" diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/Allclean b/experimental_cases/deckwer17/Allclean similarity index 94% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/Allclean rename to experimental_cases/deckwer17/Allclean index 4003a12b..f4c6f3db 100755 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/Allclean +++ b/experimental_cases/deckwer17/Allclean @@ -11,5 +11,5 @@ cd ${0%/*} || exit 1 # Run from this directory #rm -rf processor* > /dev/null 2>&1 rm -rf 0 cleanCase - +#rm system/blockMeshDict #------------------------------------------------------------------------------ diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/CO2.gas b/experimental_cases/deckwer17/IC/0/CO2.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/CO2.gas rename to experimental_cases/deckwer17/IC/0/CO2.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/CO2.liquid b/experimental_cases/deckwer17/IC/0/CO2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/CO2.liquid rename to experimental_cases/deckwer17/IC/0/CO2.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/N2.gas b/experimental_cases/deckwer17/IC/0/N2.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/N2.gas rename to experimental_cases/deckwer17/IC/0/N2.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/T.gas b/experimental_cases/deckwer17/IC/0/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/T.gas rename to experimental_cases/deckwer17/IC/0/T.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/T.liquid b/experimental_cases/deckwer17/IC/0/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/T.liquid rename to experimental_cases/deckwer17/IC/0/T.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/U.gas b/experimental_cases/deckwer17/IC/0/U.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/U.gas rename to experimental_cases/deckwer17/IC/0/U.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/U.liquid b/experimental_cases/deckwer17/IC/0/U.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/U.liquid rename to experimental_cases/deckwer17/IC/0/U.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/Ydefault.gas b/experimental_cases/deckwer17/IC/0/Ydefault.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/Ydefault.gas rename to experimental_cases/deckwer17/IC/0/Ydefault.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/Ydefault.liquid b/experimental_cases/deckwer17/IC/0/Ydefault.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/Ydefault.liquid rename to experimental_cases/deckwer17/IC/0/Ydefault.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/alpha.gas b/experimental_cases/deckwer17/IC/0/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/alpha.gas rename to experimental_cases/deckwer17/IC/0/alpha.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/alpha.liquid b/experimental_cases/deckwer17/IC/0/alpha.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/alpha.liquid rename to experimental_cases/deckwer17/IC/0/alpha.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/alphat.gas b/experimental_cases/deckwer17/IC/0/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/alphat.gas rename to experimental_cases/deckwer17/IC/0/alphat.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/alphat.liquid b/experimental_cases/deckwer17/IC/0/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/alphat.liquid rename to experimental_cases/deckwer17/IC/0/alphat.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/epsilon.gas b/experimental_cases/deckwer17/IC/0/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/epsilon.gas rename to experimental_cases/deckwer17/IC/0/epsilon.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/epsilon.liquid b/experimental_cases/deckwer17/IC/0/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/epsilon.liquid rename to experimental_cases/deckwer17/IC/0/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/f.gas b/experimental_cases/deckwer17/IC/0/f.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/f.gas rename to experimental_cases/deckwer17/IC/0/f.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/k.gas b/experimental_cases/deckwer17/IC/0/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/k.gas rename to experimental_cases/deckwer17/IC/0/k.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/k.liquid b/experimental_cases/deckwer17/IC/0/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/k.liquid rename to experimental_cases/deckwer17/IC/0/k.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/nut.gas b/experimental_cases/deckwer17/IC/0/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/nut.gas rename to experimental_cases/deckwer17/IC/0/nut.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/nut.liquid b/experimental_cases/deckwer17/IC/0/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/nut.liquid rename to experimental_cases/deckwer17/IC/0/nut.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/omega.liquid b/experimental_cases/deckwer17/IC/0/omega.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/omega.liquid rename to experimental_cases/deckwer17/IC/0/omega.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/p b/experimental_cases/deckwer17/IC/0/p similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/p rename to experimental_cases/deckwer17/IC/0/p diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/p_rgh b/experimental_cases/deckwer17/IC/0/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/p_rgh rename to experimental_cases/deckwer17/IC/0/p_rgh diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/water.liquid b/experimental_cases/deckwer17/IC/0/water.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/water.liquid rename to experimental_cases/deckwer17/IC/0/water.liquid diff --git a/experimental_cases/deckwer17/README.md b/experimental_cases/deckwer17/README.md new file mode 100644 index 00000000..3581661f --- /dev/null +++ b/experimental_cases/deckwer17/README.md @@ -0,0 +1,20 @@ +### Coflowing column + +This is case 17 from + +``` +@article{deckwer1978comprehensive, + title={A comprehensive study on co2-interphase mass transfer in vertical cocurrent and countercurrent gas-liquid flow}, + author={Deckwer, W-D and Adler, I and Zaidi, A}, + journal={The Canadian Journal of Chemical Engineering}, + volume={56}, + number={1}, + pages={43--55}, + year={1978}, + publisher={Wiley Online Library} +} +``` + +Single core exec + +1. `bash run.sh` diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/g b/experimental_cases/deckwer17/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/constant/g rename to experimental_cases/deckwer17/constant/g diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars_notempvar b/experimental_cases/deckwer17/constant/globalVars similarity index 65% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars_notempvar rename to experimental_cases/deckwer17/constant/globalVars index 775e2618..6faba44e 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars_notempvar +++ b/experimental_cases/deckwer17/constant/globalVars @@ -10,30 +10,43 @@ kThermLiq 0.62; // W/m-K rho0MixLiq 1000; // kg/m^3 sigmaLiq 0.07; //surface tension N/m //*******inlet gas frac************* -x_N2 0.522; -x_CO2 0.478; +x_N2 0.327; +x_CO2 0.673; f_N2 #calc "$x_N2*0.028 / ($x_CO2*0.044 + $x_N2*0.028)"; f_CO2 #calc "$x_CO2*0.044 / ($x_CO2*0.044 + $x_N2*0.028)"; //*******inlet gas frac************* -uGasPhase 0.025; -alphaGas 1; -alphaLiq 0; -uGasPhase #calc "$uGasPhase / $alphaGas"; +uGasPhase_Sup 0.0342; +uLiqPhase_Sup 0.0471; +alphaGas 0.13; +alphaLiq 0.87; +uGasPhase #calc "$uGasPhase_Sup / $alphaGas"; +uLiqPhase #calc "$uLiqPhase_Sup / $alphaLiq"; //********************************* LeLiqCO2 #calc "$kThermLiq / $rho0MixLiq / $D_CO2 / $CpMixLiq"; LeLiqN2 #calc "$kThermLiq / $rho0MixLiq / $D_N2 / $CpMixLiq"; LeLiqMix #calc "$f_CO2*$LeLiqCO2+$f_N2*$LeLiqN2"; //********************************* +mflowRateLiq 8.33e-4; +mflowRateGas 8.1777375e-4; +//********************************* kCO2 #calc "$D_CO2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; PrCO2 #calc "$muMixLiq*$CpMixLiq / $kCO2"; kN2 #calc "$D_N2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; PrN2 #calc "$muMixLiq*$CpMixLiq / $kN2"; //********************************* -l_scale 0.5; -intensity 0.05; -k_inlet_gas #calc "1.5 * Foam::pow(($uGasPhase), 2) * Foam::pow($intensity, 2)"; -k_inlet_liq #calc "1.5 * Foam::pow(($uGasPhase), 2) * Foam::pow($intensity, 2)"; -eps_inlet_gas #calc "pow(0.09,0.75) * Foam::pow($k_inlet_gas, 1.5) / ($l_scale * 0.07)"; -eps_inlet_liq #calc "pow(0.09,0.75) * Foam::pow($k_inlet_liq, 1.5) / ($l_scale * 0.07)"; -omega_inlet_gas #calc "pow(0.09,-0.25) * pow($k_inlet_gas,0.5) / ($l_scale * 0.07)"; -omega_inlet_liq #calc "pow(0.09,-0.25) * pow($k_inlet_liq,0.5) / ($l_scale * 0.07)"; +HtBcol 4.4; +DiaBcol 0.15; +LiqHt 4.4; +NPS 6; +NPD 6; +NPY 200; +//********************************* +Pbot #calc "101325.0+1000.0*$LiqHt*9.8"; +Pmid #calc "101325.0+1000.0*0.5*$LiqHt*9.8"; + +//bubble column cross-section divided by sparger area +ArbyAs 1.0; +uSupVel 0.0342; +uGas #calc "$Pmid / $Pbot * $ArbyAs * $uSupVel"; +//********************************* + diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/momentumTransport.gas b/experimental_cases/deckwer17/constant/momentumTransport.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/constant/momentumTransport.gas rename to experimental_cases/deckwer17/constant/momentumTransport.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/momentumTransport.liquid b/experimental_cases/deckwer17/constant/momentumTransport.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/constant/momentumTransport.liquid rename to experimental_cases/deckwer17/constant/momentumTransport.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/phaseProperties b/experimental_cases/deckwer17/constant/phaseProperties similarity index 93% rename from OFsolvers/tutorial_cases/coflowing_column/constant/phaseProperties rename to experimental_cases/deckwer17/constant/phaseProperties index e0542d5e..83d62273 100644 --- a/OFsolvers/tutorial_cases/coflowing_column/constant/phaseProperties +++ b/experimental_cases/deckwer17/constant/phaseProperties @@ -83,7 +83,7 @@ populationBalanceCoeffs coalescenceModels ( LehrMilliesMewes{ - efficiency 1.0; + efficiency 4.695; uCrit 0.08; alphaMax 0.6; } @@ -95,7 +95,7 @@ populationBalanceCoeffs breakupModels ( Laakkonen { - efficiency 1.0; + efficiency 13.83; daughterSizeDistributionModel Laakkonen; } @@ -160,8 +160,7 @@ drag ( (gas in liquid) { - //type Grace; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type IshiiZuber; + type Grace; residualRe 1e-3; swarmCorrection { @@ -233,8 +232,7 @@ diffusiveMassTransfer.liquid ( (gas in liquid) { - //type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie; Le $LeLiqMix; } diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/phaseProperties b/experimental_cases/deckwer17/constant/phaseProperties_constantd similarity index 77% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/phaseProperties rename to experimental_cases/deckwer17/constant/phaseProperties_constantd index 1f6d4671..f78e56fb 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/phaseProperties +++ b/experimental_cases/deckwer17/constant/phaseProperties_constantd @@ -19,7 +19,6 @@ type interfaceCompositionPhaseChangeMultiphaseSystem; phases (gas liquid); - gas { type multiComponentPhaseModel;//pureIsothermalPhaseModel; @@ -28,21 +27,32 @@ gas constantCoeffs { - d 3e-3; + d 2.86e-3; } - residualAlpha 1e-6; Sc 0.7; -} + residualAlpha 1e-6; +} + liquid { - type reactingPhaseModel; + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + diameterModel constant; + constantCoeffs { d 1e-4; } + Sc #codeStream + { + code + #{ + os << ($LeLiqMix * $CpMixLiq * $muMixLiq / $kThermLiq); + #}; + }; + residualAlpha 1e-6; } @@ -52,25 +62,18 @@ populationBalanceCoeffs { continuousPhase liquid; - coalescenceModels + coalescenceModels ( - LehrMilliesMewes{ - efficiency 4.695; - uCrit 0.08; - alphaMax 0.6; - } + LehrMilliesMewes{} ); binaryBreakupModels - (); + ( + LehrMilliesMewes{} + ); breakupModels ( - Laakkonen { - efficiency 13.83; - daughterSizeDistributionModel Laakkonen; - } - ); driftModels @@ -79,16 +82,7 @@ populationBalanceCoeffs ); nucleationModels - ( - reactionDriven - { - nucleationDiameter 3.0e-3; - velocityGroup gas; - reactingPhase liquid; - dmdtf phaseTransfer:dmidtf; - specie CH4; - } - ); + (); } } @@ -141,8 +135,7 @@ drag ( (gas in liquid) { - //type Grace; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type IshiiZuber; + type Grace; residualRe 1e-3; swarmCorrection { @@ -201,8 +194,8 @@ interfaceComposition.liquid (liquid and gas) { type Henry; - species ( CO2 H2 CH4 ); - k ( $He_CO2 $He_H2 $He_CH4 ); + species ( CO2 ); + k ( 1.04 ); Le $LeLiqMix; } ); @@ -214,8 +207,7 @@ diffusiveMassTransfer.liquid ( (gas in liquid) { - //type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie; Le $LeLiqMix; } @@ -227,15 +219,7 @@ diffusiveMassTransfer.liquid ); phaseTransfer -( - (gas in liquid) - { - type reactionDriven; - reactingPhase liquid; - targetPhase gas; - species (CH4); - } -); +(); lift ( diff --git a/experimental_cases/deckwer17/constant/phaseProperties_pbe b/experimental_cases/deckwer17/constant/phaseProperties_pbe new file mode 100644 index 00000000..83d62273 --- /dev/null +++ b/experimental_cases/deckwer17/constant/phaseProperties_pbe @@ -0,0 +1,293 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + object phaseProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "$FOAM_CASE/constant/globalVars" + +type interfaceCompositionPhaseChangePopulationBalanceMultiphaseSystem; + +phases (gas liquid); + +populationBalances (bubbles); + +gas +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel velocityGroup; + + velocityGroupCoeffs + { + populationBalance bubbles; + + shapeModel spherical; + + sizeGroups + ( + f1 {dSph 1.66e-3; value 0.0;} + f2 {dSph 1.96e-3; value 0.0;} + f3 {dSph 2.26e-3; value 0.0;} + f4 {dSph 2.56e-3; value 0.0;} + f5 {dSph 2.86e-3; value 1.0;} + f6 {dSph 3.16e-3; value 0.0;} + f7 {dSph 3.46e-3; value 0.0;} + f8 {dSph 3.76e-3; value 0.0;} + f9 {dSph 4.06e-3; value 0.0;} + f10 {dSph 4.36e-3; value 0.0;} + ); + } + + residualAlpha 1e-6; + + Sc 0.7; +} + +liquid +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel constant; + + constantCoeffs + { + d 1e-4; + } + Sc #codeStream + { + code + #{ + os << ($LeLiqMix * $CpMixLiq * $muMixLiq / $kThermLiq); + #}; + }; + + residualAlpha 1e-6; +} + +populationBalanceCoeffs +{ + bubbles + { + continuousPhase liquid; + + coalescenceModels + ( + LehrMilliesMewes{ + efficiency 4.695; + uCrit 0.08; + alphaMax 0.6; + } + ); + + binaryBreakupModels + (); + + breakupModels + ( + Laakkonen { + efficiency 13.83; + daughterSizeDistributionModel Laakkonen; + } + + ); + + driftModels + ( + densityChange{} + ); + + nucleationModels + (); + } +} + +blending +{ + default + { + type linear; + minFullyContinuousAlpha.gas 0.7; + minPartlyContinuousAlpha.gas 0.3; + minFullyContinuousAlpha.liquid 0.7; + minPartlyContinuousAlpha.liquid 0.3; + } + heatTransfer + { + type linear; + minFullyContinuousAlpha.gas 1; + minPartlyContinuousAlpha.gas 0; + minFullyContinuousAlpha.liquid 1; + minPartlyContinuousAlpha.liquid 0; + } + massTransfer + { + $heatTransfer; + } +} + +surfaceTension +( + (gas and liquid) + { + type constant; + sigma $sigmaLiq; + } +); + +interfaceCompression +(); + +aspectRatio +( + (gas in liquid) + { + type Wellek; + } +); + + +drag +( + (gas in liquid) + { + type Grace; + residualRe 1e-3; + swarmCorrection + { + type none; + } + } +); + +virtualMass +( + (gas in liquid) + { + type constantCoefficient; + Cvm 0.5; + } +); + +// heatTransfer +// (); + +heatTransfer.gas +( + (gas in liquid) + { + type spherical; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type RanzMarshall; + residualAlpha 1e-4; + } +); + +heatTransfer.liquid +( + (gas in liquid) + { + type RanzMarshall; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type spherical; + residualAlpha 1e-4; + } +); + +interfaceComposition.gas +(); + +interfaceComposition.liquid +( + (liquid and gas) + { + type Henry; + species ( CO2 ); + k ( 1.04 ); + Le $LeLiqMix; + } +); + +diffusiveMassTransfer.gas +(); + +diffusiveMassTransfer.liquid +( + (gas in liquid) + { + type Higbie; + Le $LeLiqMix; + } + + (liquid in gas) + { + type spherical; + Le 1.0; //not used for spherical + } +); + +phaseTransfer +(); + +lift +( + (gas in liquid) + { + type wallDamped; + + wallDamping + { + type cosine; + Cd 3.0; + } + + lift + { + type Tomiyama; + + swarmCorrection + { + type none; + } + } + } + +); + +wallLubrication +( + (gas in liquid) + { + type Antal; + Cw1 -0.01; + Cw2 0.05; + } +); + +turbulentDispersion +( + (gas in liquid) + { + type Burns; + sigma 0.9; + } +); + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/thermophysicalProperties.gas b/experimental_cases/deckwer17/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/constant/thermophysicalProperties.gas rename to experimental_cases/deckwer17/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/thermophysicalProperties.liquid b/experimental_cases/deckwer17/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/constant/thermophysicalProperties.liquid rename to experimental_cases/deckwer17/constant/thermophysicalProperties.liquid diff --git a/OFsolvers/tutorial_cases/coflowing_column/run.sh b/experimental_cases/deckwer17/run.sh similarity index 73% rename from OFsolvers/tutorial_cases/coflowing_column/run.sh rename to experimental_cases/deckwer17/run.sh index 00ad89d3..599e5a5b 100755 --- a/OFsolvers/tutorial_cases/coflowing_column/run.sh +++ b/experimental_cases/deckwer17/run.sh @@ -11,7 +11,7 @@ if ! type "python" &> /dev/null; then echo "Skipping Mesh generation" else # Generate blockmeshDict - python ../../../applications/write_block_cyl_mesh.py -i ../../../bird/meshing/block_cyl_mesh_templates/coflowing/input.json -t ../../../bird/meshing/block_cyl_mesh_templates/coflowing/topology.json -o system + python ../../applications/write_block_cyl_mesh.py -i ../../bird/meshing/block_cyl_mesh_templates/coflowing/input.json -t ../../bird/meshing/block_cyl_mesh_templates/coflowing/topology.json -o system fi diff --git a/experimental_cases/deckwer17/system/blockMeshDict b/experimental_cases/deckwer17/system/blockMeshDict new file mode 100644 index 00000000..8543606b --- /dev/null +++ b/experimental_cases/deckwer17/system/blockMeshDict @@ -0,0 +1,124 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} + +R1 75.0; + +mR1 -75.0; + +L1 4400.0; +L2 0.0; + +CW1 37.5; +mCW1 -37.5; +C11 53.033008588991066; +mC11 -53.033008588991066; +C21 53.03300858899106; +mC21 -53.03300858899106; + +NR1 6; + +NS1 12; + +NVert1 100; + +vertices +( + ($mCW1 $mCW1 $L1)// 0 + ( $CW1 $mCW1 $L1) + ( $CW1 $CW1 $L1) + ($mCW1 $CW1 $L1) + + ($mCW1 $mCW1 $L2)// 4 + ( $CW1 $mCW1 $L2) + ( $CW1 $CW1 $L2) + ($mCW1 $CW1 $L2) + + ($mC11 $mC21 $L1)// 8 + ( $C11 $mC21 $L1) + ( $C11 $C21 $L1) + ($mC11 $C21 $L1) + + ($mC11 $mC21 $L2)// 12 + ( $C11 $mC21 $L2) + ( $C11 $C21 $L2) + ($mC11 $C21 $L2) + +); + +blocks +( + hex (4 5 6 7 0 1 2 3) ($NS1 $NS1 $NVert1) simpleGrading (1 1 1.0) + + hex (4 12 13 5 0 8 9 1) ($NR1 $NS1 $NVert1) simpleGrading (1.0 1 1.0) + hex (5 13 14 6 1 9 10 2) ($NR1 $NS1 $NVert1) simpleGrading (1.0 1 1.0) + hex (6 14 15 7 2 10 11 3) ($NR1 $NS1 $NVert1) simpleGrading (1.0 1 1.0) + hex (7 15 12 4 3 11 8 0) ($NR1 $NS1 $NVert1) simpleGrading (1.0 1 1.0) + +); + +edges +( + arc 8 9 (0 $mR1 $L1) + arc 9 10 ($R1 0 $L1) + arc 10 11 (0 $R1 $L1) + arc 11 8 ($mR1 0 $L1) + + arc 12 13 (0 $mR1 $L2) + arc 13 14 ($R1 0 $L2) + arc 14 15 (0 $R1 $L2) + arc 15 12 ($mR1 0 $L2) + +); + +boundary +( + outlet + { + type patch; + faces + ( + ( 4 5 6 7) + + ( 4 12 13 5) + ( 5 13 6 14) + ( 6 14 15 7) + ( 7 15 12 4) + + ); + } + inlet + { + type patch; + faces + ( + ( 0 1 2 3) + + ( 0 8 9 1) + ( 1 9 2 10) + ( 2 10 11 3) + ( 3 11 8 0) + + ); + } + walls + { + type wall; + faces + ( + ( 12 13 9 8) + ( 13 14 10 9) + ( 14 15 11 10) + ( 15 12 8 11) + + ); + } +); + +mergePatchPairs +( +); diff --git a/OFsolvers/tutorial_cases/bubble_column/system/circinlet.m4 b/experimental_cases/deckwer17/system/circinlet.m4 similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/circinlet.m4 rename to experimental_cases/deckwer17/system/circinlet.m4 diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/controlDict b/experimental_cases/deckwer17/system/controlDict similarity index 97% rename from OFsolvers/tutorial_cases/coflowing_column/system/controlDict rename to experimental_cases/deckwer17/system/controlDict index f62759d0..61296ae9 100644 --- a/OFsolvers/tutorial_cases/coflowing_column/system/controlDict +++ b/experimental_cases/deckwer17/system/controlDict @@ -19,7 +19,7 @@ startFrom latestTime; startTime 0; -stopAt endTime; +stopAt writeNow;//endTime; endTime 400; diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/decomposeParDict b/experimental_cases/deckwer17/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/system/decomposeParDict rename to experimental_cases/deckwer17/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/bubble_column/system/fvConstraints b/experimental_cases/deckwer17/system/fvConstraints similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/fvConstraints rename to experimental_cases/deckwer17/system/fvConstraints diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/fvSchemes b/experimental_cases/deckwer17/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/system/fvSchemes rename to experimental_cases/deckwer17/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/fvSolution b/experimental_cases/deckwer17/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/system/fvSolution rename to experimental_cases/deckwer17/system/fvSolution diff --git a/OFsolvers/tutorial_cases/bubble_column/system/setFieldsDict b/experimental_cases/deckwer17/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/setFieldsDict rename to experimental_cases/deckwer17/system/setFieldsDict diff --git a/OFsolvers/tutorial_cases/bubble_column/system/topoSetDict b/experimental_cases/deckwer17/system/topoSetDict similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/topoSetDict rename to experimental_cases/deckwer17/system/topoSetDict diff --git a/OFsolvers/tutorial_cases/coflowing_column/Allclean b/experimental_cases/deckwer19/Allclean similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/Allclean rename to experimental_cases/deckwer19/Allclean diff --git a/experimental_cases/deckwer19/IC/0/CO2.gas b/experimental_cases/deckwer19/IC/0/CO2.gas new file mode 100644 index 00000000..9845b56e --- /dev/null +++ b/experimental_cases/deckwer19/IC/0/CO2.gas @@ -0,0 +1,42 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class volScalarField; + object CO2.gas; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 0.0; + +#include "${FOAM_CASE}/constant/globalVars" + +boundaryField +{ + #includeEtc "caseDicts/setConstraintTypes" + + inlet + { + type fixedValue; + value uniform $f_CO2; + } + + outlet + { + type zeroGradient; + } + + walls + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.gas b/experimental_cases/deckwer19/IC/0/CO2.liquid similarity index 91% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.gas rename to experimental_cases/deckwer19/IC/0/CO2.liquid index fba2945d..936122d8 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.gas +++ b/experimental_cases/deckwer19/IC/0/CO2.liquid @@ -9,7 +9,7 @@ FoamFile { format ascii; class volScalarField; - object Ydefault.gas; + object CO2.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -24,7 +24,7 @@ boundaryField inlet { type fixedValue; - value uniform 0.0; + value $internalField; } outlet @@ -32,11 +32,10 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type zeroGradient; } } - // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/Ydefault.liquid b/experimental_cases/deckwer19/IC/0/N2.gas similarity index 88% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/Ydefault.liquid rename to experimental_cases/deckwer19/IC/0/N2.gas index a5108564..7f75a1b7 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/Ydefault.liquid +++ b/experimental_cases/deckwer19/IC/0/N2.gas @@ -9,14 +9,15 @@ FoamFile { format ascii; class volScalarField; - object Ydefault.liquid; + object N2.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - dimensions [0 0 0 0 0 0 0]; internalField uniform 1.0; +#include "${FOAM_CASE}/constant/globalVars" + boundaryField { #includeEtc "caseDicts/setConstraintTypes" @@ -24,7 +25,7 @@ boundaryField inlet { type fixedValue; - value uniform 1.0; + value uniform $f_N2; } outlet @@ -32,11 +33,10 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type zeroGradient; } } - // ************************************************************************* // diff --git a/experimental_cases/deckwer19/IC/0/T.gas b/experimental_cases/deckwer19/IC/0/T.gas new file mode 100644 index 00000000..ad4d572d --- /dev/null +++ b/experimental_cases/deckwer19/IC/0/T.gas @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class volScalarField; + object T.gas; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 273.15; + +boundaryField +{ + #includeEtc "caseDicts/setConstraintTypes" + + inlet + { + type fixedValue; + value $internalField; + } + + outlet + { + type zeroGradient; + } + + walls + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/experimental_cases/deckwer19/IC/0/T.liquid b/experimental_cases/deckwer19/IC/0/T.liquid new file mode 100644 index 00000000..a9264f0e --- /dev/null +++ b/experimental_cases/deckwer19/IC/0/T.liquid @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class volScalarField; + object T.liquid; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 287.15; + +boundaryField +{ + #includeEtc "caseDicts/setConstraintTypes" + + inlet + { + type fixedValue; + value $internalField; + } + + outlet + { + type zeroGradient; + } + + walls + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.gas b/experimental_cases/deckwer19/IC/0/U.gas similarity index 88% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.gas rename to experimental_cases/deckwer19/IC/0/U.gas index e696566f..ff23f161 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.gas +++ b/experimental_cases/deckwer19/IC/0/U.gas @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile @@ -15,7 +15,7 @@ FoamFile dimensions [0 1 -1 0 0 0 0]; -internalField uniform (0 0.0 0); +internalField uniform (0 0 0); #include "${FOAM_CASE}/constant/globalVars" @@ -30,15 +30,17 @@ boundaryField //rho thermo:rho.gas; //value $internalField; type fixedValue; - value uniform (0 $uGasPhase 0); + value uniform (0 $uGasPhase 0); } + outlet { type pressureInletOutletVelocity; phi phi.gas; value $internalField; } - defaultFaces + + walls { type slip; } diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.liquid b/experimental_cases/deckwer19/IC/0/U.liquid similarity index 74% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.liquid rename to experimental_cases/deckwer19/IC/0/U.liquid index 637e6ac2..af11bbf7 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/U.liquid +++ b/experimental_cases/deckwer19/IC/0/U.liquid @@ -2,14 +2,15 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { - format ascii; - class volVectorField; - object U.liquid; + version 2; + format ascii; + class volVectorField; + object U.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,12 +18,12 @@ dimensions [0 1 -1 0 0 0 0]; #include "${FOAM_CASE}/constant/globalVars" -internalField uniform (0 0 0); +internalField uniform (0 $uLiqPhase 0); boundaryField { - #includeEtc "caseDicts/setConstraintTypes" - + #includeEtc "caseDicts/setConstraintTypes" + inlet { //type flowRateInletVelocity; @@ -30,20 +31,19 @@ boundaryField //rho thermo:rho.liquid; //value $internalField; type fixedValue; - value uniform (0 0 0); + value uniform (0 $uLiqPhase 0); } outlet { type pressureInletOutletVelocity; phi phi.liquid; - value uniform (0 0 0); - //value $internalField; + value $internalField; } - defaultFaces + walls { type noSlip; } - } + // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/Ydefault.gas b/experimental_cases/deckwer19/IC/0/Ydefault.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/Ydefault.gas rename to experimental_cases/deckwer19/IC/0/Ydefault.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.liquid b/experimental_cases/deckwer19/IC/0/Ydefault.liquid similarity index 98% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.liquid rename to experimental_cases/deckwer19/IC/0/Ydefault.liquid index a5108564..d281fb9b 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.liquid +++ b/experimental_cases/deckwer19/IC/0/Ydefault.liquid @@ -32,7 +32,7 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type zeroGradient; } diff --git a/experimental_cases/deckwer19/IC/0/alpha.gas b/experimental_cases/deckwer19/IC/0/alpha.gas new file mode 100644 index 00000000..8f1652c4 --- /dev/null +++ b/experimental_cases/deckwer19/IC/0/alpha.gas @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class volScalarField; + location "0"; + object alpha.gas; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +#include "${FOAM_CASE}/constant/globalVars" + +internalField uniform $alphaGas; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform $alphaGas; + } + outlet + { + type zeroGradient; + } + walls + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/experimental_cases/deckwer19/IC/0/alpha.liquid b/experimental_cases/deckwer19/IC/0/alpha.liquid new file mode 100644 index 00000000..0f22dbd5 --- /dev/null +++ b/experimental_cases/deckwer19/IC/0/alpha.liquid @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class volScalarField; + location "0"; + object alpha.liquid; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +#include "${FOAM_CASE}/constant/globalVars" + +internalField uniform $alphaLiq; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform $alphaLiq; + } + outlet + { + type zeroGradient; + } + walls + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/alphat.gas b/experimental_cases/deckwer19/IC/0/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/alphat.gas rename to experimental_cases/deckwer19/IC/0/alphat.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/alphat.liquid b/experimental_cases/deckwer19/IC/0/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/alphat.liquid rename to experimental_cases/deckwer19/IC/0/alphat.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/epsilon.liquid b/experimental_cases/deckwer19/IC/0/epsilon.gas similarity index 83% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/epsilon.liquid rename to experimental_cases/deckwer19/IC/0/epsilon.gas index 0a4236fd..bfac898f 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/epsilon.liquid +++ b/experimental_cases/deckwer19/IC/0/epsilon.gas @@ -9,22 +9,20 @@ FoamFile { format ascii; class volScalarField; - object epsilon.liquid; + object epsilon.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 2 -3 0 0 0 0]; -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $eps_inlet_liq; +internalField uniform 1.5e-4; boundaryField { inlet { type fixedValue; - value uniform $eps_inlet_liq; + value $internalField; } outlet @@ -32,12 +30,16 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type epsilonWallFunction; value $internalField; } + // defaultFaces + // { + // type empty; + // } } // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.liquid b/experimental_cases/deckwer19/IC/0/epsilon.liquid similarity index 85% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.liquid rename to experimental_cases/deckwer19/IC/0/epsilon.liquid index 0a4236fd..0af2c73a 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.liquid +++ b/experimental_cases/deckwer19/IC/0/epsilon.liquid @@ -15,16 +15,14 @@ FoamFile dimensions [0 2 -3 0 0 0 0]; -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $eps_inlet_liq; +internalField uniform 1.5e-4; boundaryField { inlet { type fixedValue; - value uniform $eps_inlet_liq; + value $internalField; } outlet @@ -32,12 +30,16 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type epsilonWallFunction; value $internalField; } + // defaultFaces + // { + // type empty; + // } } // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/f.gas b/experimental_cases/deckwer19/IC/0/f.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/f.gas rename to experimental_cases/deckwer19/IC/0/f.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/k.liquid b/experimental_cases/deckwer19/IC/0/k.gas similarity index 81% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/k.liquid rename to experimental_cases/deckwer19/IC/0/k.gas index cde8f6c1..25069cfc 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/k.liquid +++ b/experimental_cases/deckwer19/IC/0/k.gas @@ -9,15 +9,13 @@ FoamFile { format ascii; class volScalarField; - object k.liquid; + object k.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 2 -2 0 0 0 0]; -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $k_inlet_liq; +internalField uniform 3.7e-5; boundaryField { @@ -26,15 +24,15 @@ boundaryField inlet { type fixedValue; - value uniform $k_inlet_liq; + value $internalField; } outlet { - type zeroGradient; + type zeroGradient; } - defaultFaces + walls { type kqRWallFunction; value $internalField; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/k.liquid b/experimental_cases/deckwer19/IC/0/k.liquid similarity index 86% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/k.liquid rename to experimental_cases/deckwer19/IC/0/k.liquid index cde8f6c1..b4096681 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/k.liquid +++ b/experimental_cases/deckwer19/IC/0/k.liquid @@ -15,9 +15,7 @@ FoamFile dimensions [0 2 -2 0 0 0 0]; -#include "${FOAM_CASE}/constant/globalVars" - -internalField uniform $k_inlet_liq; +internalField uniform 0.01; boundaryField { @@ -26,7 +24,7 @@ boundaryField inlet { type fixedValue; - value uniform $k_inlet_liq; + value $internalField; } outlet @@ -34,7 +32,7 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type kqRWallFunction; value $internalField; diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/nut.gas b/experimental_cases/deckwer19/IC/0/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/nut.gas rename to experimental_cases/deckwer19/IC/0/nut.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/IC/0/nut.liquid b/experimental_cases/deckwer19/IC/0/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/IC/0/nut.liquid rename to experimental_cases/deckwer19/IC/0/nut.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/T.gas b/experimental_cases/deckwer19/IC/0/omega.liquid similarity index 80% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/T.gas rename to experimental_cases/deckwer19/IC/0/omega.liquid index bf0199a0..3025a62f 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/T.gas +++ b/experimental_cases/deckwer19/IC/0/omega.liquid @@ -9,13 +9,13 @@ FoamFile { format ascii; class volScalarField; - object T.gas; + object omega.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 1 0 0 0]; +dimensions [0 0 -1 0 0 0 0]; -internalField uniform 300; +internalField uniform 100; boundaryField { @@ -29,15 +29,13 @@ boundaryField outlet { - type inletOutlet; - phi phi.gas; - inletValue $internalField; - value $internalField; + type zeroGradient; } - defaultFaces + walls { - type zeroGradient; + type omegaWallFunction; + value $internalField; } } diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/nut.liquid b/experimental_cases/deckwer19/IC/0/p similarity index 86% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/nut.liquid rename to experimental_cases/deckwer19/IC/0/p index 1442e07f..c4df323c 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/nut.liquid +++ b/experimental_cases/deckwer19/IC/0/p @@ -9,13 +9,13 @@ FoamFile { format ascii; class volScalarField; - object nut.liquid; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -1 0 0 0 0]; +dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 1e-4; +internalField uniform 101325; boundaryField { @@ -33,9 +33,9 @@ boundaryField value $internalField; } - defaultFaces + walls { - type nutkWallFunction; + type calculated; value $internalField; } } diff --git a/experimental_cases/deckwer19/IC/0/p_rgh b/experimental_cases/deckwer19/IC/0/p_rgh new file mode 100644 index 00000000..677d16b5 --- /dev/null +++ b/experimental_cases/deckwer19/IC/0/p_rgh @@ -0,0 +1,44 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class volScalarField; + object p_rgh; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -2 0 0 0 0]; + +internalField uniform 101325; + +boundaryField +{ + #includeEtc "caseDicts/setConstraintTypes" + + inlet + { + type fixedFluxPressure; + value $internalField; + } + + outlet + { + type prghPressure; + p $internalField; + value $internalField; + } + + walls + { + type fixedFluxPressure; + value $internalField; + } +} + +// ************************************************************************* // diff --git a/experimental_cases/deckwer19/IC/0/water.liquid b/experimental_cases/deckwer19/IC/0/water.liquid new file mode 100644 index 00000000..3fe79b69 --- /dev/null +++ b/experimental_cases/deckwer19/IC/0/water.liquid @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class volScalarField; + object water.liquid; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + #includeEtc "caseDicts/setConstraintTypes" + + inlet + { + type fixedValue; + value uniform 1; + } + + outlet + { + type zeroGradient; + } + + walls + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/experimental_cases/deckwer19/README.md b/experimental_cases/deckwer19/README.md new file mode 100644 index 00000000..19baf4d1 --- /dev/null +++ b/experimental_cases/deckwer19/README.md @@ -0,0 +1,20 @@ +### Coflowing column + +This is case 19 from + +``` +@article{deckwer1978comprehensive, + title={A comprehensive study on co2-interphase mass transfer in vertical cocurrent and countercurrent gas-liquid flow}, + author={Deckwer, W-D and Adler, I and Zaidi, A}, + journal={The Canadian Journal of Chemical Engineering}, + volume={56}, + number={1}, + pages={43--55}, + year={1978}, + publisher={Wiley Online Library} +} +``` + +Single core exec + +1. `bash run.sh` diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/g b/experimental_cases/deckwer19/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/constant/g rename to experimental_cases/deckwer19/constant/g diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/globalVars b/experimental_cases/deckwer19/constant/globalVars similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/constant/globalVars rename to experimental_cases/deckwer19/constant/globalVars diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/momentumTransport.gas b/experimental_cases/deckwer19/constant/momentumTransport.gas similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/constant/momentumTransport.gas rename to experimental_cases/deckwer19/constant/momentumTransport.gas diff --git a/OFsolvers/tutorial_cases/coflowing_column/constant/momentumTransport.liquid b/experimental_cases/deckwer19/constant/momentumTransport.liquid similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/constant/momentumTransport.liquid rename to experimental_cases/deckwer19/constant/momentumTransport.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/phaseProperties b/experimental_cases/deckwer19/constant/phaseProperties similarity index 85% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/constant/phaseProperties rename to experimental_cases/deckwer19/constant/phaseProperties index 66f6e45f..83d62273 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/phaseProperties +++ b/experimental_cases/deckwer19/constant/phaseProperties @@ -35,16 +35,16 @@ gas sizeGroups ( - f1 {dSph 1.4e-3; value 0.0;} - f2 {dSph 1.8e-3; value 0.0;} - f3 {dSph 2.2e-3; value 0.0;} - f4 {dSph 2.6e-3; value 0.0;} - f5 {dSph 3e-3; value 1.0;} - f6 {dSph 3.4e-3; value 0.0;} - f7 {dSph 3.8e-3; value 0.0;} - f8 {dSph 4.2e-3; value 0.0;} - f9 {dSph 4.6e-3; value 0.0;} - f10 {dSph 5.0e-3; value 0.0;} + f1 {dSph 1.66e-3; value 0.0;} + f2 {dSph 1.96e-3; value 0.0;} + f3 {dSph 2.26e-3; value 0.0;} + f4 {dSph 2.56e-3; value 0.0;} + f5 {dSph 2.86e-3; value 1.0;} + f6 {dSph 3.16e-3; value 0.0;} + f7 {dSph 3.46e-3; value 0.0;} + f8 {dSph 3.76e-3; value 0.0;} + f9 {dSph 4.06e-3; value 0.0;} + f10 {dSph 4.36e-3; value 0.0;} ); } @@ -83,7 +83,7 @@ populationBalanceCoeffs coalescenceModels ( LehrMilliesMewes{ - efficiency 1.0; + efficiency 4.695; uCrit 0.08; alphaMax 0.6; } @@ -95,7 +95,7 @@ populationBalanceCoeffs breakupModels ( Laakkonen { - efficiency 1.0; + efficiency 13.83; daughterSizeDistributionModel Laakkonen; } @@ -160,8 +160,7 @@ drag ( (gas in liquid) { - //type Grace; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type IshiiZuber; + type Grace; residualRe 1e-3; swarmCorrection { @@ -233,8 +232,7 @@ diffusiveMassTransfer.liquid ( (gas in liquid) { - //type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie; Le $LeLiqMix; } diff --git a/experimental_cases/deckwer19/constant/phaseProperties_constantd b/experimental_cases/deckwer19/constant/phaseProperties_constantd new file mode 100644 index 00000000..f78e56fb --- /dev/null +++ b/experimental_cases/deckwer19/constant/phaseProperties_constantd @@ -0,0 +1,268 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + object phaseProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "$FOAM_CASE/constant/globalVars" + +type interfaceCompositionPhaseChangeMultiphaseSystem; + +phases (gas liquid); + +gas +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel constant; + + constantCoeffs + { + d 2.86e-3; + } + Sc 0.7; + + + residualAlpha 1e-6; +} + +liquid +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel constant; + + constantCoeffs + { + d 1e-4; + } + Sc #codeStream + { + code + #{ + os << ($LeLiqMix * $CpMixLiq * $muMixLiq / $kThermLiq); + #}; + }; + + residualAlpha 1e-6; +} + +populationBalanceCoeffs +{ + bubbles + { + continuousPhase liquid; + + coalescenceModels + ( + LehrMilliesMewes{} + ); + + binaryBreakupModels + ( + LehrMilliesMewes{} + ); + + breakupModels + ( + ); + + driftModels + ( + densityChange{} + ); + + nucleationModels + (); + } +} + +blending +{ + default + { + type linear; + minFullyContinuousAlpha.gas 0.7; + minPartlyContinuousAlpha.gas 0.3; + minFullyContinuousAlpha.liquid 0.7; + minPartlyContinuousAlpha.liquid 0.3; + } + heatTransfer + { + type linear; + minFullyContinuousAlpha.gas 1; + minPartlyContinuousAlpha.gas 0; + minFullyContinuousAlpha.liquid 1; + minPartlyContinuousAlpha.liquid 0; + } + massTransfer + { + $heatTransfer; + } +} + +surfaceTension +( + (gas and liquid) + { + type constant; + sigma $sigmaLiq; + } +); + +interfaceCompression +(); + +aspectRatio +( + (gas in liquid) + { + type Wellek; + } +); + + +drag +( + (gas in liquid) + { + type Grace; + residualRe 1e-3; + swarmCorrection + { + type none; + } + } +); + +virtualMass +( + (gas in liquid) + { + type constantCoefficient; + Cvm 0.5; + } +); + +// heatTransfer +// (); + +heatTransfer.gas +( + (gas in liquid) + { + type spherical; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type RanzMarshall; + residualAlpha 1e-4; + } +); + +heatTransfer.liquid +( + (gas in liquid) + { + type RanzMarshall; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type spherical; + residualAlpha 1e-4; + } +); + +interfaceComposition.gas +(); + +interfaceComposition.liquid +( + (liquid and gas) + { + type Henry; + species ( CO2 ); + k ( 1.04 ); + Le $LeLiqMix; + } +); + +diffusiveMassTransfer.gas +(); + +diffusiveMassTransfer.liquid +( + (gas in liquid) + { + type Higbie; + Le $LeLiqMix; + } + + (liquid in gas) + { + type spherical; + Le 1.0; //not used for spherical + } +); + +phaseTransfer +(); + +lift +( + (gas in liquid) + { + type wallDamped; + + wallDamping + { + type cosine; + Cd 3.0; + } + + lift + { + type Tomiyama; + + swarmCorrection + { + type none; + } + } + } + +); + +wallLubrication +( + (gas in liquid) + { + type Antal; + Cw1 -0.01; + Cw2 0.05; + } +); + +turbulentDispersion +( + (gas in liquid) + { + type Burns; + sigma 0.9; + } +); + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/thermophysicalProperties.gas b/experimental_cases/deckwer19/constant/thermophysicalProperties.gas similarity index 93% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/thermophysicalProperties.gas rename to experimental_cases/deckwer19/constant/thermophysicalProperties.gas index 10b5b74b..acd5196e 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/thermophysicalProperties.gas +++ b/experimental_cases/deckwer19/constant/thermophysicalProperties.gas @@ -2,14 +2,13 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class dictionary; - location "constant"; object thermophysicalProperties.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -18,15 +17,13 @@ thermoType { type heRhoThermo; mixture multiComponentMixture; - transport sutherland; - thermo janaf; + transport sutherland;//const;// + thermo janaf; //eConst;// equationOfState perfectGas; specie specie; energy sensibleInternalEnergy; - //energy sensibleEnthalpy; } - species ( CO2 @@ -111,6 +108,4 @@ N2 N 2; } } - - // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/thermophysicalProperties.liquid b/experimental_cases/deckwer19/constant/thermophysicalProperties.liquid similarity index 77% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/thermophysicalProperties.liquid rename to experimental_cases/deckwer19/constant/thermophysicalProperties.liquid index e697904f..87e5f125 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/thermophysicalProperties.liquid +++ b/experimental_cases/deckwer19/constant/thermophysicalProperties.liquid @@ -2,14 +2,13 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class dictionary; - location "constant"; object thermophysicalProperties.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -21,11 +20,10 @@ thermoType type heRhoThermo; mixture multiComponentMixture; transport const; - thermo eConst; - equationOfState rhoConst;//rPolynomial; + thermo eConst;//hConst; + equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; - //energy sensibleEnthalpy; } species @@ -81,5 +79,26 @@ CO2 } +// mixture +// { +// specie +// { +// molWeight 18; +// } +// equationOfState +// { +// rho 997; +// } +// thermodynamics +// { +// Cp 4195; +// Hf 0; +// } +// transport +// { +// mu 3.645e-4; +// Pr 2.289; +// } +// } // ************************************************************************* // diff --git a/experimental_cases/deckwer19/run.sh b/experimental_cases/deckwer19/run.sh new file mode 100755 index 00000000..599e5a5b --- /dev/null +++ b/experimental_cases/deckwer19/run.sh @@ -0,0 +1,32 @@ +if ! type "blockMesh" &> /dev/null; then + echo " could not be found" + echo "OpenFoam is likely not installed, skipping run" +else + # Clean case + ./Allclean +fi + +if ! type "python" &> /dev/null; then + echo " could not be found" + echo "Skipping Mesh generation" +else + # Generate blockmeshDict + python ../../applications/write_block_cyl_mesh.py -i ../../bird/meshing/block_cyl_mesh_templates/coflowing/input.json -t ../../bird/meshing/block_cyl_mesh_templates/coflowing/topology.json -o system +fi + + +if ! type "blockMesh" &> /dev/null; then + echo " could not be found" + echo "OpenFoam is likely not installed, skipping run" +else + # Mesh gen + blockMesh -dict system/blockMeshDict + cp -r IC/0 0 + + # Run + birdmultiphaseEulerFoam +fi + + + + diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/circinlet.m4 b/experimental_cases/deckwer19/system/circinlet.m4 similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/system/circinlet.m4 rename to experimental_cases/deckwer19/system/circinlet.m4 diff --git a/experimental_cases/deckwer19/system/controlDict b/experimental_cases/deckwer19/system/controlDict new file mode 100644 index 00000000..61296ae9 --- /dev/null +++ b/experimental_cases/deckwer19/system/controlDict @@ -0,0 +1,65 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application multiphaseEulerFoam; + +startFrom latestTime; + +startTime 0; + +stopAt writeNow;//endTime; + +endTime 400; + +deltaT 1e-4; + +writeControl adjustableRunTime; + +writeInterval 5; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +adjustTimeStep yes; //yes; // + +maxCo 0.5; + +maxDeltaT 1; + +functions +{ + #includeFunc residuals(p_rgh, k.liquid, omega.liquid) + #includeFunc timeStep + #includeFunc writeObjects(d.gas) + #includeFunc writeObjects(thermo:rho.gas) + #includeFunc writeObjects(thermo:rho.liquid) + #includeFunc writeObjects(thermo:mu.gas) + #includeFunc writeObjects(thermo:mu.liquid) + +} + + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvConstraints b/experimental_cases/deckwer19/system/decomposeParDict similarity index 76% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvConstraints rename to experimental_cases/deckwer19/system/decomposeParDict index 164c3e0b..f8c37108 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvConstraints +++ b/experimental_cases/deckwer19/system/decomposeParDict @@ -2,22 +2,24 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class dictionary; - object fvConstraints; + object decomposeParDict; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -limitp -{ - type limitPressure; +numberOfSubdomains 104; + +method simple; - min 1e4; +simpleCoeffs +{ + n (1 104 1); } // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/fvConstraints b/experimental_cases/deckwer19/system/fvConstraints similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/system/fvConstraints rename to experimental_cases/deckwer19/system/fvConstraints diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvSchemes b/experimental_cases/deckwer19/system/fvSchemes similarity index 64% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvSchemes rename to experimental_cases/deckwer19/system/fvSchemes index 7c2385a9..a3db0831 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvSchemes +++ b/experimental_cases/deckwer19/system/fvSchemes @@ -2,14 +2,13 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class dictionary; - location "system"; object fvSchemes; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -27,28 +26,27 @@ gradSchemes divSchemes { - default none; + default none; - "div\(phi,alpha.*\)" Gauss vanLeer; + "div\(phi,alpha.*\)" Gauss vanLeer; + "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; - "div\(phir,alpha.*,alpha.*\)" Gauss vanLeer; - - "div\(alphaRhoPhi.*,U.*\)" Gauss limitedLinearV 1; - "div\(phi.*,U.*\)" Gauss limitedLinearV 1; + "div\(alphaRhoPhi.*,U.*\)" Gauss linearUpwind limited; + "div\(phi.*,U.*\)" Gauss linearUpwind limited; "div\(alphaRhoPhi.*,Yi\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; - "div\(alphaRhoPhi.*,(K|k|epsilon|omega).*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi.*,K.*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi.*,(h|e).*\)" Gauss limitedLinear 1; + "div\(alphaRhoPhi.*,(k|epsilon|omega).*\)" Gauss limitedLinear 1; "div\(alphaPhi.*,f.*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1; - - "div\(phim,(k|epsilon)m\)" Gauss upwind; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; + "div\(phim,(k|epsilon)m\)" Gauss upwind; //limitedLinear 1; } laplacianSchemes { - default Gauss linear corrected; + default Gauss linear uncorrected; } interpolationSchemes @@ -56,16 +54,10 @@ interpolationSchemes default linear; } -snGradSchemes -{ - default uncorrected; -} - wallDist { method Poisson; nRequired true; } - // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvSolution b/experimental_cases/deckwer19/system/fvSolution similarity index 73% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvSolution rename to experimental_cases/deckwer19/system/fvSolution index 12592abf..a09a5868 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvSolution +++ b/experimental_cases/deckwer19/system/fvSolution @@ -2,14 +2,13 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class dictionary; - location "system"; object fvSolution; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -19,7 +18,7 @@ solvers "alpha.*" { nAlphaCorr 1; - nAlphaSubCycles 4; + nAlphaSubCycles 6; } bubbles @@ -31,7 +30,7 @@ solvers sourceUpdateInterval 1; } - p_rgh + "p_rgh.*" { solver GAMG; smoother DIC; @@ -39,12 +38,6 @@ solvers relTol 0; } - p_rghFinal - { - $p_rgh; - relTol 0; - } - "(k|omega).*" { solver smoothSolver; @@ -56,11 +49,10 @@ solvers "(e|h).*" { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-8; + solver PBiCGStab; + preconditioner DILU; + tolerance 1e-12; relTol 0; - minIter 1; } "f.*" @@ -80,40 +72,27 @@ solvers residualAlpha 1e-8; } - "U.*" - { - solver smoothSolver; - smoother symGaussSeidel; - tolerance 1e-5; - relTol 0; - minIter 1; - } - yPsi { solver PCG; - preconditioner DIC; + preconditioner none; tolerance 1e-10; relTol 0; } - } PIMPLE { - nOuterCorrectors 3; - nCorrectors 1; + nOuterCorrectors 2; + nCorrectors 2; nNonOrthogonalCorrectors 0; + faceMomentum true; + } relaxationFactors { - equations - { - ".*" 1; - } } - // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/setFieldsDict b/experimental_cases/deckwer19/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/system/setFieldsDict rename to experimental_cases/deckwer19/system/setFieldsDict diff --git a/OFsolvers/tutorial_cases/coflowing_column/system/topoSetDict b/experimental_cases/deckwer19/system/topoSetDict similarity index 100% rename from OFsolvers/tutorial_cases/coflowing_column/system/topoSetDict rename to experimental_cases/deckwer19/system/topoSetDict diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/N2.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/N2.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/N2.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/N2.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/O2.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/O2.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/O2.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/O2.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/T.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/T.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/T.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/T.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/T.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/T.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/U.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/U.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/U.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/U.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/U.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/U.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/U.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/U.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/Ydefault.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/Ydefault.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/Ydefault.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/Ydefault.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alpha.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alpha.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alpha.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alpha.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alphat.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alphat.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alphat.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/alphat.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/epsilon.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/epsilon.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/epsilon.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/epsilon.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/f.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/f.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/f.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/f.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/k.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/k.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/k.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/k.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/k.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/k.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/nut.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/nut.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/nut.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/nut.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/p b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/p similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/p rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/p diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/p_rgh b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/p_rgh rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/p_rgh diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/water.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/water.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/water.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/water.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/water.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/water.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/0.orig/water.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/0.orig/water.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/Allclean b/experimental_cases/disengagement/bubble_column_pbe_20L/Allclean similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/Allclean rename to experimental_cases/disengagement/bubble_column_pbe_20L/Allclean diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/g b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/g rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/g diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/globalVars b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/globalVars similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/globalVars rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/globalVars diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/globalVars_temp b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/globalVars_temp similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/globalVars_temp rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/globalVars_temp diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/momentumTransport.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/momentumTransport.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/momentumTransport.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/momentumTransport.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/phaseProperties b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/phaseProperties rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/phaseProperties_constantd b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_constantd similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/phaseProperties_constantd rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_constantd diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/phaseProperties_pbe b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_pbe similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/phaseProperties_pbe rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_pbe diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/thermophysicalProperties.gas b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/thermophysicalProperties.gas rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/thermophysicalProperties.liquid b/experimental_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/constant/thermophysicalProperties.liquid rename to experimental_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/presteps.sh b/experimental_cases/disengagement/bubble_column_pbe_20L/presteps.sh similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/presteps.sh rename to experimental_cases/disengagement/bubble_column_pbe_20L/presteps.sh diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/script b/experimental_cases/disengagement/bubble_column_pbe_20L/script similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/script rename to experimental_cases/disengagement/bubble_column_pbe_20L/script diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/blockMeshDict b/experimental_cases/disengagement/bubble_column_pbe_20L/system/blockMeshDict similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/blockMeshDict rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/blockMeshDict diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/controlDict b/experimental_cases/disengagement/bubble_column_pbe_20L/system/controlDict similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/controlDict rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/controlDict diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/decomposeParDict b/experimental_cases/disengagement/bubble_column_pbe_20L/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/decomposeParDict rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/fvConstraints b/experimental_cases/disengagement/bubble_column_pbe_20L/system/fvConstraints similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/fvConstraints rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/fvConstraints diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/fvSchemes b/experimental_cases/disengagement/bubble_column_pbe_20L/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/fvSchemes rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/fvSolution b/experimental_cases/disengagement/bubble_column_pbe_20L/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/fvSolution rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/fvSolution diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/inlets_outlets.json b/experimental_cases/disengagement/bubble_column_pbe_20L/system/inlets_outlets.json similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/inlets_outlets.json rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/inlets_outlets.json diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/mesh.json b/experimental_cases/disengagement/bubble_column_pbe_20L/system/mesh.json similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/mesh.json rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/mesh.json diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/setFieldsDict b/experimental_cases/disengagement/bubble_column_pbe_20L/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/setFieldsDict rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/setFieldsDict diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/topology.json b/experimental_cases/disengagement/bubble_column_pbe_20L/system/topology.json similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/system/topology.json rename to experimental_cases/disengagement/bubble_column_pbe_20L/system/topology.json diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/writeGlobalVars.py b/experimental_cases/disengagement/bubble_column_pbe_20L/writeGlobalVars.py similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/writeGlobalVars.py rename to experimental_cases/disengagement/bubble_column_pbe_20L/writeGlobalVars.py diff --git a/setup.py b/setup.py index 28cdc688..d1655cb9 100644 --- a/setup.py +++ b/setup.py @@ -28,6 +28,7 @@ "Intended Audience :: Science/Research", "License :: OSI Approved :: BSD License", "Natural Language :: English", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", @@ -42,6 +43,6 @@ ] }, include_package_data=True, - python_requires=">=3.10", + python_requires=">=3.9", install_requires=install_requires, ) diff --git a/tests/meshing/test_stir_tank.py b/tests/meshing/test_stirred_tank.py similarity index 73% rename from tests/meshing/test_stir_tank.py rename to tests/meshing/test_stirred_tank.py index 50726ce3..73d23a46 100644 --- a/tests/meshing/test_stir_tank.py +++ b/tests/meshing/test_stirred_tank.py @@ -4,8 +4,8 @@ import numpy as np -from bird import BIRD_STIR_TANK_MESH_TEMP_DIR -from bird.meshing.stir_tank_mesh import ( +from bird import BIRD_STIRRED_TANK_MESH_TEMP_DIR +from bird.meshing.stirred_tank_mesh import ( get_reactor_geom, write_blocks, write_edges, @@ -15,9 +15,9 @@ ) -def test_stir_tank(): +def test_stirred_tank(): inp = os.path.join( - BIRD_STIR_TANK_MESH_TEMP_DIR, "base_tank", "tank_par.yaml" + BIRD_STIRRED_TANK_MESH_TEMP_DIR, "base_tank", "tank_par.yaml" ) out = "tmp_blockMeshDict" with open(out, "w") as outfile: diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/README.md b/tutorial_cases/bdofoam_cases/README.md similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/README.md rename to tutorial_cases/bdofoam_cases/README.md diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/CO2.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/CO2.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/CO2.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/CO2.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/N2.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/N2.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/N2.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/N2.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/O2.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/O2.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/O2.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/O2.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/O2.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/O2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/O2.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/O2.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/T.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/T.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/T.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/T.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/T.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/T.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/U.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/U.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/U.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/U.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/U.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/U.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/U.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/U.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/Ydefault.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/Ydefault.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/Ydefault.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/Ydefault.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/alpha.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/alphat.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/k.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/k.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/k.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/k.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/k.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/k.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/nut.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/nut.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/nut.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/nut.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/nut.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/nut.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/p b/tutorial_cases/bdofoam_cases/nonreact/0.org/p similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/p rename to tutorial_cases/bdofoam_cases/nonreact/0.org/p diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/p_rgh b/tutorial_cases/bdofoam_cases/nonreact/0.org/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/p_rgh rename to tutorial_cases/bdofoam_cases/nonreact/0.org/p_rgh diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/water.gas b/tutorial_cases/bdofoam_cases/nonreact/0.org/water.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/water.gas rename to tutorial_cases/bdofoam_cases/nonreact/0.org/water.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/water.liquid b/tutorial_cases/bdofoam_cases/nonreact/0.org/water.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/0.org/water.liquid rename to tutorial_cases/bdofoam_cases/nonreact/0.org/water.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/Allclean b/tutorial_cases/bdofoam_cases/nonreact/Allclean similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/Allclean rename to tutorial_cases/bdofoam_cases/nonreact/Allclean diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/fvOptions b/tutorial_cases/bdofoam_cases/nonreact/constant/fvOptions similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/fvOptions rename to tutorial_cases/bdofoam_cases/nonreact/constant/fvOptions diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/g b/tutorial_cases/bdofoam_cases/nonreact/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/g rename to tutorial_cases/bdofoam_cases/nonreact/constant/g diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/globalTransport b/tutorial_cases/bdofoam_cases/nonreact/constant/globalTransport similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/globalTransport rename to tutorial_cases/bdofoam_cases/nonreact/constant/globalTransport diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/microbeUpdateProperties b/tutorial_cases/bdofoam_cases/nonreact/constant/microbeUpdateProperties similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/microbeUpdateProperties rename to tutorial_cases/bdofoam_cases/nonreact/constant/microbeUpdateProperties diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/phaseProperties b/tutorial_cases/bdofoam_cases/nonreact/constant/phaseProperties similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/phaseProperties rename to tutorial_cases/bdofoam_cases/nonreact/constant/phaseProperties diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.gas b/tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.gas rename to tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.liquid b/tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.liquid rename to tutorial_cases/bdofoam_cases/nonreact/constant/thermophysicalProperties.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.gas b/tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.gas rename to tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.liquid b/tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.liquid rename to tutorial_cases/bdofoam_cases/nonreact/constant/turbulenceProperties.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/extract_avgdata.py b/tutorial_cases/bdofoam_cases/nonreact/extract_avgdata.py similarity index 70% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/extract_avgdata.py rename to tutorial_cases/bdofoam_cases/nonreact/extract_avgdata.py index f85a5451..23cdfdac 100644 --- a/OFsolvers/tutorial_cases/bdofoam_cases/react/extract_avgdata.py +++ b/tutorial_cases/bdofoam_cases/nonreact/extract_avgdata.py @@ -1,51 +1,4 @@ -""" -extract data, using Paraview-python modules, to numpy arrays - -This script will focus on getting volume-average data for scalar parameters in -the liquid phase - -""" - -# H Sitaraman, 2017 - - -import sys - -import numpy as np -import vtk.numpy_interface.dataset_adapter as dsa -from paraview import simple as pv - -ofreader = pv.OpenFOAMReader( - FileName="./soln.foam" -) # just need to provide folder -ofreader.CaseType = "Reconstructed Case" -ofreader.MeshRegions = ["internalMesh"] -ofreader.SkipZeroTime = 0 # dont know why this is not working - -t = np.array(ofreader.TimestepValues) -N = t.size -tt = int(N / 2) -print(t) - -# threshold filter to get only the "aerated liquid"; specify cell data or point -# data in first element of Scalars by CELLS or POINTS -liquidthreshold = pv.Threshold( - Input=ofreader, Scalars=["CELLS", "alpha.gas"], ThresholdRange=[0.0, 0.6] -) - -mwO2 = 32.0 # g/mol -rhol = 1000.0 # kg/m^3 -- could get an average value from data... - -# threshold filter to find cells with O2 concentration below a certain value -cO2cut = 0.045 # mol/m^3 -yO2cut = cO2cut * mwO2 / rhol / 1000 # kg/kg -lowO2threshold = pv.Threshold( - Input=liquidthreshold, - Scalars=["CELLS", "O2.liquid"], - ThresholdRange=[0.0, yO2cut], -) - -# use calculator filter to compute O2 concentration as mass per total unit +# compute O2 concentration as mass per total unit # volume calcfilt = pv.Calculator( Input=liquidthreshold, @@ -64,7 +17,7 @@ integrate_fullvolume = pv.IntegrateVariables(Input=calcfilt_fullvolume) integrateliq = pv.IntegrateVariables(Input=calcfilt) # integrate variables in O2-limited region (only need volume -- is there a way -# to limit integration to save compuation? JJS 4/7/16) +# to limit integration to save computation? JJS 4/7/16) integrateO2lim = pv.IntegrateVariables(Input=lowO2threshold) # get volume-averaged values (in the liquid) as a function of time diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/pv_extract_analyze_script.py b/tutorial_cases/bdofoam_cases/nonreact/pv_extract_analyze_script.py similarity index 98% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/pv_extract_analyze_script.py rename to tutorial_cases/bdofoam_cases/nonreact/pv_extract_analyze_script.py index c2cce526..8162d5f4 100644 --- a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/pv_extract_analyze_script.py +++ b/tutorial_cases/bdofoam_cases/nonreact/pv_extract_analyze_script.py @@ -64,7 +64,7 @@ integrate_fullvolume = pv.IntegrateVariables(Input=calcfilt_fullvolume) integrateliq = pv.IntegrateVariables(Input=calcfilt) # integrate variables in O2-limited region (only need volume -- is there a way -# to limit integration to save compuation? JJS 4/7/16) +# to limit integration to save computation? JJS 4/7/16) integrateO2lim = pv.IntegrateVariables(Input=lowO2threshold) # get volume-averaged values (in the liquid) as a function of time diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/run_nonreact.sh b/tutorial_cases/bdofoam_cases/nonreact/run_nonreact.sh similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/run_nonreact.sh rename to tutorial_cases/bdofoam_cases/nonreact/run_nonreact.sh diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/sup_analyze_mid.py b/tutorial_cases/bdofoam_cases/nonreact/sup_analyze_mid.py similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/sup_analyze_mid.py rename to tutorial_cases/bdofoam_cases/nonreact/sup_analyze_mid.py diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/blockMeshDict b/tutorial_cases/bdofoam_cases/nonreact/system/blockMeshDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/blockMeshDict rename to tutorial_cases/bdofoam_cases/nonreact/system/blockMeshDict diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/controlDict b/tutorial_cases/bdofoam_cases/nonreact/system/controlDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/controlDict rename to tutorial_cases/bdofoam_cases/nonreact/system/controlDict diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/decomposeParDict b/tutorial_cases/bdofoam_cases/nonreact/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/decomposeParDict rename to tutorial_cases/bdofoam_cases/nonreact/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/fvSchemes b/tutorial_cases/bdofoam_cases/nonreact/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/fvSchemes rename to tutorial_cases/bdofoam_cases/nonreact/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/fvSolution b/tutorial_cases/bdofoam_cases/nonreact/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/fvSolution rename to tutorial_cases/bdofoam_cases/nonreact/system/fvSolution diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/setFieldsDict b/tutorial_cases/bdofoam_cases/nonreact/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/system/setFieldsDict rename to tutorial_cases/bdofoam_cases/nonreact/system/setFieldsDict diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/Allclean b/tutorial_cases/bdofoam_cases/react/Allclean similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/Allclean rename to tutorial_cases/bdofoam_cases/react/Allclean diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/fvOptions b/tutorial_cases/bdofoam_cases/react/constant/fvOptions similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/fvOptions rename to tutorial_cases/bdofoam_cases/react/constant/fvOptions diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/g b/tutorial_cases/bdofoam_cases/react/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/g rename to tutorial_cases/bdofoam_cases/react/constant/g diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/globalTransport b/tutorial_cases/bdofoam_cases/react/constant/globalTransport similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/globalTransport rename to tutorial_cases/bdofoam_cases/react/constant/globalTransport diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/microbeUpdateProperties b/tutorial_cases/bdofoam_cases/react/constant/microbeUpdateProperties similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/microbeUpdateProperties rename to tutorial_cases/bdofoam_cases/react/constant/microbeUpdateProperties diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/phaseProperties b/tutorial_cases/bdofoam_cases/react/constant/phaseProperties similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/phaseProperties rename to tutorial_cases/bdofoam_cases/react/constant/phaseProperties diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.gas b/tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.gas rename to tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.liquid b/tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.liquid rename to tutorial_cases/bdofoam_cases/react/constant/thermophysicalProperties.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/turbulenceProperties.gas b/tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/turbulenceProperties.gas rename to tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/turbulenceProperties.liquid b/tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/constant/turbulenceProperties.liquid rename to tutorial_cases/bdofoam_cases/react/constant/turbulenceProperties.liquid diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/extract_avgdata.py b/tutorial_cases/bdofoam_cases/react/extract_avgdata.py similarity index 98% rename from OFsolvers/tutorial_cases/bdofoam_cases/nonreact/extract_avgdata.py rename to tutorial_cases/bdofoam_cases/react/extract_avgdata.py index f85a5451..2fd08351 100644 --- a/OFsolvers/tutorial_cases/bdofoam_cases/nonreact/extract_avgdata.py +++ b/tutorial_cases/bdofoam_cases/react/extract_avgdata.py @@ -64,7 +64,7 @@ integrate_fullvolume = pv.IntegrateVariables(Input=calcfilt_fullvolume) integrateliq = pv.IntegrateVariables(Input=calcfilt) # integrate variables in O2-limited region (only need volume -- is there a way -# to limit integration to save compuation? JJS 4/7/16) +# to limit integration to save computation? JJS 4/7/16) integrateO2lim = pv.IntegrateVariables(Input=lowO2threshold) # get volume-averaged values (in the liquid) as a function of time diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/pv_extract_analyze_script.py b/tutorial_cases/bdofoam_cases/react/pv_extract_analyze_script.py similarity index 98% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/pv_extract_analyze_script.py rename to tutorial_cases/bdofoam_cases/react/pv_extract_analyze_script.py index c2cce526..8162d5f4 100644 --- a/OFsolvers/tutorial_cases/bdofoam_cases/react/pv_extract_analyze_script.py +++ b/tutorial_cases/bdofoam_cases/react/pv_extract_analyze_script.py @@ -64,7 +64,7 @@ integrate_fullvolume = pv.IntegrateVariables(Input=calcfilt_fullvolume) integrateliq = pv.IntegrateVariables(Input=calcfilt) # integrate variables in O2-limited region (only need volume -- is there a way -# to limit integration to save compuation? JJS 4/7/16) +# to limit integration to save computation? JJS 4/7/16) integrateO2lim = pv.IntegrateVariables(Input=lowO2threshold) # get volume-averaged values (in the liquid) as a function of time diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/run_react.sh b/tutorial_cases/bdofoam_cases/react/run_react.sh similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/run_react.sh rename to tutorial_cases/bdofoam_cases/react/run_react.sh diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/sup_analyze_mid.py b/tutorial_cases/bdofoam_cases/react/sup_analyze_mid.py similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/sup_analyze_mid.py rename to tutorial_cases/bdofoam_cases/react/sup_analyze_mid.py diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/system/blockMeshDict b/tutorial_cases/bdofoam_cases/react/system/blockMeshDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/system/blockMeshDict rename to tutorial_cases/bdofoam_cases/react/system/blockMeshDict diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/system/controlDict b/tutorial_cases/bdofoam_cases/react/system/controlDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/system/controlDict rename to tutorial_cases/bdofoam_cases/react/system/controlDict diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/system/decomposeParDict b/tutorial_cases/bdofoam_cases/react/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/system/decomposeParDict rename to tutorial_cases/bdofoam_cases/react/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/system/fvSchemes b/tutorial_cases/bdofoam_cases/react/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/system/fvSchemes rename to tutorial_cases/bdofoam_cases/react/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/system/fvSolution b/tutorial_cases/bdofoam_cases/react/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/system/fvSolution rename to tutorial_cases/bdofoam_cases/react/system/fvSolution diff --git a/OFsolvers/tutorial_cases/bdofoam_cases/react/system/setFieldsDict b/tutorial_cases/bdofoam_cases/react/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/bdofoam_cases/react/system/setFieldsDict rename to tutorial_cases/bdofoam_cases/react/system/setFieldsDict diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/.vim/.netrwhist b/tutorial_cases/bubble_column_20L/.vim/.netrwhist similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/.vim/.netrwhist rename to tutorial_cases/bubble_column_20L/.vim/.netrwhist diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/N2.gas b/tutorial_cases/bubble_column_20L/0.orig/N2.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/N2.gas rename to tutorial_cases/bubble_column_20L/0.orig/N2.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.gas b/tutorial_cases/bubble_column_20L/0.orig/O2.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.gas rename to tutorial_cases/bubble_column_20L/0.orig/O2.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.liquid b/tutorial_cases/bubble_column_20L/0.orig/O2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/O2.liquid rename to tutorial_cases/bubble_column_20L/0.orig/O2.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/T.gas b/tutorial_cases/bubble_column_20L/0.orig/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/T.gas rename to tutorial_cases/bubble_column_20L/0.orig/T.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/T.liquid b/tutorial_cases/bubble_column_20L/0.orig/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/T.liquid rename to tutorial_cases/bubble_column_20L/0.orig/T.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/U.gas b/tutorial_cases/bubble_column_20L/0.orig/U.gas similarity index 95% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/U.gas rename to tutorial_cases/bubble_column_20L/0.orig/U.gas index e696566f..e367ae38 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/U.gas +++ b/tutorial_cases/bubble_column_20L/0.orig/U.gas @@ -30,7 +30,8 @@ boundaryField //rho thermo:rho.gas; //value $internalField; type fixedValue; - value uniform (0 $uGasPhase 0); + value uniform (0 $uGasPhase 0); + } outlet { diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/U.liquid b/tutorial_cases/bubble_column_20L/0.orig/U.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/U.liquid rename to tutorial_cases/bubble_column_20L/0.orig/U.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.gas b/tutorial_cases/bubble_column_20L/0.orig/Ydefault.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.gas rename to tutorial_cases/bubble_column_20L/0.orig/Ydefault.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.liquid b/tutorial_cases/bubble_column_20L/0.orig/Ydefault.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/Ydefault.liquid rename to tutorial_cases/bubble_column_20L/0.orig/Ydefault.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.gas b/tutorial_cases/bubble_column_20L/0.orig/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.gas rename to tutorial_cases/bubble_column_20L/0.orig/alpha.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.liquid b/tutorial_cases/bubble_column_20L/0.orig/alpha.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alpha.liquid rename to tutorial_cases/bubble_column_20L/0.orig/alpha.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.gas b/tutorial_cases/bubble_column_20L/0.orig/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.gas rename to tutorial_cases/bubble_column_20L/0.orig/alphat.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.liquid b/tutorial_cases/bubble_column_20L/0.orig/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/alphat.liquid rename to tutorial_cases/bubble_column_20L/0.orig/alphat.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.gas b/tutorial_cases/bubble_column_20L/0.orig/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.gas rename to tutorial_cases/bubble_column_20L/0.orig/epsilon.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.liquid b/tutorial_cases/bubble_column_20L/0.orig/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/epsilon.liquid rename to tutorial_cases/bubble_column_20L/0.orig/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/f.gas b/tutorial_cases/bubble_column_20L/0.orig/f.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/f.gas rename to tutorial_cases/bubble_column_20L/0.orig/f.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/k.gas b/tutorial_cases/bubble_column_20L/0.orig/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/k.gas rename to tutorial_cases/bubble_column_20L/0.orig/k.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/k.liquid b/tutorial_cases/bubble_column_20L/0.orig/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/k.liquid rename to tutorial_cases/bubble_column_20L/0.orig/k.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.gas b/tutorial_cases/bubble_column_20L/0.orig/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.gas rename to tutorial_cases/bubble_column_20L/0.orig/nut.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.liquid b/tutorial_cases/bubble_column_20L/0.orig/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/nut.liquid rename to tutorial_cases/bubble_column_20L/0.orig/nut.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/p b/tutorial_cases/bubble_column_20L/0.orig/p similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/p rename to tutorial_cases/bubble_column_20L/0.orig/p diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/p_rgh b/tutorial_cases/bubble_column_20L/0.orig/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/p_rgh rename to tutorial_cases/bubble_column_20L/0.orig/p_rgh diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/water.gas b/tutorial_cases/bubble_column_20L/0.orig/water.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/water.gas rename to tutorial_cases/bubble_column_20L/0.orig/water.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/water.liquid b/tutorial_cases/bubble_column_20L/0.orig/water.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/0.orig/water.liquid rename to tutorial_cases/bubble_column_20L/0.orig/water.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/Allclean b/tutorial_cases/bubble_column_20L/Allclean similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/Allclean rename to tutorial_cases/bubble_column_20L/Allclean diff --git a/tutorial_cases/bubble_column_20L/README.md b/tutorial_cases/bubble_column_20L/README.md new file mode 100644 index 00000000..b5cf78f4 --- /dev/null +++ b/tutorial_cases/bubble_column_20L/README.md @@ -0,0 +1,9 @@ +### Bubble column reactor + +Bubble column reactor with 20L of liquid volume +The sparger is a circle +We use the `surfaceToPatch` method for modeling the sparger + +Single core exec + +1. `bash run.sh` diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/g b/tutorial_cases/bubble_column_20L/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/g rename to tutorial_cases/bubble_column_20L/constant/g diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/globalVars b/tutorial_cases/bubble_column_20L/constant/globalVars similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/globalVars rename to tutorial_cases/bubble_column_20L/constant/globalVars diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/globalVars_temp b/tutorial_cases/bubble_column_20L/constant/globalVars_temp similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/globalVars_temp rename to tutorial_cases/bubble_column_20L/constant/globalVars_temp diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.gas b/tutorial_cases/bubble_column_20L/constant/momentumTransport.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.gas rename to tutorial_cases/bubble_column_20L/constant/momentumTransport.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.liquid b/tutorial_cases/bubble_column_20L/constant/momentumTransport.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/momentumTransport.liquid rename to tutorial_cases/bubble_column_20L/constant/momentumTransport.liquid diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties b/tutorial_cases/bubble_column_20L/constant/phaseProperties similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties rename to tutorial_cases/bubble_column_20L/constant/phaseProperties diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_constantd b/tutorial_cases/bubble_column_20L/constant/phaseProperties_constantd similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_constantd rename to tutorial_cases/bubble_column_20L/constant/phaseProperties_constantd diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/phaseProperties b/tutorial_cases/bubble_column_20L/constant/phaseProperties_pbe similarity index 92% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/phaseProperties rename to tutorial_cases/bubble_column_20L/constant/phaseProperties_pbe index 66f6e45f..18216552 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/phaseProperties +++ b/tutorial_cases/bubble_column_20L/constant/phaseProperties_pbe @@ -83,7 +83,7 @@ populationBalanceCoeffs coalescenceModels ( LehrMilliesMewes{ - efficiency 1.0; + efficiency 4.695; uCrit 0.08; alphaMax 0.6; } @@ -95,7 +95,7 @@ populationBalanceCoeffs breakupModels ( Laakkonen { - efficiency 1.0; + efficiency 13.83; daughterSizeDistributionModel Laakkonen; } @@ -160,8 +160,8 @@ drag ( (gas in liquid) { - //type Grace; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type IshiiZuber; + type Grace; + //type IshiiZuber; residualRe 1e-3; swarmCorrection { @@ -220,8 +220,8 @@ interfaceComposition.liquid (liquid and gas) { type Henry; - species ( CO2 ); - k ( 1.04 ); + species ( O2 ); + k ( $He_O2 ); Le $LeLiqMix; } ); @@ -233,8 +233,8 @@ diffusiveMassTransfer.liquid ( (gas in liquid) { - //type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie; + //type Frossling; Le $LeLiqMix; } diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.gas b/tutorial_cases/bubble_column_20L/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.gas rename to tutorial_cases/bubble_column_20L/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.liquid b/tutorial_cases/bubble_column_20L/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/thermophysicalProperties.liquid rename to tutorial_cases/bubble_column_20L/constant/thermophysicalProperties.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/presteps.sh b/tutorial_cases/bubble_column_20L/presteps.sh similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/presteps.sh rename to tutorial_cases/bubble_column_20L/presteps.sh diff --git a/tutorial_cases/bubble_column_20L/run.sh b/tutorial_cases/bubble_column_20L/run.sh new file mode 100755 index 00000000..56d304e8 --- /dev/null +++ b/tutorial_cases/bubble_column_20L/run.sh @@ -0,0 +1,46 @@ +# Clean case +./Allclean + +echo PRESTEP 1 +# Generate blockmeshDict +python ../../applications/write_block_cyl_mesh.py -i system/mesh.json -t system/topology.json -o system + +# Generate boundary stl +python ../../applications/write_stl_patch.py -i system/inlets_outlets.json + +echo PRESTEP 2 +# Mesh gen +blockMesh -dict system/blockMeshDict +transformPoints "rotate=((0 0 1) (0 1 0))" +transformPoints "scale=(0.001 0.001 0.001)" + +# Inlet BC +surfaceToPatch -tol 1e-3 inlets.stl +export newmeshdir=$(foamListTimes -latestTime) +rm -rf constant/polyMesh/ +cp -r $newmeshdir/polyMesh ./constant +rm -rf $newmeshdir +cp constant/polyMesh/boundary /tmp +sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary +cat /tmp/boundary > constant/polyMesh/boundary + +# setup IC +cp -r 0.orig 0 +setFields + +# Scale +transformPoints "scale=(0.19145161188225573 0.19145161188225573 0.19145161188225573)" + +# Setup mass flow rate +# Get inlet area +postProcess -func 'patchIntegrate(patch="inlet", field="alpha.gas")' +postProcess -func writeCellVolumes +writeMeshObj + +echo PRESTEP 3 +python writeGlobalVars.py +cp constant/phaseProperties_pbe constant/phaseProperties + + +echo RUN +birdmultiphaseEulerFoam diff --git a/OFsolvers/tutorial_cases/bubble_column_pbe_20L/script b/tutorial_cases/bubble_column_20L/script similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column_pbe_20L/script rename to tutorial_cases/bubble_column_20L/script diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/blockMeshDict b/tutorial_cases/bubble_column_20L/system/blockMeshDict similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/blockMeshDict rename to tutorial_cases/bubble_column_20L/system/blockMeshDict diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/controlDict b/tutorial_cases/bubble_column_20L/system/controlDict similarity index 62% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/system/controlDict rename to tutorial_cases/bubble_column_20L/system/controlDict index f5166614..61d4e04a 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/controlDict +++ b/tutorial_cases/bubble_column_20L/system/controlDict @@ -16,19 +16,19 @@ FoamFile application multiphaseEulerFoam; -startFrom startTime; +startFrom latestTime;//startTime; startTime 0; -stopAt endTime; +stopAt writeNow;//endTime; endTime 100; deltaT 0.0001; -writeControl runTime; +writeControl adjustableRunTime; -writeInterval 1; +writeInterval 2; purgeWrite 0; @@ -50,6 +50,32 @@ maxCo 0.5; maxDeltaT 0.0005; + +functions +{ + + #includeFunc writeObjects(d.gas) + #includeFunc writeObjects(thermo:rho.gas) + #includeFunc writeObjects(thermo:rho.liquid) + + fieldAverage + { + type fieldAverage; + libs ("libfieldFunctionObjects.so"); + writeControl writeTime; + timeStart 0; + fields + ( + alpha.gas + { + mean on; + prime2Mean off; + base time; + } + ); + }; + +} //functions //{ // #includeFunc fieldAverage(U.air, U.water, alpha.air, p) diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/decomposeParDict b/tutorial_cases/bubble_column_20L/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/decomposeParDict rename to tutorial_cases/bubble_column_20L/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/fvConstraints b/tutorial_cases/bubble_column_20L/system/fvConstraints similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/fvConstraints rename to tutorial_cases/bubble_column_20L/system/fvConstraints diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/fvSchemes b/tutorial_cases/bubble_column_20L/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/fvSchemes rename to tutorial_cases/bubble_column_20L/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/fvSolution b/tutorial_cases/bubble_column_20L/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/fvSolution rename to tutorial_cases/bubble_column_20L/system/fvSolution diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/inlets_outlets.json b/tutorial_cases/bubble_column_20L/system/inlets_outlets.json similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/inlets_outlets.json rename to tutorial_cases/bubble_column_20L/system/inlets_outlets.json diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/mesh.json b/tutorial_cases/bubble_column_20L/system/mesh.json similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/mesh.json rename to tutorial_cases/bubble_column_20L/system/mesh.json diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/setFieldsDict b/tutorial_cases/bubble_column_20L/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/setFieldsDict rename to tutorial_cases/bubble_column_20L/system/setFieldsDict diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/topology.json b/tutorial_cases/bubble_column_20L/system/topology.json similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/system/topology.json rename to tutorial_cases/bubble_column_20L/system/topology.json diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/writeGlobalVars.py b/tutorial_cases/bubble_column_20L/writeGlobalVars.py similarity index 100% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/writeGlobalVars.py rename to tutorial_cases/bubble_column_20L/writeGlobalVars.py diff --git a/tutorial_cases/loop_reactor_mixing/.vim/.netrwhist b/tutorial_cases/loop_reactor_mixing/.vim/.netrwhist new file mode 100644 index 00000000..b9691c3b --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/.vim/.netrwhist @@ -0,0 +1,3 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhistcnt =1 +let g:netrw_dirhist_1='/home/openfoam/postProcessing/patchIntegrate(patch=inlet,field=alpha.gas)/0' diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CO2.gas b/tutorial_cases/loop_reactor_mixing/0.orig/CO2.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CO2.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/CO2.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/CO2.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/CO2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/CO2.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/CO2.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/H2.gas b/tutorial_cases/loop_reactor_mixing/0.orig/H2.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/H2.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/H2.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/H2.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/H2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/H2.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/H2.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/N2.gas b/tutorial_cases/loop_reactor_mixing/0.orig/N2.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/N2.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/N2.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/T.gas b/tutorial_cases/loop_reactor_mixing/0.orig/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/T.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/T.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/T.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/T.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/T.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.gas b/tutorial_cases/loop_reactor_mixing/0.orig/U.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/U.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/U.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/U.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/U.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/U.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/Ydefault.gas b/tutorial_cases/loop_reactor_mixing/0.orig/Ydefault.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/Ydefault.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/Ydefault.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/Ydefault.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/Ydefault.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/Ydefault.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/Ydefault.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alpha.gas b/tutorial_cases/loop_reactor_mixing/0.orig/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alpha.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/alpha.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alpha.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/alpha.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alpha.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/alpha.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alphat.gas b/tutorial_cases/loop_reactor_mixing/0.orig/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alphat.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/alphat.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alphat.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alphat.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/alphat.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/epsilon.gas b/tutorial_cases/loop_reactor_mixing/0.orig/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/epsilon.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/epsilon.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/epsilon.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/epsilon.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/f.gas b/tutorial_cases/loop_reactor_mixing/0.orig/f.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/f.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/f.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/k.gas b/tutorial_cases/loop_reactor_mixing/0.orig/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/k.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/k.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/k.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/k.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/k.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/nut.gas b/tutorial_cases/loop_reactor_mixing/0.orig/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/nut.gas rename to tutorial_cases/loop_reactor_mixing/0.orig/nut.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/nut.liquid b/tutorial_cases/loop_reactor_mixing/0.orig/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/nut.liquid rename to tutorial_cases/loop_reactor_mixing/0.orig/nut.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/p b/tutorial_cases/loop_reactor_mixing/0.orig/p similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/p rename to tutorial_cases/loop_reactor_mixing/0.orig/p diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/p_rgh b/tutorial_cases/loop_reactor_mixing/0.orig/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/p_rgh rename to tutorial_cases/loop_reactor_mixing/0.orig/p_rgh diff --git a/OFsolvers/tutorial_cases/bubble_column/Allclean b/tutorial_cases/loop_reactor_mixing/Allclean similarity index 95% rename from OFsolvers/tutorial_cases/bubble_column/Allclean rename to tutorial_cases/loop_reactor_mixing/Allclean index edb8db17..6c023512 100755 --- a/OFsolvers/tutorial_cases/bubble_column/Allclean +++ b/tutorial_cases/loop_reactor_mixing/Allclean @@ -11,6 +11,9 @@ cd ${0%/*} || exit 1 # Run from this directory #rm -rf processor* > /dev/null 2>&1 rm -rf 0 cleanCase -rm system/blockMeshDict + rm *.obj +rm *.stl +rm *.txt + #------------------------------------------------------------------------------ diff --git a/tutorial_cases/loop_reactor_mixing/README.md b/tutorial_cases/loop_reactor_mixing/README.md new file mode 100644 index 00000000..c65085c5 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/README.md @@ -0,0 +1,10 @@ +### Loop reactor with dynamic mixers + +Loop reactor with 4 sparger, and 4 dynamics mixers +The loop reactor has 608m3 of liquid +The volume flow rate is 0.4vvm as defined in `constant/globalVars` +Each mixer uses 3kW of power. + +Single core exec + +1. `bash run.sh` diff --git a/tutorial_cases/loop_reactor_mixing/computeQOI.sh b/tutorial_cases/loop_reactor_mixing/computeQOI.sh new file mode 100644 index 00000000..3756ed7f --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/computeQOI.sh @@ -0,0 +1,13 @@ +if [ ! -f qoi.txt ]; then + # Reconstruct if needed + source /projects/gas2fuels/ofoam_cray_mpich/OpenFOAM-dev/etc/bashrc + reconstructPar -newTimes + module load anaconda3/2023 + conda activate /projects/gas2fuels/conda_env/bird + python read_history.py -cr .. -cn local -df data + python get_qoi.py + conda deactivate +else + echo "WARNING: QOI already computed" +fi + diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/dynamicMix_util.H b/tutorial_cases/loop_reactor_mixing/constant/dynamicMix_util.H similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/dynamicMix_util.H rename to tutorial_cases/loop_reactor_mixing/constant/dynamicMix_util.H diff --git a/tutorial_cases/loop_reactor_mixing/constant/fvModels b/tutorial_cases/loop_reactor_mixing/constant/fvModels new file mode 100644 index 00000000..94d8d829 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/constant/fvModels @@ -0,0 +1,372 @@ +FoamFile +{ + version 9.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} + +codedSource +{ + type coded; + selectionMode all; + field U.liquid; + name sourceTime; + + codeInclude + #{ + #include "dynamicMix_util.H" + #}; + + codeOptions + #{ + -I${FOAM_CASE}/constant + #}; + codeAddAlphaRhoSup + #{ + const Time& time = mesh().time(); + const scalarField& V = mesh().V(); + vectorField& Usource = eqn.source(); + const vectorField& C = mesh().C(); + const volScalarField& rhoL = + mesh().lookupObject("thermo:rho.liquid"); + const volScalarField& alphaL = + mesh().lookupObject("alpha.liquid"); + const volVectorField& UL = + mesh().lookupObject("U.liquid"); + double pi=3.141592654; + double source_pt_x; + double source_pt_y; + double source_pt_z; + double disk_rad; + double disk_area; + double power; + double smear_factor; + double startTime; + source_pt_x=11.32226290810711; + source_pt_y=1.3807637692813548; + source_pt_z=1.3807637692813548; + disk_rad=0.9665346384969483; + disk_area=pi*disk_rad*disk_rad; + power=3000; + smear_factor=3.0; + startTime = 3; + if (time.value() > startTime) + { + // Get V1 + double source_sign_factor = 1.0; + double V1 = 0; + double V2 = 0; + double rhoV; + double dist_tol = disk_rad*3; + + double dist_n; + double upV = 0; + double uprhoV = 0; + double upVvol = 0; + double downV = 0; + double downrhoV = 0; + double downVvol = 0; + double dist2; + forAll(C,i) + { + dist2 = (C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + + dist_n = (C[i].x()-source_pt_x); + + if (dist2 < dist_tol*dist_tol && dist_n < -dist_tol/2) { + upVvol += V[i] * alphaL[i]; + upV += V[i] * alphaL[i] * UL[i][0]; + uprhoV += V[i] * alphaL[i] * rhoL[i]; + } + if (dist2 < dist_tol*dist_tol && dist_n > dist_tol/2) { + downVvol += V[i] * alphaL[i]; + downV += V[i] * alphaL[i] * UL[i][0]; + downrhoV += V[i] * alphaL[i] * rhoL[i]; + } + } + + reduce(uprhoV, sumOp()); + reduce(downrhoV, sumOp()); + reduce(upV, sumOp()); + reduce(downV, sumOp()); + reduce(downVvol, sumOp()); + reduce(upVvol, sumOp()); + + downV /= downVvol; + upV /= upVvol; + downrhoV /= downVvol; + uprhoV /= upVvol; + + source_sign_factor = -1.0; + if (upV >= 0){ + V1 = 0.0; + } else { + V1 = std::abs(upV); + } + rhoV = uprhoV; + Foam::Info << "[BIRD:DYNMIX INFO] V1 = " << V1 << endl; + + // Get V2 + V2 = findV2(power, rhoV, disk_area, V1); + + forAll(C,i) + { + double Thrust=0.5*rhoL[i]*(V2*V2 - V1*V1)*disk_area; + double dist2=(C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + double epsilon=pow(V[i],0.33333)*smear_factor; + double sourceterm=alphaL[i]*(Thrust/pow(pi,1.5)/pow(epsilon,3.0))* + exp(-dist2/(epsilon*epsilon)); + Usource[i][0] -= source_sign_factor*sourceterm*V[i]; + } + } + source_pt_x=16.293012477519987; + source_pt_y=1.3807637692813548; + source_pt_z=1.3807637692813548; + disk_rad=0.9665346384969483; + disk_area=pi*disk_rad*disk_rad; + power=3000; + smear_factor=3.0; + startTime = 3; + if (time.value() > startTime) + { + // Get V1 + double source_sign_factor = 1.0; + double V1 = 0; + double V2 = 0; + double rhoV; + double dist_tol = disk_rad*3; + + double dist_n; + double upV = 0; + double uprhoV = 0; + double upVvol = 0; + double downV = 0; + double downrhoV = 0; + double downVvol = 0; + double dist2; + forAll(C,i) + { + dist2 = (C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + + dist_n = (C[i].x()-source_pt_x); + + if (dist2 < dist_tol*dist_tol && dist_n < -dist_tol/2) { + upVvol += V[i] * alphaL[i]; + upV += V[i] * alphaL[i] * UL[i][0]; + uprhoV += V[i] * alphaL[i] * rhoL[i]; + } + if (dist2 < dist_tol*dist_tol && dist_n > dist_tol/2) { + downVvol += V[i] * alphaL[i]; + downV += V[i] * alphaL[i] * UL[i][0]; + downrhoV += V[i] * alphaL[i] * rhoL[i]; + } + } + + reduce(uprhoV, sumOp()); + reduce(downrhoV, sumOp()); + reduce(upV, sumOp()); + reduce(downV, sumOp()); + reduce(downVvol, sumOp()); + reduce(upVvol, sumOp()); + + downV /= downVvol; + upV /= upVvol; + downrhoV /= downVvol; + uprhoV /= upVvol; + + source_sign_factor = -1.0; + if (upV >= 0){ + V1 = 0.0; + } else { + V1 = std::abs(upV); + } + rhoV = uprhoV; + Foam::Info << "[BIRD:DYNMIX INFO] V1 = " << V1 << endl; + + // Get V2 + V2 = findV2(power, rhoV, disk_area, V1); + + forAll(C,i) + { + double Thrust=0.5*rhoL[i]*(V2*V2 - V1*V1)*disk_area; + double dist2=(C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + double epsilon=pow(V[i],0.33333)*smear_factor; + double sourceterm=alphaL[i]*(Thrust/pow(pi,1.5)/pow(epsilon,3.0))* + exp(-dist2/(epsilon*epsilon)); + Usource[i][0] -= source_sign_factor*sourceterm*V[i]; + } + } + source_pt_x=21.263762046932865; + source_pt_y=1.3807637692813548; + source_pt_z=1.3807637692813548; + disk_rad=0.9665346384969483; + disk_area=pi*disk_rad*disk_rad; + power=3000; + smear_factor=3.0; + startTime = 3; + if (time.value() > startTime) + { + // Get V1 + double source_sign_factor = 1.0; + double V1 = 0; + double V2 = 0; + double rhoV; + double dist_tol = disk_rad*3; + + double dist_n; + double upV = 0; + double uprhoV = 0; + double upVvol = 0; + double downV = 0; + double downrhoV = 0; + double downVvol = 0; + double dist2; + forAll(C,i) + { + dist2 = (C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + + dist_n = (C[i].x()-source_pt_x); + + if (dist2 < dist_tol*dist_tol && dist_n < -dist_tol/2) { + upVvol += V[i] * alphaL[i]; + upV += V[i] * alphaL[i] * UL[i][0]; + uprhoV += V[i] * alphaL[i] * rhoL[i]; + } + if (dist2 < dist_tol*dist_tol && dist_n > dist_tol/2) { + downVvol += V[i] * alphaL[i]; + downV += V[i] * alphaL[i] * UL[i][0]; + downrhoV += V[i] * alphaL[i] * rhoL[i]; + } + } + + reduce(uprhoV, sumOp()); + reduce(downrhoV, sumOp()); + reduce(upV, sumOp()); + reduce(downV, sumOp()); + reduce(downVvol, sumOp()); + reduce(upVvol, sumOp()); + + downV /= downVvol; + upV /= upVvol; + downrhoV /= downVvol; + uprhoV /= upVvol; + + source_sign_factor = -1.0; + if (upV >= 0){ + V1 = 0.0; + } else { + V1 = std::abs(upV); + } + rhoV = uprhoV; + Foam::Info << "[BIRD:DYNMIX INFO] V1 = " << V1 << endl; + + // Get V2 + V2 = findV2(power, rhoV, disk_area, V1); + + forAll(C,i) + { + double Thrust=0.5*rhoL[i]*(V2*V2 - V1*V1)*disk_area; + double dist2=(C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + double epsilon=pow(V[i],0.33333)*smear_factor; + double sourceterm=alphaL[i]*(Thrust/pow(pi,1.5)/pow(epsilon,3.0))* + exp(-dist2/(epsilon*epsilon)); + Usource[i][0] -= source_sign_factor*sourceterm*V[i]; + } + } + source_pt_x=16.293012477519987; + source_pt_y=1.3807637692813548; + source_pt_z=12.426873923532193; + disk_rad=0.9665346384969483; + disk_area=pi*disk_rad*disk_rad; + power=3000; + smear_factor=3.0; + startTime = 3; + if (time.value() > startTime) + { + // Get V1 + double source_sign_factor = 1.0; + double V1 = 0; + double V2 = 0; + double rhoV; + double dist_tol = disk_rad*3; + + double dist_n; + double upV = 0; + double uprhoV = 0; + double upVvol = 0; + double downV = 0; + double downrhoV = 0; + double downVvol = 0; + double dist2; + forAll(C,i) + { + dist2 = (C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + + dist_n = (C[i].x()-source_pt_x); + + if (dist2 < dist_tol*dist_tol && dist_n < -dist_tol/2) { + upVvol += V[i] * alphaL[i]; + upV += V[i] * alphaL[i] * UL[i][0]; + uprhoV += V[i] * alphaL[i] * rhoL[i]; + } + if (dist2 < dist_tol*dist_tol && dist_n > dist_tol/2) { + downVvol += V[i] * alphaL[i]; + downV += V[i] * alphaL[i] * UL[i][0]; + downrhoV += V[i] * alphaL[i] * rhoL[i]; + } + } + + reduce(uprhoV, sumOp()); + reduce(downrhoV, sumOp()); + reduce(upV, sumOp()); + reduce(downV, sumOp()); + reduce(downVvol, sumOp()); + reduce(upVvol, sumOp()); + + downV /= downVvol; + upV /= upVvol; + downrhoV /= downVvol; + uprhoV /= upVvol; + + source_sign_factor = 1.0; + if (downV <= 0){ + V1 = 0.0; + } else { + V1 = std::abs(downV); + } + rhoV = downrhoV; + Foam::Info << "[BIRD:DYNMIX INFO] V1 = " << V1 << endl; + + // Get V2 + V2 = findV2(power, rhoV, disk_area, V1); + + forAll(C,i) + { + double Thrust=0.5*rhoL[i]*(V2*V2 - V1*V1)*disk_area; + double dist2=(C[i].x()-source_pt_x)*(C[i].x()-source_pt_x); + dist2 += (C[i].y()-source_pt_y)*(C[i].y()-source_pt_y); + dist2 += (C[i].z()-source_pt_z)*(C[i].z()-source_pt_z); + double epsilon=pow(V[i],0.33333)*smear_factor; + double sourceterm=alphaL[i]*(Thrust/pow(pi,1.5)/pow(epsilon,3.0))* + exp(-dist2/(epsilon*epsilon)); + Usource[i][0] -= source_sign_factor*sourceterm*V[i]; + } + } + #}; +}; diff --git a/OFsolvers/tutorial_cases/loop_reactor/constant/g b/tutorial_cases/loop_reactor_mixing/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor/constant/g rename to tutorial_cases/loop_reactor_mixing/constant/g diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars b/tutorial_cases/loop_reactor_mixing/constant/globalVars similarity index 93% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars rename to tutorial_cases/loop_reactor_mixing/constant/globalVars index 61fa6e5e..c0dce472 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/globalVars +++ b/tutorial_cases/loop_reactor_mixing/constant/globalVars @@ -1,4 +1,5 @@ T0 300; //initial T(K) which stays constant +VVM 0.4; //****water Liquid properties************** CpMixLiq 4181; muMixLiq #calc "2.414e-5 * pow(10,247.8/($T0 - 140.0))"; //viscosity (Pa.s) of water as a function of T(K) @@ -39,22 +40,22 @@ He_CO2 #calc "$H_CO2_298 * exp($DH_CO2 *(1. / $T0 - 1./298.15))"; He_CH4 #calc "$H_CH4_298 * exp($DH_CH4 *(1. / $T0 - 1./298.15))"; He_N2 #calc "$H_N2_298 * exp($DH_N2 *(1. / $T0 - 1./298.15))"; //*******inlet gas frac************* -x_N2 0.522; -x_CO2 0.478; -f_N2 #calc "$x_N2*0.028 / ($x_CO2*0.044 + $x_N2*0.028)"; -f_CO2 #calc "$x_CO2*0.044 / ($x_CO2*0.044 + $x_N2*0.028)"; +f_H2 0.1; +f_CO2 0.9; +f_N2 0.0; //*******inlet gas frac************* -uGasPhase 0.025; +inletA 15.8621; +liqVol 608.198; alphaGas 1; alphaLiq 0; -uGasPhase #calc "$uGasPhase / $alphaGas"; +uGasPhase #calc "$liqVol * $VVM / (60 * $inletA * $alphaGas)"; //********************************* LeLiqH2 #calc "$kThermLiq / $rho0MixLiq / $D_H2 / $CpMixLiq"; LeLiqCO #calc "$kThermLiq / $rho0MixLiq / $D_CO / $CpMixLiq"; LeLiqCO2 #calc "$kThermLiq / $rho0MixLiq / $D_CO2 / $CpMixLiq"; // = 74 LeLiqCH4 #calc "$kThermLiq / $rho0MixLiq / $D_CH4 / $CpMixLiq"; LeLiqN2 #calc "$kThermLiq / $rho0MixLiq / $D_N2 / $CpMixLiq"; -LeLiqMix #calc "$f_CO2*$LeLiqCO2+$f_N2*$LeLiqN2"; +LeLiqMix #calc "$f_CO2*$LeLiqCO2+$f_H2*$LeLiqH2"; PrMixLiq #calc "$CpMixLiq * $muMixLiq / $kThermLiq"; //********************************* kH2 #calc "$D_H2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/globalVars b/tutorial_cases/loop_reactor_mixing/constant/globalVars_temp similarity index 93% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/globalVars rename to tutorial_cases/loop_reactor_mixing/constant/globalVars_temp index 61fa6e5e..dfddd649 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/globalVars +++ b/tutorial_cases/loop_reactor_mixing/constant/globalVars_temp @@ -1,4 +1,5 @@ T0 300; //initial T(K) which stays constant +VVM 0.4; //****water Liquid properties************** CpMixLiq 4181; muMixLiq #calc "2.414e-5 * pow(10,247.8/($T0 - 140.0))"; //viscosity (Pa.s) of water as a function of T(K) @@ -39,22 +40,22 @@ He_CO2 #calc "$H_CO2_298 * exp($DH_CO2 *(1. / $T0 - 1./298.15))"; He_CH4 #calc "$H_CH4_298 * exp($DH_CH4 *(1. / $T0 - 1./298.15))"; He_N2 #calc "$H_N2_298 * exp($DH_N2 *(1. / $T0 - 1./298.15))"; //*******inlet gas frac************* -x_N2 0.522; -x_CO2 0.478; -f_N2 #calc "$x_N2*0.028 / ($x_CO2*0.044 + $x_N2*0.028)"; -f_CO2 #calc "$x_CO2*0.044 / ($x_CO2*0.044 + $x_N2*0.028)"; +f_H2 0.1; +f_CO2 0.9; +f_N2 0.0; //*******inlet gas frac************* -uGasPhase 0.025; +inletA ; +liqVol ; alphaGas 1; alphaLiq 0; -uGasPhase #calc "$uGasPhase / $alphaGas"; +uGasPhase #calc "$liqVol * $VVM / (60 * $inletA * $alphaGas)"; //********************************* LeLiqH2 #calc "$kThermLiq / $rho0MixLiq / $D_H2 / $CpMixLiq"; LeLiqCO #calc "$kThermLiq / $rho0MixLiq / $D_CO / $CpMixLiq"; LeLiqCO2 #calc "$kThermLiq / $rho0MixLiq / $D_CO2 / $CpMixLiq"; // = 74 LeLiqCH4 #calc "$kThermLiq / $rho0MixLiq / $D_CH4 / $CpMixLiq"; LeLiqN2 #calc "$kThermLiq / $rho0MixLiq / $D_N2 / $CpMixLiq"; -LeLiqMix #calc "$f_CO2*$LeLiqCO2+$f_N2*$LeLiqN2"; +LeLiqMix #calc "$f_CO2*$LeLiqCO2+$f_H2*$LeLiqH2"; PrMixLiq #calc "$CpMixLiq * $muMixLiq / $kThermLiq"; //********************************* kH2 #calc "$D_H2*$rho0MixLiq*$CpMixLiq*$LeLiqMix"; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/momentumTransport.gas b/tutorial_cases/loop_reactor_mixing/constant/momentumTransport.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/constant/momentumTransport.gas rename to tutorial_cases/loop_reactor_mixing/constant/momentumTransport.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/momentumTransport.liquid b/tutorial_cases/loop_reactor_mixing/constant/momentumTransport.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/constant/momentumTransport.liquid rename to tutorial_cases/loop_reactor_mixing/constant/momentumTransport.liquid diff --git a/tutorial_cases/loop_reactor_mixing/constant/phaseProperties b/tutorial_cases/loop_reactor_mixing/constant/phaseProperties new file mode 100644 index 00000000..e029df99 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/constant/phaseProperties @@ -0,0 +1,261 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + object phaseProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "$FOAM_CASE/constant/globalVars" + +type interfaceCompositionPhaseChangeMultiphaseSystem; + +phases (gas liquid); + +gas +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel constant; + + constantCoeffs + { + d 3e-3; + } + residualAlpha 1e-6; + Sc 0.7; +} + +liquid +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel constant; + + constantCoeffs + { + d 1e-4; + } + Sc #codeStream + { + code + #{ + os << ($LeLiqMix * $CpMixLiq * $muMixLiq / $kThermLiq); + #}; + }; + + residualAlpha 1e-6; +} + +populationBalanceCoeffs +{ + bubbles + { + continuousPhase liquid; + + coalescenceModels + (); + + binaryBreakupModels + (); + + breakupModels + (); + + driftModels + (); + + nucleationModels + (); + } +} + +blending +{ + default + { + type linear; + minFullyContinuousAlpha.gas 0.7; + minPartlyContinuousAlpha.gas 0.3; + minFullyContinuousAlpha.liquid 0.7; + minPartlyContinuousAlpha.liquid 0.3; + } + heatTransfer + { + type linear; + minFullyContinuousAlpha.gas 1; + minPartlyContinuousAlpha.gas 0; + minFullyContinuousAlpha.liquid 1; + minPartlyContinuousAlpha.liquid 0; + } + massTransfer + { + $heatTransfer; + } +} + +surfaceTension +( + (gas and liquid) + { + type constant; + sigma $sigmaLiq; + } +); + +interfaceCompression +(); + +aspectRatio +( + (gas in liquid) + { + type Wellek; + } +); + + +drag +( + (gas in liquid) + { + type Grace; // Need to install the model available at https://github.com/NREL/BioReactorDesign + //type IshiiZuber; + residualRe 1e-3; + swarmCorrection + { + type none; + } + } +); + +virtualMass +( + (gas in liquid) + { + type constantCoefficient; + Cvm 0.5; + } +); + +// heatTransfer +// (); + +heatTransfer.gas +( + (gas in liquid) + { + type spherical; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type RanzMarshall; + residualAlpha 1e-4; + } +); + +heatTransfer.liquid +( + (gas in liquid) + { + type RanzMarshall; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type spherical; + residualAlpha 1e-4; + } +); + +interfaceComposition.gas +(); + +interfaceComposition.liquid +( + (liquid and gas) + { + type Henry; + species ( CO2 H2 ); + k ( $He_CO2 $He_H2 ); + Le $LeLiqMix; + } +); + +diffusiveMassTransfer.gas +(); + +diffusiveMassTransfer.liquid +( + (gas in liquid) + { + type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign + //type Frossling; + Le $LeLiqMix; + } + + (liquid in gas) + { + type spherical; + Le 1.0; //not used for spherical + } +); + +phaseTransfer +(); + +lift +( + (gas in liquid) + { + type wallDamped; + + wallDamping + { + type cosine; + Cd 3.0; + } + + lift + { + type Tomiyama; + + swarmCorrection + { + type none; + } + } + } + +); + +wallLubrication +( + (gas in liquid) + { + type Antal; + Cw1 -0.01; + Cw2 0.05; + } +); + +turbulentDispersion +( + (gas in liquid) + { + type Burns; + sigma 0.9; + } +); + +// ************************************************************************* // diff --git a/tutorial_cases/loop_reactor_mixing/constant/phaseProperties_constantd b/tutorial_cases/loop_reactor_mixing/constant/phaseProperties_constantd new file mode 100644 index 00000000..e029df99 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/constant/phaseProperties_constantd @@ -0,0 +1,261 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + object phaseProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "$FOAM_CASE/constant/globalVars" + +type interfaceCompositionPhaseChangeMultiphaseSystem; + +phases (gas liquid); + +gas +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel constant; + + constantCoeffs + { + d 3e-3; + } + residualAlpha 1e-6; + Sc 0.7; +} + +liquid +{ + type multiComponentPhaseModel;//pureIsothermalPhaseModel; + + diameterModel constant; + + constantCoeffs + { + d 1e-4; + } + Sc #codeStream + { + code + #{ + os << ($LeLiqMix * $CpMixLiq * $muMixLiq / $kThermLiq); + #}; + }; + + residualAlpha 1e-6; +} + +populationBalanceCoeffs +{ + bubbles + { + continuousPhase liquid; + + coalescenceModels + (); + + binaryBreakupModels + (); + + breakupModels + (); + + driftModels + (); + + nucleationModels + (); + } +} + +blending +{ + default + { + type linear; + minFullyContinuousAlpha.gas 0.7; + minPartlyContinuousAlpha.gas 0.3; + minFullyContinuousAlpha.liquid 0.7; + minPartlyContinuousAlpha.liquid 0.3; + } + heatTransfer + { + type linear; + minFullyContinuousAlpha.gas 1; + minPartlyContinuousAlpha.gas 0; + minFullyContinuousAlpha.liquid 1; + minPartlyContinuousAlpha.liquid 0; + } + massTransfer + { + $heatTransfer; + } +} + +surfaceTension +( + (gas and liquid) + { + type constant; + sigma $sigmaLiq; + } +); + +interfaceCompression +(); + +aspectRatio +( + (gas in liquid) + { + type Wellek; + } +); + + +drag +( + (gas in liquid) + { + type Grace; // Need to install the model available at https://github.com/NREL/BioReactorDesign + //type IshiiZuber; + residualRe 1e-3; + swarmCorrection + { + type none; + } + } +); + +virtualMass +( + (gas in liquid) + { + type constantCoefficient; + Cvm 0.5; + } +); + +// heatTransfer +// (); + +heatTransfer.gas +( + (gas in liquid) + { + type spherical; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type RanzMarshall; + residualAlpha 1e-4; + } +); + +heatTransfer.liquid +( + (gas in liquid) + { + type RanzMarshall; + residualAlpha 1e-4; + } + + (liquid in gas) + { + type spherical; + residualAlpha 1e-4; + } +); + +interfaceComposition.gas +(); + +interfaceComposition.liquid +( + (liquid and gas) + { + type Henry; + species ( CO2 H2 ); + k ( $He_CO2 $He_H2 ); + Le $LeLiqMix; + } +); + +diffusiveMassTransfer.gas +(); + +diffusiveMassTransfer.liquid +( + (gas in liquid) + { + type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign + //type Frossling; + Le $LeLiqMix; + } + + (liquid in gas) + { + type spherical; + Le 1.0; //not used for spherical + } +); + +phaseTransfer +(); + +lift +( + (gas in liquid) + { + type wallDamped; + + wallDamping + { + type cosine; + Cd 3.0; + } + + lift + { + type Tomiyama; + + swarmCorrection + { + type none; + } + } + } + +); + +wallLubrication +( + (gas in liquid) + { + type Antal; + Cw1 -0.01; + Cw2 0.05; + } +); + +turbulentDispersion +( + (gas in liquid) + { + type Burns; + sigma 0.9; + } +); + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_pbe b/tutorial_cases/loop_reactor_mixing/constant/phaseProperties_pbe similarity index 98% rename from OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_pbe rename to tutorial_cases/loop_reactor_mixing/constant/phaseProperties_pbe index 4cd56ae8..a3c90f5a 100644 --- a/OFsolvers/tutorial_cases/disengagement/bubble_column_pbe_20L/constant/phaseProperties_pbe +++ b/tutorial_cases/loop_reactor_mixing/constant/phaseProperties_pbe @@ -220,8 +220,8 @@ interfaceComposition.liquid (liquid and gas) { type Henry; - species ( O2 ); - k ( $He_O2 ); + species ( CO2 H2 ); + k ( $He_CO2 $He_H2 ); Le $LeLiqMix; } ); diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/thermophysicalProperties.gas b/tutorial_cases/loop_reactor_mixing/constant/thermophysicalProperties.gas similarity index 82% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/constant/thermophysicalProperties.gas rename to tutorial_cases/loop_reactor_mixing/constant/thermophysicalProperties.gas index 10b5b74b..11b1c4b9 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/thermophysicalProperties.gas +++ b/tutorial_cases/loop_reactor_mixing/constant/thermophysicalProperties.gas @@ -29,11 +29,12 @@ thermoType species ( + H2 CO2 N2 ); -defaultSpecie CO2; +defaultSpecie N2; CO2 { @@ -112,5 +113,30 @@ N2 } } +H2 +{ + specie + { + molWeight 2.01594; + } + thermodynamics + { + Tlow 200; + Thigh 3500; + Tcommon 1000; + highCpCoeffs ( 3.3372792 -4.94024731e-05 4.99456778e-07 -1.79566394e-10 2.00255376e-14 -950.158922 -3.20502331 ); + lowCpCoeffs ( 2.34433112 0.00798052075 -1.9478151e-05 2.01572094e-08 -7.37611761e-12 -917.935173 0.683010238 ); + } + transport + { + As 6.362e-07; + Ts 72; + } + elements + { + H 2; + } +} + // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/thermophysicalProperties.liquid b/tutorial_cases/loop_reactor_mixing/constant/thermophysicalProperties.liquid similarity index 75% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/thermophysicalProperties.liquid rename to tutorial_cases/loop_reactor_mixing/constant/thermophysicalProperties.liquid index e697904f..d324ec51 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/thermophysicalProperties.liquid +++ b/tutorial_cases/loop_reactor_mixing/constant/thermophysicalProperties.liquid @@ -21,7 +21,7 @@ thermoType type heRhoThermo; mixture multiComponentMixture; transport const; - thermo eConst; + thermo hConst; equationOfState rhoConst;//rPolynomial; specie specie; energy sensibleInternalEnergy; @@ -32,11 +32,12 @@ species ( CO2 water + H2 ); inertSpecie water; -"(mixture|water)" +water { specie { @@ -48,35 +49,57 @@ inertSpecie water; } thermodynamics { - Cv $CpMixLiq; + Cp $CpMixLiq; Hf -1.5879e+07; } transport { mu $muMixLiq; - Pr 2.289; + Pr $PrMixLiq; } } -CO2 +CO2 +{ + specie + { + molWeight 44.00995; + } + equationOfState + { + rho $rho0MixLiq; + } + thermodynamics + { + Cp $CpMixLiq; + Hf -1.5879e+07; + } + transport + { + mu $muMixLiq; + Pr $PrCO2; + } +} + +H2 { specie { - molWeight 44.00995; + molWeight 2.01594; } equationOfState { - rho 997; + rho $rho0MixLiq; } thermodynamics { - Cv $CpMixLiq; - Hf -1.5879e+07; + Cp $CpMixLiq; + Hf -1.5879e+07;//-9402451; } transport { mu $muMixLiq; - Pr $PrCO2; + Pr $PrH2; } } diff --git a/tutorial_cases/loop_reactor_mixing/get_qoi.py b/tutorial_cases/loop_reactor_mixing/get_qoi.py new file mode 100644 index 00000000..f36f6f3c --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/get_qoi.py @@ -0,0 +1,199 @@ +import json +import os +import pickle as pkl + +import matplotlib as mpl +import numpy as np +from prettyPlot.plotting import * +from scipy.optimize import curve_fit + + +def get_sim_folds(path): + folds = os.listdir(path) + sim_folds = [] + for fold in folds: + if fold.startswith("loop"): + sim_folds.append(fold) + return sim_folds + + +def func(t, cstar, kla): + t = t + t0 = 0 + c0 = 0 + return (cstar - c0) * (1 - np.exp(-kla * (t - t0))) + c0 + + +def get_vl(verb=False): + filename = os.path.join("constant", "globalVars") + with open(filename, "r+") as f: + lines = f.readlines() + for line in lines: + if line.startswith("liqVol"): + vol = float(line.split()[-1][:-1]) + break + if verb: + print(f"Read liqVol = {vol}m3") + return vol + + +def get_vvm(verb=False): + filename = os.path.join("constant", "globalVars") + with open(filename, "r+") as f: + lines = f.readlines() + for line in lines: + if line.startswith("VVM"): + vvm = float(line.split()[-1][:-1]) + break + if verb: + print(f"Read VVM = {vvm} [-]") + return vvm + + +def get_As(verb=False): + filename = os.path.join("constant", "globalVars") + with open(filename, "r+") as f: + lines = f.readlines() + for line in lines: + if line.startswith("inletA"): + As = float(line.split()[-1][:-1]) + break + if verb: + print(f"Read As = {As}m2") + return As + + +def get_pmix(verb=False): + with open("system/mixers.json", "r+") as f: + data = json.load(f) + mixer_list = data["mixers"] + pmix = 0 + for mix in mixer_list: + pmix += mix["power"] / 1000 + if verb: + print(f"Read Mixing power = {pmix}kW") + return pmix + + +def get_lh(verb=False): + filename = os.path.join("system", "setFieldsDict") + with open(filename, "r+") as f: + lines = f.readlines() + for line in lines: + if "box (-1.0 -1.0 -1.0)" in line: + height = float(line.split("(")[2].split()[1]) + break + if verb: + print(f"Read Height = {height}m") + return height + + +def get_pinj(vvm, Vl, As, lh): + rhog = 1.25 # kg /m3 + Vg = Vl * vvm / (60 * As * 1) # m/s + Ptank = 101325 # Pa + # Ptank = 0 # Pa + rhoL = 1000 # kg / m3 + Pl = 101325 + rhoL * 9.8 * lh # Pa + # W + P1 = rhog * As * Vg**3 + # W + P2 = (Pl - Ptank) * As * Vg + # kg /s + MF = rhog * Vg * As + # kwh / kg + e_m = (P1 + P2) / (3600 * 1000 * MF) + + # returns kW + return (P1 + P2) * 1e-3 + + +def get_qoi(kla_co2, cs_co2, kla_h2, cs_h2, verb=False): + vvm = get_vvm(verb) + As = get_As(verb) + V_l = get_vl(verb) + liqh = get_lh(verb) + P_inj = get_pinj(vvm, V_l, As, liqh) + P_mix = get_pmix(verb) + + qoi_kla_co2 = kla_co2 * cs_co2 * V_l * 0.04401 + qoi_kla_h2 = kla_h2 * cs_h2 * V_l * 0.002016 + + qoi_co2 = qoi_kla_co2 / (P_mix / 3600 + P_inj / 3600) + qoi_h2 = qoi_kla_h2 / (P_mix / 3600 + P_inj / 3600) + return qoi_co2 * qoi_h2, qoi_kla_co2 * qoi_kla_h2 + + +def get_qoi_uq(kla_co2, cs_co2, kla_h2, cs_h2): + qoi = [] + qoi_kla = [] + for i in range(len(kla_co2)): + if i == 0: + verb = True + else: + verb = False + qoi_tmp, qoi_kla_tmp = get_qoi( + kla_co2[i], cs_co2[i], kla_h2[i], cs_h2[i], verb + ) + qoi.append(qoi_tmp) + qoi_kla.append(qoi_kla_tmp) + qoi = np.array(qoi) + qoi_kla = np.array(qoi_kla) + return np.mean(qoi), np.std(qoi), np.mean(qoi_kla), np.std(qoi_kla) + + +os.makedirs("Figures", exist_ok=True) + +dataFolder = "data" +fold = "local" + +nuq = 100 +# mean_cstar_co2 = np.random.uniform(12.6, 13.3, nuq) +# mean_cstar_h2 = np.random.uniform(0.902, 0.96, nuq) +mean_cstar_co2 = np.random.uniform(11.9, 13.4, nuq) +mean_cstar_h2 = np.random.uniform(0.884, 0.943, nuq) + + +tmp_cs_h2 = [] +tmp_cs_co2 = [] +tmp_kla_h2 = [] +tmp_kla_co2 = [] +cs_co2 = mean_cstar_co2 +cs_h2 = mean_cstar_h2 + +a = np.load(os.path.join(dataFolder, fold, "conv.npz")) +endindex = -1 +if ( + "c_h2" in a + and "c_co2" in a + and len(a["time"][:endindex] > 0) + and (a["time"][:endindex][-1] > 95) +): + for i in range(nuq): + fitparamsH2, _ = curve_fit( + func, + np.array(a["time"][:endindex]), + np.array(a["c_h2"][:endindex]), + bounds=[(cs_h2[i] - 1e-6, 0), (cs_h2[i] + 1e-6, 1)], + ) + fitparamsCO2, _ = curve_fit( + func, + np.array(a["time"][:endindex]), + np.array(a["c_co2"][:endindex]), + bounds=[(cs_co2[i] - 1e-6, 0), (cs_co2[i] + 1e-6, 1)], + ) + tmp_kla_co2.append(fitparamsCO2[1]) + tmp_kla_h2.append(fitparamsH2[1]) + tmp_cs_h2.append(cs_h2[i]) + tmp_cs_co2.append(cs_co2[i]) + +qoi_m, qoi_s, qoi_kla_m, qoi_kla_s = get_qoi_uq( + tmp_kla_co2, tmp_cs_co2, tmp_kla_h2, tmp_cs_h2 +) + + +with open("qoi.txt", "w+") as f: + f.write(f"{qoi_m},{qoi_s}\n") + +with open("qoi_kla.txt", "w+") as f: + f.write(f"{qoi_kla_m},{qoi_kla_s}\n") diff --git a/tutorial_cases/loop_reactor_mixing/presteps.sh b/tutorial_cases/loop_reactor_mixing/presteps.sh new file mode 100644 index 00000000..6d419bf9 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/presteps.sh @@ -0,0 +1,71 @@ +# Clean case +module load anaconda3/2023 +conda activate /projects/gas2fuels/conda_env/bird +source /projects/gas2fuels/ofoam_cray_mpich/OpenFOAM-dev/etc/bashrc +./Allclean + +echo PRESTEP 1 +# Generate blockmeshDict +python /projects/gas2fuels/BioReactorDesign/applications/write_block_rect_mesh.py -i system/mesh.json -o system +#python ../../../applications/write_block_rect_mesh.py -i system/mesh.json -o system + +# Generate boundary stl +python /projects/gas2fuels/BioReactorDesign/applications/write_stl_patch.py -i system/inlets_outlets.json +#python ../../../applications/write_stl_patch.py -i system/inlets_outlets.json + +# Generate mixers +python /projects/gas2fuels/BioReactorDesign/applications/write_dynMix_fvModels_force_sign.py -i system/mixers.json -o constant +#python ../../../applications/write_dynMix_fvModels_force_sign.py -i system/mixers.json -o constant + +echo PRESTEP 2 +# Mesh gen +blockMesh -dict system/blockMeshDict + +# Inlet BC +surfaceToPatch -tol 1e-3 inlets.stl +export newmeshdir=$(foamListTimes -latestTime) +rm -rf constant/polyMesh/ +cp -r $newmeshdir/polyMesh ./constant +rm -rf $newmeshdir +cp constant/polyMesh/boundary /tmp +sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary +cat /tmp/boundary > constant/polyMesh/boundary + +# Outlet BC +surfaceToPatch -tol 1e-3 outlets.stl +export newmeshdir=$(foamListTimes -latestTime) +rm -rf constant/polyMesh/ +cp -r $newmeshdir/polyMesh ./constant +rm -rf $newmeshdir +cp constant/polyMesh/boundary /tmp +sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary +cat /tmp/boundary > constant/polyMesh/boundary + + +# Scale +transformPoints "scale=(2.7615275385627096 2.7615275385627096 2.7615275385627096)" + + +# setup IC +cp -r 0.orig 0 +setFields + +# Setup mass flow rate +# Get inlet area +postProcess -func 'patchIntegrate(patch="inlet", field="alpha.gas")' +postProcess -func writeCellVolumes +writeMeshObj + +echo PRESTEP 3 +python writeGlobalVars.py +cp constant/phaseProperties_constantd constant/phaseProperties + +conda deactivate + +if [ -f qoi.txt ]; then + rm qoi.txt +fi +if [ -f data/local/conv.npz ]; then + rm data/local/conv.npz +fi + diff --git a/tutorial_cases/loop_reactor_mixing/read_history.py b/tutorial_cases/loop_reactor_mixing/read_history.py new file mode 100644 index 00000000..264711f8 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/read_history.py @@ -0,0 +1,239 @@ +import argparse +import os +import sys + +import numpy as np +from prettyPlot.plotting import plt, pretty_labels + +from bird.utilities.ofio import * + + +def compute_gas_holdup(caseFolder, timeFolder, nCells, field_dict={}): + if not ("alpha_liq" in field_dict) or field_dict["alpha_liq"] is None: + alpha_liq_file = os.path.join(caseFolder, timeFolder, "alpha.liquid") + alpha_liq = readOFScal(alpha_liq_file, nCells) + # print("reading alpha_liq") + field_dict["alpha_liq"] = alpha_liq + if not ("volume" in field_dict) or field_dict["volume"] is None: + volume_file = os.path.join(caseFolder, "0", "V") + volume = readOFScal(volume_file, nCells) + # print("reading Volume") + field_dict["volume"] = volume + alpha_liq = field_dict["alpha_liq"] + volume = field_dict["volume"] + holdup = np.sum((1 - alpha_liq) * volume) / np.sum(volume) + return holdup, field_dict + + +def co2liq(caseFolder, timeFolder, nCells, field_dict={}): + if not ("alpha_liq" in field_dict) or field_dict["alpha_liq"] is None: + alpha_liq_file = os.path.join(caseFolder, timeFolder, "alpha.liquid") + alpha_liq = readOFScal(alpha_liq_file, nCells) + # print("reading alpha_liq") + field_dict["alpha_liq"] = alpha_liq + if not ("co2_liq" in field_dict) or field_dict["co2_liq"] is None: + co2_liq_file = os.path.join(caseFolder, timeFolder, "CO2.liquid") + co2_liq = readOFScal(co2_liq_file, nCells) + # print("computing co2 liq") + field_dict["co2_liq"] = co2_liq + if not ("volume" in field_dict) or field_dict["volume"] is None: + volume_file = os.path.join(caseFolder, "0", "V") + volume = readOFScal(volume_file, nCells) + # print("reading Volume") + field_dict["volume"] = volume + if not ("indliq" in field_dict) or field_dict["indliq"] is None: + alpha_liq = field_dict["alpha_liq"] + indliq = np.argwhere(alpha_liq > 0.5) + # print("computing indliq") + field_dict["indliq"] = indliq + volume = field_dict["volume"] + indliq = field_dict["indliq"] + alpha_liq = field_dict["alpha_liq"] + co2_liq = field_dict["co2_liq"] + met = np.sum( + alpha_liq[indliq] * co2_liq[indliq] * volume[indliq] + ) / np.sum(volume[indliq]) + return met, field_dict + + +def cliq(caseFolder, timeFolder, nCells, field_dict={}): + if not ("alpha_liq" in field_dict) or field_dict["alpha_liq"] is None: + alpha_liq_file = os.path.join(caseFolder, timeFolder, "alpha.liquid") + alpha_liq = readOFScal(alpha_liq_file, nCells) + # print("reading alpha_liq") + field_dict["alpha_liq"] = alpha_liq + if not ("rho_liq" in field_dict) or field_dict["rho_liq"] is None: + rho_liq_file = os.path.join(caseFolder, timeFolder, "rhom") + rho_liq = readOFScal(rho_liq_file, nCells) + field_dict["rho_liq"] = rho_liq + if not ("co2_liq" in field_dict) or field_dict["co2_liq"] is None: + co2_liq_file = os.path.join(caseFolder, timeFolder, "CO2.liquid") + co2_liq = readOFScal(co2_liq_file, nCells) + # print("computing co2 liq") + field_dict["co2_liq"] = co2_liq + if not ("h2_liq" in field_dict) or field_dict["h2_liq"] is None: + h2_liq_file = os.path.join(caseFolder, timeFolder, "H2.liquid") + h2_liq = readOFScal(h2_liq_file, nCells) + # print("computing h2 liq") + field_dict["h2_liq"] = h2_liq + if not ("volume" in field_dict) or field_dict["volume"] is None: + volume_file = os.path.join(caseFolder, "0", "V") + volume = readOFScal(volume_file, nCells) + # print("reading Volume") + field_dict["volume"] = volume + if not ("indliq" in field_dict) or field_dict["indliq"] is None: + alpha_liq = field_dict["alpha_liq"] + indliq = np.argwhere(alpha_liq > 0.5) + # print("computing indliq") + field_dict["indliq"] = indliq + + volume = field_dict["volume"] + indliq = field_dict["indliq"] + alpha_liq = field_dict["alpha_liq"] + co2_liq = field_dict["co2_liq"] + h2_liq = field_dict["h2_liq"] + rho_liq = field_dict["rho_liq"] + + # c_h2 = rho_liq[indliq] * alpha_liq[indliq] * h2_liq[indliq] / 0.002016 + # c_co2 = rho_liq[indliq] * alpha_liq[indliq] * co2_liq[indliq] / 0.04401 + + c_h2 = 1000 * alpha_liq[indliq] * h2_liq[indliq] / 0.002016 + c_co2 = 1000 * alpha_liq[indliq] * co2_liq[indliq] / 0.04401 + + c_h2 = np.sum(c_h2 * volume[indliq]) / np.sum(volume[indliq]) + c_co2 = np.sum(c_co2 * volume[indliq]) / np.sum(volume[indliq]) + + return c_co2, c_h2, field_dict + + +def h2liq(caseFolder, timeFolder, nCells, field_dict={}): + if not ("alpha_liq" in field_dict) or field_dict["alpha_liq"] is None: + alpha_liq_file = os.path.join(caseFolder, timeFolder, "alpha.liquid") + alpha_liq = readOFScal(alpha_liq_file, nCells) + # print("reading alpha_liq") + field_dict["alpha_liq"] = alpha_liq + if not ("h2_liq" in field_dict) or field_dict["h2_liq"] is None: + h2_liq_file = os.path.join(caseFolder, timeFolder, "H2.liquid") + h2_liq = readOFScal(h2_liq_file, nCells) + # print("computing h2 liq") + field_dict["h2_liq"] = h2_liq + if not ("volume" in field_dict) or field_dict["volume"] is None: + volume_file = os.path.join(caseFolder, "0", "V") + volume = readOFScal(volume_file, nCells) + # print("reading Volume") + field_dict["volume"] = volume + if not ("indliq" in field_dict) or field_dict["indliq"] is None: + alpha_liq = field_dict["alpha_liq"] + indliq = np.argwhere(alpha_liq > 0.5) + # print("computing indliq") + field_dict["indliq"] = indliq + volume = field_dict["volume"] + indliq = field_dict["indliq"] + alpha_liq = field_dict["alpha_liq"] + h2_liq = field_dict["h2_liq"] + met = np.sum(alpha_liq[indliq] * h2_liq[indliq] * volume[indliq]) / np.sum( + volume[indliq] + ) + return met, field_dict + + +def vol_liq(caseFolder, timeFolder, nCells, field_dict={}): + if not ("alpha_liq" in field_dict) or field_dict["alpha_liq"] is None: + alpha_liq_file = os.path.join(caseFolder, timeFolder, "alpha.liquid") + alpha_liq = readOFScal(alpha_liq_file, nCells) + # print("reading alpha_liq") + field_dict["alpha_liq"] = alpha_liq + if not ("volume" in field_dict) or field_dict["volume"] is None: + volume_file = os.path.join(caseFolder, "0", "V") + volume = readOFScal(volume_file, nCells) + # print("reading Volume") + field_dict["volume"] = volume + volume = field_dict["volume"] + alpha_liq = field_dict["alpha_liq"] + indliq = np.argwhere(alpha_liq > 0.0) + liqvol = np.sum(alpha_liq[indliq] * volume[indliq]) / np.sum( + volume[indliq] + ) + return liqvol, field_dict + + +parser = argparse.ArgumentParser(description="Convergence of GH") +parser.add_argument( + "-cn", + "--case_name", + type=str, + metavar="", + required=True, + help="Case name", +) +parser.add_argument( + "-df", + "--data_folder", + type=str, + metavar="", + required=False, + help="data folder name", + default="data", +) + +args, unknown = parser.parse_known_args() + + +case_root = "." # "../" +case_name = args.case_name # "12_hole_sparger_snappyRefine_700rpm_opt_coeff" +case_path = "." +dataFolder = args.data_folder + +if os.path.isfile(os.path.join(dataFolder, case_name, "conv.npz")): + sys.exit("WARNING: History already created, Skipping") + +time_float_sorted, time_str_sorted = getCaseTimes(case_path, remove_zero=True) +cellCentres = readMesh(os.path.join(case_path, f"meshCellCentres_0.obj")) +nCells = len(cellCentres) + + +co2_history = np.zeros(len(time_str_sorted)) +c_co2_history = np.zeros(len(time_str_sorted)) +h2_history = np.zeros(len(time_str_sorted)) +c_h2_history = np.zeros(len(time_str_sorted)) +gh_history = np.zeros(len(time_str_sorted)) +liqvol_history = np.zeros(len(time_str_sorted)) +print(f"case_path = {case_path}") +field_dict = {} +for itime, time in enumerate(time_float_sorted): + time_folder = time_str_sorted[itime] + print(f"\tTime : {time_folder}") + if not field_dict == {}: + new_field_dict = {} + if "volume" in field_dict: + new_field_dict["volume"] = field_dict["volume"] + field_dict = new_field_dict + gh_history[itime], field_dict = compute_gas_holdup( + case_path, time_str_sorted[itime], nCells, field_dict + ) + co2_history[itime], field_dict = co2liq( + case_path, time_str_sorted[itime], nCells, field_dict + ) + h2_history[itime], field_dict = h2liq( + case_path, time_str_sorted[itime], nCells, field_dict + ) + liqvol_history[itime], field_dict = vol_liq( + case_path, time_str_sorted[itime], nCells, field_dict + ) + c_co2_history[itime], c_h2_history[itime], field_dict = cliq( + case_path, time_str_sorted[itime], nCells, field_dict + ) + + +os.makedirs(dataFolder, exist_ok=True) +os.makedirs(os.path.join(dataFolder, case_name), exist_ok=True) +np.savez( + os.path.join(dataFolder, case_name, "conv.npz"), + time=np.array(time_float_sorted), + gh=gh_history, + co2=co2_history, + h2=h2_history, + vol_liq=liqvol_history, + c_h2=c_h2_history, + c_co2=c_co2_history, +) diff --git a/tutorial_cases/loop_reactor_mixing/run.sh b/tutorial_cases/loop_reactor_mixing/run.sh new file mode 100644 index 00000000..cc058983 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/run.sh @@ -0,0 +1,63 @@ +# Clean case +#module load anaconda3/2023 +#conda activate /projects/gas2fuels/conda_env/bird +#source /projects/gas2fuels/ofoam_cray_mpich/OpenFOAM-dev/etc/bashrc +./Allclean + +echo PRESTEP 1 +# Generate blockmeshDict +python ../../applications/write_block_rect_mesh.py -i system/mesh.json -o system + +# Generate boundary stl +python ../../applications/write_stl_patch.py -i system/inlets_outlets.json + +# Generate mixers +python ../../applications/write_dynMix_fvModels.py -fs -i system/mixers.json -o constant + +echo PRESTEP 2 +# Mesh gen +blockMesh -dict system/blockMeshDict + +# Inlet BC +surfaceToPatch -tol 1e-3 inlets.stl +export newmeshdir=$(foamListTimes -latestTime) +rm -rf constant/polyMesh/ +cp -r $newmeshdir/polyMesh ./constant +rm -rf $newmeshdir +cp constant/polyMesh/boundary /tmp +sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary +cat /tmp/boundary > constant/polyMesh/boundary + +# Outlet BC +surfaceToPatch -tol 1e-3 outlets.stl +export newmeshdir=$(foamListTimes -latestTime) +rm -rf constant/polyMesh/ +cp -r $newmeshdir/polyMesh ./constant +rm -rf $newmeshdir +cp constant/polyMesh/boundary /tmp +sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary +cat /tmp/boundary > constant/polyMesh/boundary + + +# Scale +transformPoints "scale=(2.7615275385627096 2.7615275385627096 2.7615275385627096)" + + +# setup IC +cp -r 0.orig 0 +setFields + +# Setup mass flow rate +# Get inlet area +postProcess -func 'patchIntegrate(patch="inlet", field="alpha.gas")' +postProcess -func writeCellVolumes +writeMeshObj + +echo PRESTEP 3 +python writeGlobalVars.py +cp constant/phaseProperties_constantd constant/phaseProperties + +#conda deactivate + +echo RUN +birdmultiphaseEulerFoam diff --git a/tutorial_cases/loop_reactor_mixing/script b/tutorial_cases/loop_reactor_mixing/script new file mode 100755 index 00000000..090e5c05 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/script @@ -0,0 +1,14 @@ +#!/bin/bash +#SBATCH --qos=high +#SBATCH --job-name=val2 +##SBATCH --partition=debug +#SBATCH --nodes=1 +#SBATCH --ntasks-per-node=16 +#SBATCH --time=07:59:00 +#SBATCH --account=co2snow + +bash presteps.sh +source /projects/gas2fuels/ofoam_cray_mpich/OpenFOAM-dev/etc/bashrc +decomposePar -fileHandler collated +srun -n 16 multiphaseEulerFoam -parallel -fileHandler collated +reconstructPar -newTimes diff --git a/tutorial_cases/loop_reactor_mixing/script_post b/tutorial_cases/loop_reactor_mixing/script_post new file mode 100755 index 00000000..aabbc33e --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/script_post @@ -0,0 +1,10 @@ +#!/bin/bash +#SBATCH --qos=high +#SBATCH --job-name=val2 +##SBATCH --partition=debug +#SBATCH --nodes=1 +#SBATCH --ntasks-per-node=16 +#SBATCH --time=00:59:00 +#SBATCH --account=co2snow + +bash computeQOI.sh diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/blockMeshDict b/tutorial_cases/loop_reactor_mixing/system/blockMeshDict similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/blockMeshDict rename to tutorial_cases/loop_reactor_mixing/system/blockMeshDict diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/controlDict b/tutorial_cases/loop_reactor_mixing/system/controlDict similarity index 78% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/controlDict rename to tutorial_cases/loop_reactor_mixing/system/controlDict index 200a3568..d8c42afd 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/controlDict +++ b/tutorial_cases/loop_reactor_mixing/system/controlDict @@ -20,15 +20,15 @@ startFrom latestTime;//startTime; startTime 0; -stopAt endTime; +stopAt writeNow;//endTime; -endTime 100; +endTime 200; deltaT 0.0001; -writeControl runTime; +writeControl adjustableRunTime; -writeInterval 1; +writeInterval 2; purgeWrite 0; @@ -48,8 +48,16 @@ adjustTimeStep yes; maxCo 0.5; -maxDeltaT 0.0005; +maxDeltaT 0.01; + +functions +{ + + #includeFunc writeObjects(d.gas) + #includeFunc writeObjects(thermo:rho.gas) + #includeFunc writeObjects(thermo:rho.liquid) +} //functions //{ // #includeFunc fieldAverage(U.air, U.water, alpha.air, p) diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/decomposeParDict b/tutorial_cases/loop_reactor_mixing/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/decomposeParDict rename to tutorial_cases/loop_reactor_mixing/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvConstraints b/tutorial_cases/loop_reactor_mixing/system/fvConstraints similarity index 55% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvConstraints rename to tutorial_cases/loop_reactor_mixing/system/fvConstraints index 164c3e0b..334f1c8f 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvConstraints +++ b/tutorial_cases/loop_reactor_mixing/system/fvConstraints @@ -19,5 +19,38 @@ limitp min 1e4; } +limitUliq +{ + type limitVelocity; + active yes; + U U.liquid; + selectionMode all; + max 1e1; +} +limitUgas +{ + type limitVelocity; + active yes; + U U.gas; + selectionMode all; + max 2e1; +} +limitTgas +{ + type limitTemperature; + selectionMode all; + min 290; + max 310; + phase gas; +} +limitTliq +{ + type limitTemperature; + selectionMode all; + min 290; + max 310; + phase liquid; +} + // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvSchemes b/tutorial_cases/loop_reactor_mixing/system/fvSchemes similarity index 99% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvSchemes rename to tutorial_cases/loop_reactor_mixing/system/fvSchemes index 7c2385a9..52e6e13a 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvSchemes +++ b/tutorial_cases/loop_reactor_mixing/system/fvSchemes @@ -40,7 +40,6 @@ divSchemes "div\(alphaRhoPhi.*,(K|k|epsilon|omega).*\)" Gauss limitedLinear 1; "div\(alphaPhi.*,f.*\)" Gauss limitedLinear 1; "div\(alphaRhoPhi.*,\(p\|thermo:rho.*\)\)" Gauss limitedLinear 1; - "div\(phim,(k|epsilon)m\)" Gauss upwind; "div\(\(\(\(alpha.*\*thermo:rho.*\)*nuEff.*\)*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvSolution b/tutorial_cases/loop_reactor_mixing/system/fvSolution similarity index 94% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvSolution rename to tutorial_cases/loop_reactor_mixing/system/fvSolution index 12592abf..2e69fdfa 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvSolution +++ b/tutorial_cases/loop_reactor_mixing/system/fvSolution @@ -18,8 +18,8 @@ solvers { "alpha.*" { - nAlphaCorr 1; - nAlphaSubCycles 4; + nAlphaCorr 2; + nAlphaSubCycles 5; } bubbles @@ -35,7 +35,7 @@ solvers { solver GAMG; smoother DIC; - tolerance 1e-8; + tolerance 1e-7; relTol 0; } @@ -60,7 +60,8 @@ solvers smoother symGaussSeidel; tolerance 1e-8; relTol 0; - minIter 1; + minIter 0; + maxIter 3; } "f.*" diff --git a/tutorial_cases/loop_reactor_mixing/system/inlets_outlets.json b/tutorial_cases/loop_reactor_mixing/system/inlets_outlets.json new file mode 100644 index 00000000..a083d47f --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/system/inlets_outlets.json @@ -0,0 +1,177 @@ +{ + "Geometry": { + "OverallDomain": { + "x": { + "nblocks": 10, + "size_per_block": 1.0, + "rescale": 2.7615275385627096 + }, + "y": { + "nblocks": 11, + "size_per_block": 1.0, + "rescale": 2.7615275385627096 + }, + "z": { + "nblocks": 5, + "size_per_block": 1.0, + "rescale": 2.7615275385627096 + } + }, + "Fluids": [ + [ + [ + 0, + 0, + 0 + ], + [ + 9, + 0, + 0 + ] + ], + [ + [ + 9, + 0, + 0 + ], + [ + 9, + 0, + 4 + ] + ], + [ + [ + 9, + 0, + 4 + ], + [ + 0, + 0, + 4 + ] + ], + [ + [ + 0, + 1, + 4 + ], + [ + 0, + 4, + 4 + ] + ], + [ + [ + 0, + 4, + 4 + ], + [ + 0, + 10, + 4 + ] + ], + [ + [ + 0, + 4, + 4 + ], + [ + 0, + 4, + 0 + ] + ], + [ + [ + 0, + 4, + 0 + ], + [ + 0, + 10, + 0 + ] + ], + [ + [ + 0, + 4, + 0 + ], + [ + 0, + 1, + 0 + ] + ] + ] + }, + "inlets": [ + { + "branch_id": 0, + "type": "circle", + "frac_space": 0.2, + "normal_dir": 1, + "radius": 0.4, + "nelements": 50, + "block_pos": "bottom" + }, + { + "branch_id": 1, + "type": "circle", + "frac_space": 0.2, + "normal_dir": 1, + "radius": 0.4, + "nelements": 50, + "block_pos": "bottom" + }, + { + "branch_id": 1, + "type": "circle", + "frac_space": 0.8, + "normal_dir": 1, + "radius": 0.4, + "nelements": 50, + "block_pos": "bottom" + }, + { + "branch_id": 2, + "type": "circle", + "frac_space": 0.8, + "normal_dir": 1, + "radius": 0.4, + "nelements": 50, + "block_pos": "bottom" + } + ], + "outlets": [ + { + "branch_id": 6, + "type": "circle", + "frac_space": 1, + "normal_dir": 1, + "radius": 0.4, + "nelements": 50, + "block_pos": "top" + }, + { + "branch_id": 4, + "type": "circle", + "frac_space": 1, + "normal_dir": 1, + "radius": 0.4, + "nelements": 50, + "block_pos": "top" + } + ] +} \ No newline at end of file diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/mesh.json b/tutorial_cases/loop_reactor_mixing/system/mesh.json similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/mesh.json rename to tutorial_cases/loop_reactor_mixing/system/mesh.json diff --git a/tutorial_cases/loop_reactor_mixing/system/mixers.json b/tutorial_cases/loop_reactor_mixing/system/mixers.json new file mode 100644 index 00000000..02aaefd8 --- /dev/null +++ b/tutorial_cases/loop_reactor_mixing/system/mixers.json @@ -0,0 +1,156 @@ +{ + "Meshing": { + "Blockwise": { + "x": 10, + "y": 10, + "z": 10 + } + }, + "Geometry": { + "OverallDomain": { + "x": { + "nblocks": 10, + "size_per_block": 1.0, + "rescale": 2.7615275385627096 + }, + "y": { + "nblocks": 11, + "size_per_block": 1.0, + "rescale": 2.7615275385627096 + }, + "z": { + "nblocks": 5, + "size_per_block": 1.0, + "rescale": 2.7615275385627096 + } + }, + "Fluids": [ + [ + [ + 0, + 0, + 0 + ], + [ + 9, + 0, + 0 + ] + ], + [ + [ + 9, + 0, + 0 + ], + [ + 9, + 0, + 4 + ] + ], + [ + [ + 9, + 0, + 4 + ], + [ + 0, + 0, + 4 + ] + ], + [ + [ + 0, + 1, + 4 + ], + [ + 0, + 4, + 4 + ] + ], + [ + [ + 0, + 4, + 4 + ], + [ + 0, + 10, + 4 + ] + ], + [ + [ + 0, + 4, + 4 + ], + [ + 0, + 4, + 0 + ] + ], + [ + [ + 0, + 4, + 0 + ], + [ + 0, + 10, + 0 + ] + ], + [ + [ + 0, + 4, + 0 + ], + [ + 0, + 1, + 0 + ] + ] + ] + }, + "mixers": [ + { + "branch_id": 0, + "frac_space": 0.4, + "start_time": 3, + "power": 3000, + "sign": "+" + }, + { + "branch_id": 0, + "frac_space": 0.6000000000000001, + "start_time": 3, + "power": 3000, + "sign": "+" + }, + { + "branch_id": 0, + "frac_space": 0.8, + "start_time": 3, + "power": 3000, + "sign": "+" + }, + { + "branch_id": 2, + "frac_space": 0.4, + "start_time": 3, + "power": 3000, + "sign": "-" + } + ] +} \ No newline at end of file diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/setFieldsDict b/tutorial_cases/loop_reactor_mixing/system/setFieldsDict similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/setFieldsDict rename to tutorial_cases/loop_reactor_mixing/system/setFieldsDict diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/writeGlobalVars.py b/tutorial_cases/loop_reactor_mixing/writeGlobalVars.py similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/writeGlobalVars.py rename to tutorial_cases/loop_reactor_mixing/writeGlobalVars.py diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CH4.gas b/tutorial_cases/loop_reactor_reacting/0.orig/CH4.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CH4.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/CH4.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CH4.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/CH4.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CH4.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/CH4.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/CO2.gas b/tutorial_cases/loop_reactor_reacting/0.orig/CO2.gas similarity index 97% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/CO2.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/CO2.gas index 6636f550..e4165b1a 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/CO2.gas +++ b/tutorial_cases/loop_reactor_reacting/0.orig/CO2.gas @@ -16,7 +16,7 @@ dimensions [0 0 0 0 0 0 0]; #include "${FOAM_CASE}/constant/globalVars" -internalField uniform $f_CO2; +internalField uniform 0; boundaryField diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/CO2.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/CO2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/CO2.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/CO2.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/N2.gas b/tutorial_cases/loop_reactor_reacting/0.orig/H2.gas similarity index 86% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/N2.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/H2.gas index b841c3df..9f66b2d2 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/N2.gas +++ b/tutorial_cases/loop_reactor_reacting/0.orig/H2.gas @@ -9,14 +9,14 @@ FoamFile { format ascii; class volScalarField; - object N2.gas; + object H2.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 0 0 0 0 0 0]; #include "${FOAM_CASE}/constant/globalVars" -internalField uniform $f_N2; +internalField uniform 0; boundaryField @@ -26,15 +26,15 @@ boundaryField inlet { type fixedValue; - value uniform $f_N2; + value uniform $f_H2; } outlet { //type inletOutlet; //phi phi.gas; - //inletValue $f_N2; - //value $f_N2; + //inletValue $f_H2; + //value $f_H2; type zeroGradient; } diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CO2.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/H2.liquid similarity index 97% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CO2.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/H2.liquid index 4b8ea6a0..65ae8d34 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/CO2.liquid +++ b/tutorial_cases/loop_reactor_reacting/0.orig/H2.liquid @@ -9,7 +9,7 @@ FoamFile { format ascii; class volScalarField; - object CO2.liquid; + object H2.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/N2.gas b/tutorial_cases/loop_reactor_reacting/0.orig/N2.gas similarity index 97% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/N2.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/N2.gas index b841c3df..c1d7225f 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/N2.gas +++ b/tutorial_cases/loop_reactor_reacting/0.orig/N2.gas @@ -16,7 +16,7 @@ dimensions [0 0 0 0 0 0 0]; #include "${FOAM_CASE}/constant/globalVars" -internalField uniform $f_N2; +internalField uniform 1; boundaryField diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/T.gas b/tutorial_cases/loop_reactor_reacting/0.orig/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/T.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/T.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/T.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/T.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/T.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.gas b/tutorial_cases/loop_reactor_reacting/0.orig/U.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/U.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/U.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/U.liquid similarity index 87% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/U.liquid index 637e6ac2..1879e020 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/U.liquid +++ b/tutorial_cases/loop_reactor_reacting/0.orig/U.liquid @@ -34,10 +34,7 @@ boundaryField } outlet { - type pressureInletOutletVelocity; - phi phi.liquid; - value uniform (0 0 0); - //value $internalField; + type noSlip; } defaultFaces { diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/Ydefault.gas b/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/Ydefault.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/Ydefault.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/Ydefault.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/Ydefault.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alpha.gas b/tutorial_cases/loop_reactor_reacting/0.orig/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alpha.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/alpha.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alpha.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/alpha.liquid similarity index 90% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alpha.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/alpha.liquid index 7a301a82..5c92070b 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/0.orig/alpha.liquid +++ b/tutorial_cases/loop_reactor_reacting/0.orig/alpha.liquid @@ -28,9 +28,7 @@ boundaryField } outlet { - type inletOutlet; - phi phi.liquid; - inletValue uniform 0; + type fixedValue; value uniform 0; } defaultFaces diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alphat.gas b/tutorial_cases/loop_reactor_reacting/0.orig/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alphat.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/alphat.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alphat.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/alphat.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/alphat.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/epsilon.gas b/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/epsilon.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/epsilon.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/epsilon.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/epsilon.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/f.gas b/tutorial_cases/loop_reactor_reacting/0.orig/f.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/f.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/f.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/k.gas b/tutorial_cases/loop_reactor_reacting/0.orig/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/k.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/k.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/k.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/k.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/k.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/nut.gas b/tutorial_cases/loop_reactor_reacting/0.orig/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/nut.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/nut.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/nut.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/nut.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/nut.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/p b/tutorial_cases/loop_reactor_reacting/0.orig/p similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/p rename to tutorial_cases/loop_reactor_reacting/0.orig/p diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/p_rgh b/tutorial_cases/loop_reactor_reacting/0.orig/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/0.orig/p_rgh rename to tutorial_cases/loop_reactor_reacting/0.orig/p_rgh diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/water.gas b/tutorial_cases/loop_reactor_reacting/0.orig/water.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/water.gas rename to tutorial_cases/loop_reactor_reacting/0.orig/water.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/water.liquid b/tutorial_cases/loop_reactor_reacting/0.orig/water.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/water.liquid rename to tutorial_cases/loop_reactor_reacting/0.orig/water.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/Allclean b/tutorial_cases/loop_reactor_reacting/Allclean similarity index 96% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/Allclean rename to tutorial_cases/loop_reactor_reacting/Allclean index 4003a12b..371d82a8 100755 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/Allclean +++ b/tutorial_cases/loop_reactor_reacting/Allclean @@ -11,5 +11,7 @@ cd ${0%/*} || exit 1 # Run from this directory #rm -rf processor* > /dev/null 2>&1 rm -rf 0 cleanCase +rm *.obj +rm *.stl #------------------------------------------------------------------------------ diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/README.md b/tutorial_cases/loop_reactor_reacting/README.md similarity index 55% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/README.md rename to tutorial_cases/loop_reactor_reacting/README.md index dc65411c..30444277 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/README.md +++ b/tutorial_cases/loop_reactor_reacting/README.md @@ -1,15 +1,18 @@ -* Scaled up loop reactor with 608m3 of liq +### Loop reactor with chemical reaction + +* Loop reactor scaled up with 608m3 of liquid * Reaction kinetics transforming CO2 to CH4 -* No mixers enabled (power = 0 in the fvModels) +* No dynamic mixing enabled (power = 0W in the fvModels) * Setup with constant diameter but can use PBE by changing the line `cp constant/phaseProperties_constantd constant/phaseProperties` into `cp constant/phaseProperties_pbe constant/phaseProperties` +If you use pbe, you may change `system/controlDict` to print the bubble diameter * writeGlobalVars.py writes `constant/globalVars` from `constant/globalVars_tmp` +Single core exec -## Running the case +1. `bash run.sh` -bash run.sh diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/chemistryProperties.liquid b/tutorial_cases/loop_reactor_reacting/constant/chemistryProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/chemistryProperties.liquid rename to tutorial_cases/loop_reactor_reacting/constant/chemistryProperties.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/combustionProperties.liquid b/tutorial_cases/loop_reactor_reacting/constant/combustionProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/combustionProperties.liquid rename to tutorial_cases/loop_reactor_reacting/constant/combustionProperties.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/dynamicMix_util.H b/tutorial_cases/loop_reactor_reacting/constant/dynamicMix_util.H similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/dynamicMix_util.H rename to tutorial_cases/loop_reactor_reacting/constant/dynamicMix_util.H diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/fvModels b/tutorial_cases/loop_reactor_reacting/constant/fvModels similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/fvModels rename to tutorial_cases/loop_reactor_reacting/constant/fvModels diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/constant/g b/tutorial_cases/loop_reactor_reacting/constant/g similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/constant/g rename to tutorial_cases/loop_reactor_reacting/constant/g diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/globalVars b/tutorial_cases/loop_reactor_reacting/constant/globalVars similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/globalVars rename to tutorial_cases/loop_reactor_reacting/constant/globalVars diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/globalVars_temp b/tutorial_cases/loop_reactor_reacting/constant/globalVars_temp similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/globalVars_temp rename to tutorial_cases/loop_reactor_reacting/constant/globalVars_temp diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/momentumTransport.gas b/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/momentumTransport.gas rename to tutorial_cases/loop_reactor_reacting/constant/momentumTransport.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/momentumTransport.liquid b/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/momentumTransport.liquid rename to tutorial_cases/loop_reactor_reacting/constant/momentumTransport.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/phaseProperties_pbe b/tutorial_cases/loop_reactor_reacting/constant/phaseProperties similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/phaseProperties_pbe rename to tutorial_cases/loop_reactor_reacting/constant/phaseProperties diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/phaseProperties_constantd b/tutorial_cases/loop_reactor_reacting/constant/phaseProperties_constantd similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/phaseProperties_constantd rename to tutorial_cases/loop_reactor_reacting/constant/phaseProperties_constantd diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/phaseProperties b/tutorial_cases/loop_reactor_reacting/constant/phaseProperties_pbe similarity index 88% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/phaseProperties rename to tutorial_cases/loop_reactor_reacting/constant/phaseProperties_pbe index 66f6e45f..458ede6d 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/constant/phaseProperties +++ b/tutorial_cases/loop_reactor_reacting/constant/phaseProperties_pbe @@ -55,22 +55,12 @@ gas liquid { - type multiComponentPhaseModel;//pureIsothermalPhaseModel; - + type reactingPhaseModel; diameterModel constant; - constantCoeffs { d 1e-4; } - Sc #codeStream - { - code - #{ - os << ($LeLiqMix * $CpMixLiq * $muMixLiq / $kThermLiq); - #}; - }; - residualAlpha 1e-6; } @@ -83,7 +73,7 @@ populationBalanceCoeffs coalescenceModels ( LehrMilliesMewes{ - efficiency 1.0; + efficiency 4.695; uCrit 0.08; alphaMax 0.6; } @@ -95,7 +85,7 @@ populationBalanceCoeffs breakupModels ( Laakkonen { - efficiency 1.0; + efficiency 13.83; daughterSizeDistributionModel Laakkonen; } @@ -107,7 +97,16 @@ populationBalanceCoeffs ); nucleationModels - (); + ( + reactionDriven + { + nucleationDiameter 3.0e-3; + velocityGroup gas; + reactingPhase liquid; + dmdtf phaseTransfer:dmidtf; + specie CH4; + } + ); } } @@ -220,8 +219,8 @@ interfaceComposition.liquid (liquid and gas) { type Henry; - species ( CO2 ); - k ( 1.04 ); + species ( CO2 H2 CH4 ); + k ( $He_CO2 $He_H2 $He_CH4 ); Le $LeLiqMix; } ); @@ -246,7 +245,15 @@ diffusiveMassTransfer.liquid ); phaseTransfer -(); +( + (gas in liquid) + { + type reactionDriven; + reactingPhase liquid; + targetPhase gas; + species (CH4); + } +); lift ( diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/reactions.liquid b/tutorial_cases/loop_reactor_reacting/constant/reactions.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/reactions.liquid rename to tutorial_cases/loop_reactor_reacting/constant/reactions.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.gas b/tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.gas rename to tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.liquid b/tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.liquid rename to tutorial_cases/loop_reactor_reacting/constant/thermophysicalProperties.liquid diff --git a/tutorial_cases/loop_reactor_reacting/run.sh b/tutorial_cases/loop_reactor_reacting/run.sh new file mode 100644 index 00000000..b408d12f --- /dev/null +++ b/tutorial_cases/loop_reactor_reacting/run.sh @@ -0,0 +1,57 @@ + +# Clean case +./Allclean + +# Generate blockmeshDict +python ../../applications/write_block_rect_mesh.py -i system/mesh.json -o system + +# Generate boundary stl +python ../../applications/write_stl_patch.py -i system/inlets_outlets.json + + +# Mesh gen +blockMesh -dict system/blockMeshDict + +# Inlet BC +surfaceToPatch -tol 1e-3 inlets.stl +export newmeshdir=$(foamListTimes -latestTime) +rm -rf constant/polyMesh/ +cp -r $newmeshdir/polyMesh ./constant +rm -rf $newmeshdir +cp constant/polyMesh/boundary /tmp +sed -i -e 's/inlets\.stl/inlet/g' /tmp/boundary +cat /tmp/boundary > constant/polyMesh/boundary + +# Outlet BC +surfaceToPatch -tol 1e-3 outlets.stl +export newmeshdir=$(foamListTimes -latestTime) +rm -rf constant/polyMesh/ +cp -r $newmeshdir/polyMesh ./constant +rm -rf $newmeshdir +cp constant/polyMesh/boundary /tmp +sed -i -e 's/outlets\.stl/outlet/g' /tmp/boundary +cat /tmp/boundary > constant/polyMesh/boundary + +# Scale +transformPoints "scale=(2.7615275385627096 2.7615275385627096 2.7615275385627096)" + +# setup IC +cp -r 0.orig 0 +setFields + +# Setup mass flow rate +# Get inlet area +postProcess -func 'patchIntegrate(patch="inlet", field="alpha.gas")' +postProcess -func writeCellVolumes +writeMeshObj + +echo PRESTEP 3 +python writeGlobalVars.py +cp constant/phaseProperties_pbe constant/phaseProperties + +# Run +birdmultiphaseEulerFoam + + + + diff --git a/tutorial_cases/loop_reactor_reacting/system/blockMeshDict b/tutorial_cases/loop_reactor_reacting/system/blockMeshDict new file mode 100644 index 00000000..0bb60950 --- /dev/null +++ b/tutorial_cases/loop_reactor_reacting/system/blockMeshDict @@ -0,0 +1,1050 @@ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} + +convertToMeters 1.0; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +vertices +( +( 0.0 0.0 0.0) +( 1.0 0.0 0.0) +( 2.0 0.0 0.0) +( 3.0 0.0 0.0) +( 4.0 0.0 0.0) +( 5.0 0.0 0.0) +( 6.0 0.0 0.0) +( 7.0 0.0 0.0) +( 8.0 0.0 0.0) +( 9.0 0.0 0.0) +( 10.0 0.0 0.0) +( 0.0 1.0 0.0) +( 1.0 1.0 0.0) +( 2.0 1.0 0.0) +( 3.0 1.0 0.0) +( 4.0 1.0 0.0) +( 5.0 1.0 0.0) +( 6.0 1.0 0.0) +( 7.0 1.0 0.0) +( 8.0 1.0 0.0) +( 9.0 1.0 0.0) +( 10.0 1.0 0.0) +( 0.0 2.0 0.0) +( 1.0 2.0 0.0) +( 2.0 2.0 0.0) +( 3.0 2.0 0.0) +( 4.0 2.0 0.0) +( 5.0 2.0 0.0) +( 6.0 2.0 0.0) +( 7.0 2.0 0.0) +( 8.0 2.0 0.0) +( 9.0 2.0 0.0) +( 10.0 2.0 0.0) +( 0.0 3.0 0.0) +( 1.0 3.0 0.0) +( 2.0 3.0 0.0) +( 3.0 3.0 0.0) +( 4.0 3.0 0.0) +( 5.0 3.0 0.0) +( 6.0 3.0 0.0) +( 7.0 3.0 0.0) +( 8.0 3.0 0.0) +( 9.0 3.0 0.0) +( 10.0 3.0 0.0) +( 0.0 4.0 0.0) +( 1.0 4.0 0.0) +( 2.0 4.0 0.0) +( 3.0 4.0 0.0) +( 4.0 4.0 0.0) +( 5.0 4.0 0.0) +( 6.0 4.0 0.0) +( 7.0 4.0 0.0) +( 8.0 4.0 0.0) +( 9.0 4.0 0.0) +( 10.0 4.0 0.0) +( 0.0 5.0 0.0) +( 1.0 5.0 0.0) +( 2.0 5.0 0.0) +( 3.0 5.0 0.0) +( 4.0 5.0 0.0) +( 5.0 5.0 0.0) +( 6.0 5.0 0.0) +( 7.0 5.0 0.0) +( 8.0 5.0 0.0) +( 9.0 5.0 0.0) +( 10.0 5.0 0.0) +( 0.0 6.0 0.0) +( 1.0 6.0 0.0) +( 2.0 6.0 0.0) +( 3.0 6.0 0.0) +( 4.0 6.0 0.0) +( 5.0 6.0 0.0) +( 6.0 6.0 0.0) +( 7.0 6.0 0.0) +( 8.0 6.0 0.0) +( 9.0 6.0 0.0) +( 10.0 6.0 0.0) +( 0.0 7.0 0.0) +( 1.0 7.0 0.0) +( 2.0 7.0 0.0) +( 3.0 7.0 0.0) +( 4.0 7.0 0.0) +( 5.0 7.0 0.0) +( 6.0 7.0 0.0) +( 7.0 7.0 0.0) +( 8.0 7.0 0.0) +( 9.0 7.0 0.0) +( 10.0 7.0 0.0) +( 0.0 8.0 0.0) +( 1.0 8.0 0.0) +( 2.0 8.0 0.0) +( 3.0 8.0 0.0) +( 4.0 8.0 0.0) +( 5.0 8.0 0.0) +( 6.0 8.0 0.0) +( 7.0 8.0 0.0) +( 8.0 8.0 0.0) +( 9.0 8.0 0.0) +( 10.0 8.0 0.0) +( 0.0 9.0 0.0) +( 1.0 9.0 0.0) +( 2.0 9.0 0.0) +( 3.0 9.0 0.0) +( 4.0 9.0 0.0) +( 5.0 9.0 0.0) +( 6.0 9.0 0.0) +( 7.0 9.0 0.0) +( 8.0 9.0 0.0) +( 9.0 9.0 0.0) +( 10.0 9.0 0.0) +( 0.0 10.0 0.0) +( 1.0 10.0 0.0) +( 2.0 10.0 0.0) +( 3.0 10.0 0.0) +( 4.0 10.0 0.0) +( 5.0 10.0 0.0) +( 6.0 10.0 0.0) +( 7.0 10.0 0.0) +( 8.0 10.0 0.0) +( 9.0 10.0 0.0) +( 10.0 10.0 0.0) +( 0.0 11.0 0.0) +( 1.0 11.0 0.0) +( 2.0 11.0 0.0) +( 3.0 11.0 0.0) +( 4.0 11.0 0.0) +( 5.0 11.0 0.0) +( 6.0 11.0 0.0) +( 7.0 11.0 0.0) +( 8.0 11.0 0.0) +( 9.0 11.0 0.0) +( 10.0 11.0 0.0) +( 0.0 0.0 1.0) +( 1.0 0.0 1.0) +( 2.0 0.0 1.0) +( 3.0 0.0 1.0) +( 4.0 0.0 1.0) +( 5.0 0.0 1.0) +( 6.0 0.0 1.0) +( 7.0 0.0 1.0) +( 8.0 0.0 1.0) +( 9.0 0.0 1.0) +( 10.0 0.0 1.0) +( 0.0 1.0 1.0) +( 1.0 1.0 1.0) +( 2.0 1.0 1.0) +( 3.0 1.0 1.0) +( 4.0 1.0 1.0) +( 5.0 1.0 1.0) +( 6.0 1.0 1.0) +( 7.0 1.0 1.0) +( 8.0 1.0 1.0) +( 9.0 1.0 1.0) +( 10.0 1.0 1.0) +( 0.0 2.0 1.0) +( 1.0 2.0 1.0) +( 2.0 2.0 1.0) +( 3.0 2.0 1.0) +( 4.0 2.0 1.0) +( 5.0 2.0 1.0) +( 6.0 2.0 1.0) +( 7.0 2.0 1.0) +( 8.0 2.0 1.0) +( 9.0 2.0 1.0) +( 10.0 2.0 1.0) +( 0.0 3.0 1.0) +( 1.0 3.0 1.0) +( 2.0 3.0 1.0) +( 3.0 3.0 1.0) +( 4.0 3.0 1.0) +( 5.0 3.0 1.0) +( 6.0 3.0 1.0) +( 7.0 3.0 1.0) +( 8.0 3.0 1.0) +( 9.0 3.0 1.0) +( 10.0 3.0 1.0) +( 0.0 4.0 1.0) +( 1.0 4.0 1.0) +( 2.0 4.0 1.0) +( 3.0 4.0 1.0) +( 4.0 4.0 1.0) +( 5.0 4.0 1.0) +( 6.0 4.0 1.0) +( 7.0 4.0 1.0) +( 8.0 4.0 1.0) +( 9.0 4.0 1.0) +( 10.0 4.0 1.0) +( 0.0 5.0 1.0) +( 1.0 5.0 1.0) +( 2.0 5.0 1.0) +( 3.0 5.0 1.0) +( 4.0 5.0 1.0) +( 5.0 5.0 1.0) +( 6.0 5.0 1.0) +( 7.0 5.0 1.0) +( 8.0 5.0 1.0) +( 9.0 5.0 1.0) +( 10.0 5.0 1.0) +( 0.0 6.0 1.0) +( 1.0 6.0 1.0) +( 2.0 6.0 1.0) +( 3.0 6.0 1.0) +( 4.0 6.0 1.0) +( 5.0 6.0 1.0) +( 6.0 6.0 1.0) +( 7.0 6.0 1.0) +( 8.0 6.0 1.0) +( 9.0 6.0 1.0) +( 10.0 6.0 1.0) +( 0.0 7.0 1.0) +( 1.0 7.0 1.0) +( 2.0 7.0 1.0) +( 3.0 7.0 1.0) +( 4.0 7.0 1.0) +( 5.0 7.0 1.0) +( 6.0 7.0 1.0) +( 7.0 7.0 1.0) +( 8.0 7.0 1.0) +( 9.0 7.0 1.0) +( 10.0 7.0 1.0) +( 0.0 8.0 1.0) +( 1.0 8.0 1.0) +( 2.0 8.0 1.0) +( 3.0 8.0 1.0) +( 4.0 8.0 1.0) +( 5.0 8.0 1.0) +( 6.0 8.0 1.0) +( 7.0 8.0 1.0) +( 8.0 8.0 1.0) +( 9.0 8.0 1.0) +( 10.0 8.0 1.0) +( 0.0 9.0 1.0) +( 1.0 9.0 1.0) +( 2.0 9.0 1.0) +( 3.0 9.0 1.0) +( 4.0 9.0 1.0) +( 5.0 9.0 1.0) +( 6.0 9.0 1.0) +( 7.0 9.0 1.0) +( 8.0 9.0 1.0) +( 9.0 9.0 1.0) +( 10.0 9.0 1.0) +( 0.0 10.0 1.0) +( 1.0 10.0 1.0) +( 2.0 10.0 1.0) +( 3.0 10.0 1.0) +( 4.0 10.0 1.0) +( 5.0 10.0 1.0) +( 6.0 10.0 1.0) +( 7.0 10.0 1.0) +( 8.0 10.0 1.0) +( 9.0 10.0 1.0) +( 10.0 10.0 1.0) +( 0.0 11.0 1.0) +( 1.0 11.0 1.0) +( 2.0 11.0 1.0) +( 3.0 11.0 1.0) +( 4.0 11.0 1.0) +( 5.0 11.0 1.0) +( 6.0 11.0 1.0) +( 7.0 11.0 1.0) +( 8.0 11.0 1.0) +( 9.0 11.0 1.0) +( 10.0 11.0 1.0) +( 0.0 0.0 2.0) +( 1.0 0.0 2.0) +( 2.0 0.0 2.0) +( 3.0 0.0 2.0) +( 4.0 0.0 2.0) +( 5.0 0.0 2.0) +( 6.0 0.0 2.0) +( 7.0 0.0 2.0) +( 8.0 0.0 2.0) +( 9.0 0.0 2.0) +( 10.0 0.0 2.0) +( 0.0 1.0 2.0) +( 1.0 1.0 2.0) +( 2.0 1.0 2.0) +( 3.0 1.0 2.0) +( 4.0 1.0 2.0) +( 5.0 1.0 2.0) +( 6.0 1.0 2.0) +( 7.0 1.0 2.0) +( 8.0 1.0 2.0) +( 9.0 1.0 2.0) +( 10.0 1.0 2.0) +( 0.0 2.0 2.0) +( 1.0 2.0 2.0) +( 2.0 2.0 2.0) +( 3.0 2.0 2.0) +( 4.0 2.0 2.0) +( 5.0 2.0 2.0) +( 6.0 2.0 2.0) +( 7.0 2.0 2.0) +( 8.0 2.0 2.0) +( 9.0 2.0 2.0) +( 10.0 2.0 2.0) +( 0.0 3.0 2.0) +( 1.0 3.0 2.0) +( 2.0 3.0 2.0) +( 3.0 3.0 2.0) +( 4.0 3.0 2.0) +( 5.0 3.0 2.0) +( 6.0 3.0 2.0) +( 7.0 3.0 2.0) +( 8.0 3.0 2.0) +( 9.0 3.0 2.0) +( 10.0 3.0 2.0) +( 0.0 4.0 2.0) +( 1.0 4.0 2.0) +( 2.0 4.0 2.0) +( 3.0 4.0 2.0) +( 4.0 4.0 2.0) +( 5.0 4.0 2.0) +( 6.0 4.0 2.0) +( 7.0 4.0 2.0) +( 8.0 4.0 2.0) +( 9.0 4.0 2.0) +( 10.0 4.0 2.0) +( 0.0 5.0 2.0) +( 1.0 5.0 2.0) +( 2.0 5.0 2.0) +( 3.0 5.0 2.0) +( 4.0 5.0 2.0) +( 5.0 5.0 2.0) +( 6.0 5.0 2.0) +( 7.0 5.0 2.0) +( 8.0 5.0 2.0) +( 9.0 5.0 2.0) +( 10.0 5.0 2.0) +( 0.0 6.0 2.0) +( 1.0 6.0 2.0) +( 2.0 6.0 2.0) +( 3.0 6.0 2.0) +( 4.0 6.0 2.0) +( 5.0 6.0 2.0) +( 6.0 6.0 2.0) +( 7.0 6.0 2.0) +( 8.0 6.0 2.0) +( 9.0 6.0 2.0) +( 10.0 6.0 2.0) +( 0.0 7.0 2.0) +( 1.0 7.0 2.0) +( 2.0 7.0 2.0) +( 3.0 7.0 2.0) +( 4.0 7.0 2.0) +( 5.0 7.0 2.0) +( 6.0 7.0 2.0) +( 7.0 7.0 2.0) +( 8.0 7.0 2.0) +( 9.0 7.0 2.0) +( 10.0 7.0 2.0) +( 0.0 8.0 2.0) +( 1.0 8.0 2.0) +( 2.0 8.0 2.0) +( 3.0 8.0 2.0) +( 4.0 8.0 2.0) +( 5.0 8.0 2.0) +( 6.0 8.0 2.0) +( 7.0 8.0 2.0) +( 8.0 8.0 2.0) +( 9.0 8.0 2.0) +( 10.0 8.0 2.0) +( 0.0 9.0 2.0) +( 1.0 9.0 2.0) +( 2.0 9.0 2.0) +( 3.0 9.0 2.0) +( 4.0 9.0 2.0) +( 5.0 9.0 2.0) +( 6.0 9.0 2.0) +( 7.0 9.0 2.0) +( 8.0 9.0 2.0) +( 9.0 9.0 2.0) +( 10.0 9.0 2.0) +( 0.0 10.0 2.0) +( 1.0 10.0 2.0) +( 2.0 10.0 2.0) +( 3.0 10.0 2.0) +( 4.0 10.0 2.0) +( 5.0 10.0 2.0) +( 6.0 10.0 2.0) +( 7.0 10.0 2.0) +( 8.0 10.0 2.0) +( 9.0 10.0 2.0) +( 10.0 10.0 2.0) +( 0.0 11.0 2.0) +( 1.0 11.0 2.0) +( 2.0 11.0 2.0) +( 3.0 11.0 2.0) +( 4.0 11.0 2.0) +( 5.0 11.0 2.0) +( 6.0 11.0 2.0) +( 7.0 11.0 2.0) +( 8.0 11.0 2.0) +( 9.0 11.0 2.0) +( 10.0 11.0 2.0) +( 0.0 0.0 3.0) +( 1.0 0.0 3.0) +( 2.0 0.0 3.0) +( 3.0 0.0 3.0) +( 4.0 0.0 3.0) +( 5.0 0.0 3.0) +( 6.0 0.0 3.0) +( 7.0 0.0 3.0) +( 8.0 0.0 3.0) +( 9.0 0.0 3.0) +( 10.0 0.0 3.0) +( 0.0 1.0 3.0) +( 1.0 1.0 3.0) +( 2.0 1.0 3.0) +( 3.0 1.0 3.0) +( 4.0 1.0 3.0) +( 5.0 1.0 3.0) +( 6.0 1.0 3.0) +( 7.0 1.0 3.0) +( 8.0 1.0 3.0) +( 9.0 1.0 3.0) +( 10.0 1.0 3.0) +( 0.0 2.0 3.0) +( 1.0 2.0 3.0) +( 2.0 2.0 3.0) +( 3.0 2.0 3.0) +( 4.0 2.0 3.0) +( 5.0 2.0 3.0) +( 6.0 2.0 3.0) +( 7.0 2.0 3.0) +( 8.0 2.0 3.0) +( 9.0 2.0 3.0) +( 10.0 2.0 3.0) +( 0.0 3.0 3.0) +( 1.0 3.0 3.0) +( 2.0 3.0 3.0) +( 3.0 3.0 3.0) +( 4.0 3.0 3.0) +( 5.0 3.0 3.0) +( 6.0 3.0 3.0) +( 7.0 3.0 3.0) +( 8.0 3.0 3.0) +( 9.0 3.0 3.0) +( 10.0 3.0 3.0) +( 0.0 4.0 3.0) +( 1.0 4.0 3.0) +( 2.0 4.0 3.0) +( 3.0 4.0 3.0) +( 4.0 4.0 3.0) +( 5.0 4.0 3.0) +( 6.0 4.0 3.0) +( 7.0 4.0 3.0) +( 8.0 4.0 3.0) +( 9.0 4.0 3.0) +( 10.0 4.0 3.0) +( 0.0 5.0 3.0) +( 1.0 5.0 3.0) +( 2.0 5.0 3.0) +( 3.0 5.0 3.0) +( 4.0 5.0 3.0) +( 5.0 5.0 3.0) +( 6.0 5.0 3.0) +( 7.0 5.0 3.0) +( 8.0 5.0 3.0) +( 9.0 5.0 3.0) +( 10.0 5.0 3.0) +( 0.0 6.0 3.0) +( 1.0 6.0 3.0) +( 2.0 6.0 3.0) +( 3.0 6.0 3.0) +( 4.0 6.0 3.0) +( 5.0 6.0 3.0) +( 6.0 6.0 3.0) +( 7.0 6.0 3.0) +( 8.0 6.0 3.0) +( 9.0 6.0 3.0) +( 10.0 6.0 3.0) +( 0.0 7.0 3.0) +( 1.0 7.0 3.0) +( 2.0 7.0 3.0) +( 3.0 7.0 3.0) +( 4.0 7.0 3.0) +( 5.0 7.0 3.0) +( 6.0 7.0 3.0) +( 7.0 7.0 3.0) +( 8.0 7.0 3.0) +( 9.0 7.0 3.0) +( 10.0 7.0 3.0) +( 0.0 8.0 3.0) +( 1.0 8.0 3.0) +( 2.0 8.0 3.0) +( 3.0 8.0 3.0) +( 4.0 8.0 3.0) +( 5.0 8.0 3.0) +( 6.0 8.0 3.0) +( 7.0 8.0 3.0) +( 8.0 8.0 3.0) +( 9.0 8.0 3.0) +( 10.0 8.0 3.0) +( 0.0 9.0 3.0) +( 1.0 9.0 3.0) +( 2.0 9.0 3.0) +( 3.0 9.0 3.0) +( 4.0 9.0 3.0) +( 5.0 9.0 3.0) +( 6.0 9.0 3.0) +( 7.0 9.0 3.0) +( 8.0 9.0 3.0) +( 9.0 9.0 3.0) +( 10.0 9.0 3.0) +( 0.0 10.0 3.0) +( 1.0 10.0 3.0) +( 2.0 10.0 3.0) +( 3.0 10.0 3.0) +( 4.0 10.0 3.0) +( 5.0 10.0 3.0) +( 6.0 10.0 3.0) +( 7.0 10.0 3.0) +( 8.0 10.0 3.0) +( 9.0 10.0 3.0) +( 10.0 10.0 3.0) +( 0.0 11.0 3.0) +( 1.0 11.0 3.0) +( 2.0 11.0 3.0) +( 3.0 11.0 3.0) +( 4.0 11.0 3.0) +( 5.0 11.0 3.0) +( 6.0 11.0 3.0) +( 7.0 11.0 3.0) +( 8.0 11.0 3.0) +( 9.0 11.0 3.0) +( 10.0 11.0 3.0) +( 0.0 0.0 4.0) +( 1.0 0.0 4.0) +( 2.0 0.0 4.0) +( 3.0 0.0 4.0) +( 4.0 0.0 4.0) +( 5.0 0.0 4.0) +( 6.0 0.0 4.0) +( 7.0 0.0 4.0) +( 8.0 0.0 4.0) +( 9.0 0.0 4.0) +( 10.0 0.0 4.0) +( 0.0 1.0 4.0) +( 1.0 1.0 4.0) +( 2.0 1.0 4.0) +( 3.0 1.0 4.0) +( 4.0 1.0 4.0) +( 5.0 1.0 4.0) +( 6.0 1.0 4.0) +( 7.0 1.0 4.0) +( 8.0 1.0 4.0) +( 9.0 1.0 4.0) +( 10.0 1.0 4.0) +( 0.0 2.0 4.0) +( 1.0 2.0 4.0) +( 2.0 2.0 4.0) +( 3.0 2.0 4.0) +( 4.0 2.0 4.0) +( 5.0 2.0 4.0) +( 6.0 2.0 4.0) +( 7.0 2.0 4.0) +( 8.0 2.0 4.0) +( 9.0 2.0 4.0) +( 10.0 2.0 4.0) +( 0.0 3.0 4.0) +( 1.0 3.0 4.0) +( 2.0 3.0 4.0) +( 3.0 3.0 4.0) +( 4.0 3.0 4.0) +( 5.0 3.0 4.0) +( 6.0 3.0 4.0) +( 7.0 3.0 4.0) +( 8.0 3.0 4.0) +( 9.0 3.0 4.0) +( 10.0 3.0 4.0) +( 0.0 4.0 4.0) +( 1.0 4.0 4.0) +( 2.0 4.0 4.0) +( 3.0 4.0 4.0) +( 4.0 4.0 4.0) +( 5.0 4.0 4.0) +( 6.0 4.0 4.0) +( 7.0 4.0 4.0) +( 8.0 4.0 4.0) +( 9.0 4.0 4.0) +( 10.0 4.0 4.0) +( 0.0 5.0 4.0) +( 1.0 5.0 4.0) +( 2.0 5.0 4.0) +( 3.0 5.0 4.0) +( 4.0 5.0 4.0) +( 5.0 5.0 4.0) +( 6.0 5.0 4.0) +( 7.0 5.0 4.0) +( 8.0 5.0 4.0) +( 9.0 5.0 4.0) +( 10.0 5.0 4.0) +( 0.0 6.0 4.0) +( 1.0 6.0 4.0) +( 2.0 6.0 4.0) +( 3.0 6.0 4.0) +( 4.0 6.0 4.0) +( 5.0 6.0 4.0) +( 6.0 6.0 4.0) +( 7.0 6.0 4.0) +( 8.0 6.0 4.0) +( 9.0 6.0 4.0) +( 10.0 6.0 4.0) +( 0.0 7.0 4.0) +( 1.0 7.0 4.0) +( 2.0 7.0 4.0) +( 3.0 7.0 4.0) +( 4.0 7.0 4.0) +( 5.0 7.0 4.0) +( 6.0 7.0 4.0) +( 7.0 7.0 4.0) +( 8.0 7.0 4.0) +( 9.0 7.0 4.0) +( 10.0 7.0 4.0) +( 0.0 8.0 4.0) +( 1.0 8.0 4.0) +( 2.0 8.0 4.0) +( 3.0 8.0 4.0) +( 4.0 8.0 4.0) +( 5.0 8.0 4.0) +( 6.0 8.0 4.0) +( 7.0 8.0 4.0) +( 8.0 8.0 4.0) +( 9.0 8.0 4.0) +( 10.0 8.0 4.0) +( 0.0 9.0 4.0) +( 1.0 9.0 4.0) +( 2.0 9.0 4.0) +( 3.0 9.0 4.0) +( 4.0 9.0 4.0) +( 5.0 9.0 4.0) +( 6.0 9.0 4.0) +( 7.0 9.0 4.0) +( 8.0 9.0 4.0) +( 9.0 9.0 4.0) +( 10.0 9.0 4.0) +( 0.0 10.0 4.0) +( 1.0 10.0 4.0) +( 2.0 10.0 4.0) +( 3.0 10.0 4.0) +( 4.0 10.0 4.0) +( 5.0 10.0 4.0) +( 6.0 10.0 4.0) +( 7.0 10.0 4.0) +( 8.0 10.0 4.0) +( 9.0 10.0 4.0) +( 10.0 10.0 4.0) +( 0.0 11.0 4.0) +( 1.0 11.0 4.0) +( 2.0 11.0 4.0) +( 3.0 11.0 4.0) +( 4.0 11.0 4.0) +( 5.0 11.0 4.0) +( 6.0 11.0 4.0) +( 7.0 11.0 4.0) +( 8.0 11.0 4.0) +( 9.0 11.0 4.0) +( 10.0 11.0 4.0) +( 0.0 0.0 5.0) +( 1.0 0.0 5.0) +( 2.0 0.0 5.0) +( 3.0 0.0 5.0) +( 4.0 0.0 5.0) +( 5.0 0.0 5.0) +( 6.0 0.0 5.0) +( 7.0 0.0 5.0) +( 8.0 0.0 5.0) +( 9.0 0.0 5.0) +( 10.0 0.0 5.0) +( 0.0 1.0 5.0) +( 1.0 1.0 5.0) +( 2.0 1.0 5.0) +( 3.0 1.0 5.0) +( 4.0 1.0 5.0) +( 5.0 1.0 5.0) +( 6.0 1.0 5.0) +( 7.0 1.0 5.0) +( 8.0 1.0 5.0) +( 9.0 1.0 5.0) +( 10.0 1.0 5.0) +( 0.0 2.0 5.0) +( 1.0 2.0 5.0) +( 2.0 2.0 5.0) +( 3.0 2.0 5.0) +( 4.0 2.0 5.0) +( 5.0 2.0 5.0) +( 6.0 2.0 5.0) +( 7.0 2.0 5.0) +( 8.0 2.0 5.0) +( 9.0 2.0 5.0) +( 10.0 2.0 5.0) +( 0.0 3.0 5.0) +( 1.0 3.0 5.0) +( 2.0 3.0 5.0) +( 3.0 3.0 5.0) +( 4.0 3.0 5.0) +( 5.0 3.0 5.0) +( 6.0 3.0 5.0) +( 7.0 3.0 5.0) +( 8.0 3.0 5.0) +( 9.0 3.0 5.0) +( 10.0 3.0 5.0) +( 0.0 4.0 5.0) +( 1.0 4.0 5.0) +( 2.0 4.0 5.0) +( 3.0 4.0 5.0) +( 4.0 4.0 5.0) +( 5.0 4.0 5.0) +( 6.0 4.0 5.0) +( 7.0 4.0 5.0) +( 8.0 4.0 5.0) +( 9.0 4.0 5.0) +( 10.0 4.0 5.0) +( 0.0 5.0 5.0) +( 1.0 5.0 5.0) +( 2.0 5.0 5.0) +( 3.0 5.0 5.0) +( 4.0 5.0 5.0) +( 5.0 5.0 5.0) +( 6.0 5.0 5.0) +( 7.0 5.0 5.0) +( 8.0 5.0 5.0) +( 9.0 5.0 5.0) +( 10.0 5.0 5.0) +( 0.0 6.0 5.0) +( 1.0 6.0 5.0) +( 2.0 6.0 5.0) +( 3.0 6.0 5.0) +( 4.0 6.0 5.0) +( 5.0 6.0 5.0) +( 6.0 6.0 5.0) +( 7.0 6.0 5.0) +( 8.0 6.0 5.0) +( 9.0 6.0 5.0) +( 10.0 6.0 5.0) +( 0.0 7.0 5.0) +( 1.0 7.0 5.0) +( 2.0 7.0 5.0) +( 3.0 7.0 5.0) +( 4.0 7.0 5.0) +( 5.0 7.0 5.0) +( 6.0 7.0 5.0) +( 7.0 7.0 5.0) +( 8.0 7.0 5.0) +( 9.0 7.0 5.0) +( 10.0 7.0 5.0) +( 0.0 8.0 5.0) +( 1.0 8.0 5.0) +( 2.0 8.0 5.0) +( 3.0 8.0 5.0) +( 4.0 8.0 5.0) +( 5.0 8.0 5.0) +( 6.0 8.0 5.0) +( 7.0 8.0 5.0) +( 8.0 8.0 5.0) +( 9.0 8.0 5.0) +( 10.0 8.0 5.0) +( 0.0 9.0 5.0) +( 1.0 9.0 5.0) +( 2.0 9.0 5.0) +( 3.0 9.0 5.0) +( 4.0 9.0 5.0) +( 5.0 9.0 5.0) +( 6.0 9.0 5.0) +( 7.0 9.0 5.0) +( 8.0 9.0 5.0) +( 9.0 9.0 5.0) +( 10.0 9.0 5.0) +( 0.0 10.0 5.0) +( 1.0 10.0 5.0) +( 2.0 10.0 5.0) +( 3.0 10.0 5.0) +( 4.0 10.0 5.0) +( 5.0 10.0 5.0) +( 6.0 10.0 5.0) +( 7.0 10.0 5.0) +( 8.0 10.0 5.0) +( 9.0 10.0 5.0) +( 10.0 10.0 5.0) +( 0.0 11.0 5.0) +( 1.0 11.0 5.0) +( 2.0 11.0 5.0) +( 3.0 11.0 5.0) +( 4.0 11.0 5.0) +( 5.0 11.0 5.0) +( 6.0 11.0 5.0) +( 7.0 11.0 5.0) +( 8.0 11.0 5.0) +( 9.0 11.0 5.0) +( 10.0 11.0 5.0) +); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +blocks +( + + //block 0 +hex (0 1 12 11 132 133 144 143 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 1 +hex (1 2 13 12 133 134 145 144 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 2 +hex (2 3 14 13 134 135 146 145 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 3 +hex (3 4 15 14 135 136 147 146 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 4 +hex (4 5 16 15 136 137 148 147 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 5 +hex (5 6 17 16 137 138 149 148 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 6 +hex (6 7 18 17 138 139 150 149 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 7 +hex (7 8 19 18 139 140 151 150 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 8 +hex (8 9 20 19 140 141 152 151 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 9 +hex (9 10 21 20 141 142 153 152 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 10 +hex (141 142 153 152 273 274 285 284 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 11 +hex (273 274 285 284 405 406 417 416 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 12 +hex (405 406 417 416 537 538 549 548 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 13 +hex (537 538 549 548 669 670 681 680 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 14 +hex (536 537 548 547 668 669 680 679 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 15 +hex (535 536 547 546 667 668 679 678 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 16 +hex (534 535 546 545 666 667 678 677 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 17 +hex (533 534 545 544 665 666 677 676 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 18 +hex (532 533 544 543 664 665 676 675 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 19 +hex (531 532 543 542 663 664 675 674 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 20 +hex (530 531 542 541 662 663 674 673 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 21 +hex (529 530 541 540 661 662 673 672 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 22 +hex (528 529 540 539 660 661 672 671 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 23 +hex (539 540 551 550 671 672 683 682 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 24 +hex (550 551 562 561 682 683 694 693 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 25 +hex (561 562 573 572 693 694 705 704 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 26 +hex (572 573 584 583 704 705 716 715 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 27 +hex (583 584 595 594 715 716 727 726 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 28 +hex (594 595 606 605 726 727 738 737 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 29 +hex (605 606 617 616 737 738 749 748 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 30 +hex (616 617 628 627 748 749 760 759 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 31 +hex (627 628 639 638 759 760 771 770 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 32 +hex (638 639 650 649 770 771 782 781 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 33 +hex (440 441 452 451 572 573 584 583 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 34 +hex (308 309 320 319 440 441 452 451 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 35 +hex (176 177 188 187 308 309 320 319 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 36 +hex (44 45 56 55 176 177 188 187 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 37 +hex (55 56 67 66 187 188 199 198 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 38 +hex (66 67 78 77 198 199 210 209 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 39 +hex (77 78 89 88 209 210 221 220 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 40 +hex (88 89 100 99 220 221 232 231 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 41 +hex (99 100 111 110 231 232 243 242 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 42 +hex (110 111 122 121 242 243 254 253 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 43 +hex (33 34 45 44 165 166 177 176 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 44 +hex (22 23 34 33 154 155 166 165 ) +( 10 10 10 ) +SimpleGrading (1 1 1) + + //block 45 +hex (11 12 23 22 143 144 155 154 ) +( 10 10 10 ) +SimpleGrading (1 1 1) +); + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +defaultPatch +{ type wall;} + +patches +( +); diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/controlDict b/tutorial_cases/loop_reactor_reacting/system/controlDict similarity index 94% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/controlDict rename to tutorial_cases/loop_reactor_reacting/system/controlDict index bda655db..5e782597 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/controlDict +++ b/tutorial_cases/loop_reactor_reacting/system/controlDict @@ -20,7 +20,7 @@ startFrom latestTime;//startTime; startTime 0; -stopAt endTime; +stopAt writeNow;//endTime; endTime 600; @@ -53,7 +53,7 @@ maxDeltaT 0.01; functions { - #includeFunc writeObjects(d.gas) + //#includeFunc writeObjects(d.gas) #includeFunc writeObjects(thermo:rho.gas) #includeFunc writeObjects(thermo:rho.liquid) } diff --git a/OFsolvers/tutorial_cases/loop_reactor/system/decomposeParDict b/tutorial_cases/loop_reactor_reacting/system/decomposeParDict similarity index 97% rename from OFsolvers/tutorial_cases/loop_reactor/system/decomposeParDict rename to tutorial_cases/loop_reactor_reacting/system/decomposeParDict index a1cfef65..f8397e73 100755 --- a/OFsolvers/tutorial_cases/loop_reactor/system/decomposeParDict +++ b/tutorial_cases/loop_reactor_reacting/system/decomposeParDict @@ -17,7 +17,7 @@ FoamFile numberOfSubdomains 16; -method hierarchical; +method scotch; hierarchicalCoeffs { diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvConstraints b/tutorial_cases/loop_reactor_reacting/system/fvConstraints similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/fvConstraints rename to tutorial_cases/loop_reactor_reacting/system/fvConstraints diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvSchemes b/tutorial_cases/loop_reactor_reacting/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/fvSchemes rename to tutorial_cases/loop_reactor_reacting/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvSolution b/tutorial_cases/loop_reactor_reacting/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/system/fvSolution rename to tutorial_cases/loop_reactor_reacting/system/fvSolution diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/inlets_outlets.json b/tutorial_cases/loop_reactor_reacting/system/inlets_outlets.json similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/inlets_outlets.json rename to tutorial_cases/loop_reactor_reacting/system/inlets_outlets.json diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/mesh.json b/tutorial_cases/loop_reactor_reacting/system/mesh.json similarity index 52% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/mesh.json rename to tutorial_cases/loop_reactor_reacting/system/mesh.json index 19af3b73..29841d7e 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/mesh.json +++ b/tutorial_cases/loop_reactor_reacting/system/mesh.json @@ -9,12 +9,18 @@ "Geometry": { "OverallDomain": { "x" : {"nblocks": 10, "size_per_block": 1.0}, - "y" : {"nblocks": 5, "size_per_block": 1.0}, + "y" : {"nblocks": 11, "size_per_block": 1.0}, "z" : {"nblocks": 5, "size_per_block": 1.0} }, "Fluids": [ - [ [0,0,0], [9,0,0], [9,0,4], [0,0,4] ], - [ [0,1,4], [0,4,4], [0,4,0], [0,1,0] ] + [ [0,0,0], [9,0,0] ], + [ [9,0,0], [9,0,4] ], + [ [9,0,4], [0,0,4] ], + [ [0,1,4], [0,4,4] ], + [ [0,4,4], [0,10,4] ], + [ [0,4,4], [0,4,0] ], + [ [0,4,0], [0,10,0] ], + [ [0,4,0], [0,1,0] ] ] } } diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/system/mixers.json b/tutorial_cases/loop_reactor_reacting/system/mixers.json similarity index 100% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/system/mixers.json rename to tutorial_cases/loop_reactor_reacting/system/mixers.json diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/setFieldsDict b/tutorial_cases/loop_reactor_reacting/system/setFieldsDict similarity index 77% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/setFieldsDict rename to tutorial_cases/loop_reactor_reacting/system/setFieldsDict index 07cb1d6d..89a797b9 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/system/setFieldsDict +++ b/tutorial_cases/loop_reactor_reacting/system/setFieldsDict @@ -16,19 +16,19 @@ FoamFile defaultFieldValues ( - volScalarFieldValue alpha.gas 1 - volScalarFieldValue alpha.liquid 0 + volScalarFieldValue alpha.gas 0.99 + volScalarFieldValue alpha.liquid 0.01 ); regions ( boxToCell { - box (-1.0 -1.0 -1.0) (10 0.15 10.0); + box (-1.0 -1.0 -1.0) (552.3 11.046 552.3); fieldValues ( - volScalarFieldValue alpha.gas 0 - volScalarFieldValue alpha.liquid 1 + volScalarFieldValue alpha.gas 0.01 + volScalarFieldValue alpha.liquid 0.99 ); } ); diff --git a/tutorial_cases/loop_reactor_reacting/writeGlobalVars.py b/tutorial_cases/loop_reactor_reacting/writeGlobalVars.py new file mode 100644 index 00000000..0594eccc --- /dev/null +++ b/tutorial_cases/loop_reactor_reacting/writeGlobalVars.py @@ -0,0 +1,47 @@ +import os + +import numpy as np + +from bird.utilities.ofio import * + + +def writeGvars(inletA, liqVol): + filename_tmp = os.path.join("constant", "globalVars_temp") + with open(filename_tmp, "r+") as f: + lines = f.readlines() + filename = os.path.join("constant", "globalVars") + with open(filename, "w+") as f: + for line in lines: + if line.startswith("inletA"): + f.write(f"inletA\t{inletA:g};\n") + elif line.startswith("liqVol"): + f.write(f"liqVol\t{liqVol:g};\n") + else: + f.write(line) + + +def readInletArea(): + filename = os.path.join( + "postProcessing", + "patchIntegrate(patch=inlet,field=alpha.gas)", + "0", + "surfaceFieldValue.dat", + ) + with open(filename, "r+") as f: + lines = f.readlines() + return float(lines[4].split()[-1]) + + +def getLiqVol(): + cellCentres = readMesh(os.path.join(".", f"meshCellCentres_0.obj")) + volume_field = readOFScal(os.path.join("0", "V"), len(cellCentres)) + alpha_field = readOFScal( + os.path.join("0", "alpha.liquid"), len(cellCentres) + ) + return np.sum(volume_field * alpha_field) + + +if __name__ == "__main__": + A = readInletArea() + V = getLiqVol() + writeGvars(A, V) diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/CO.gas b/tutorial_cases/side_sparger/0.orig/CO.gas similarity index 96% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/CO.gas rename to tutorial_cases/side_sparger/0.orig/CO.gas index e1d85769..740c4d72 100644 --- a/OFsolvers/tutorial_cases/bubble_column/0.orig/CO.gas +++ b/tutorial_cases/side_sparger/0.orig/CO.gas @@ -35,7 +35,7 @@ boundaryField type inletOutlet; phi phi.gas; inletValue uniform 0; - value uniform 0; + value uniform $f_CO; } walls diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/CO.liquid b/tutorial_cases/side_sparger/0.orig/CO.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/CO.liquid rename to tutorial_cases/side_sparger/0.orig/CO.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/CO2.gas b/tutorial_cases/side_sparger/0.orig/CO2.gas similarity index 96% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/CO2.gas rename to tutorial_cases/side_sparger/0.orig/CO2.gas index 1e39488d..ed9c8b87 100644 --- a/OFsolvers/tutorial_cases/bubble_column/0.orig/CO2.gas +++ b/tutorial_cases/side_sparger/0.orig/CO2.gas @@ -33,7 +33,7 @@ boundaryField type inletOutlet; phi phi.gas; inletValue uniform 0; - value uniform 0; + value uniform $f_CO2; } walls diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/CO2.liquid b/tutorial_cases/side_sparger/0.orig/CO2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/CO2.liquid rename to tutorial_cases/side_sparger/0.orig/CO2.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/H2.gas b/tutorial_cases/side_sparger/0.orig/H2.gas similarity index 96% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/H2.gas rename to tutorial_cases/side_sparger/0.orig/H2.gas index e81132ce..8a8583de 100644 --- a/OFsolvers/tutorial_cases/bubble_column/0.orig/H2.gas +++ b/tutorial_cases/side_sparger/0.orig/H2.gas @@ -34,7 +34,7 @@ boundaryField type inletOutlet; phi phi.gas; inletValue uniform 0; - value uniform 0; + value uniform $f_H2; } walls diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/H2.liquid b/tutorial_cases/side_sparger/0.orig/H2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/H2.liquid rename to tutorial_cases/side_sparger/0.orig/H2.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/T.gas b/tutorial_cases/side_sparger/0.orig/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/T.gas rename to tutorial_cases/side_sparger/0.orig/T.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/T.liquid b/tutorial_cases/side_sparger/0.orig/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/T.liquid rename to tutorial_cases/side_sparger/0.orig/T.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/U.gas b/tutorial_cases/side_sparger/0.orig/U.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/U.gas rename to tutorial_cases/side_sparger/0.orig/U.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/U.liquid b/tutorial_cases/side_sparger/0.orig/U.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/U.liquid rename to tutorial_cases/side_sparger/0.orig/U.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/Ydefault.gas b/tutorial_cases/side_sparger/0.orig/Ydefault.gas similarity index 98% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/Ydefault.gas rename to tutorial_cases/side_sparger/0.orig/Ydefault.gas index fba2945d..404fb310 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/Ydefault.gas +++ b/tutorial_cases/side_sparger/0.orig/Ydefault.gas @@ -32,7 +32,7 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type zeroGradient; } diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/alpha.gas b/tutorial_cases/side_sparger/0.orig/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/alpha.gas rename to tutorial_cases/side_sparger/0.orig/alpha.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/alpha.liquid b/tutorial_cases/side_sparger/0.orig/alpha.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/alpha.liquid rename to tutorial_cases/side_sparger/0.orig/alpha.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alphat.liquid b/tutorial_cases/side_sparger/0.orig/alphat.gas similarity index 95% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alphat.liquid rename to tutorial_cases/side_sparger/0.orig/alphat.gas index 2569c3ee..f3c95612 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/alphat.liquid +++ b/tutorial_cases/side_sparger/0.orig/alphat.gas @@ -9,7 +9,7 @@ FoamFile { format ascii; class volScalarField; - object alphat.liquid; + object alphat.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ boundaryField value $internalField; } - defaultFaces + walls { type compressible::alphatWallFunction; Prt 0.85; diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alphat.liquid b/tutorial_cases/side_sparger/0.orig/alphat.liquid similarity index 98% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alphat.liquid rename to tutorial_cases/side_sparger/0.orig/alphat.liquid index 2569c3ee..5d2cbc5f 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/alphat.liquid +++ b/tutorial_cases/side_sparger/0.orig/alphat.liquid @@ -33,7 +33,7 @@ boundaryField value $internalField; } - defaultFaces + walls { type compressible::alphatWallFunction; Prt 0.85; diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/epsilon.gas b/tutorial_cases/side_sparger/0.orig/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/epsilon.gas rename to tutorial_cases/side_sparger/0.orig/epsilon.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/epsilon.liquid b/tutorial_cases/side_sparger/0.orig/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/epsilon.liquid rename to tutorial_cases/side_sparger/0.orig/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/f.gas b/tutorial_cases/side_sparger/0.orig/f.gas similarity index 98% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/f.gas rename to tutorial_cases/side_sparger/0.orig/f.gas index 76ee77a9..5c8dde08 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/0.orig/f.gas +++ b/tutorial_cases/side_sparger/0.orig/f.gas @@ -32,7 +32,7 @@ boundaryField type zeroGradient; } - defaultFaces + walls { type zeroGradient; } diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/k.gas b/tutorial_cases/side_sparger/0.orig/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/k.gas rename to tutorial_cases/side_sparger/0.orig/k.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/k.liquid b/tutorial_cases/side_sparger/0.orig/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/k.liquid rename to tutorial_cases/side_sparger/0.orig/k.liquid diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/nut.gas b/tutorial_cases/side_sparger/0.orig/nut.gas similarity index 88% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/nut.gas rename to tutorial_cases/side_sparger/0.orig/nut.gas index ba16dd4c..bd727d39 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/nut.gas +++ b/tutorial_cases/side_sparger/0.orig/nut.gas @@ -31,11 +31,9 @@ boundaryField value $internalField; } - defaultFaces + walls { - //type nutkWallFunction; - //value $internalField; - type calculated; + type nutkWallFunction; value $internalField; } diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/nut.liquid b/tutorial_cases/side_sparger/0.orig/nut.liquid similarity index 98% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/nut.liquid rename to tutorial_cases/side_sparger/0.orig/nut.liquid index 1442e07f..0b684e7f 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/0.orig/nut.liquid +++ b/tutorial_cases/side_sparger/0.orig/nut.liquid @@ -33,7 +33,7 @@ boundaryField value $internalField; } - defaultFaces + walls { type nutkWallFunction; value $internalField; diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/omega.liquid b/tutorial_cases/side_sparger/0.orig/omega.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/omega.liquid rename to tutorial_cases/side_sparger/0.orig/omega.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/p b/tutorial_cases/side_sparger/0.orig/p similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/p rename to tutorial_cases/side_sparger/0.orig/p diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/p_rgh b/tutorial_cases/side_sparger/0.orig/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/p_rgh rename to tutorial_cases/side_sparger/0.orig/p_rgh diff --git a/OFsolvers/tutorial_cases/bubble_column/0.orig/water.liquid b/tutorial_cases/side_sparger/0.orig/water.liquid similarity index 96% rename from OFsolvers/tutorial_cases/bubble_column/0.orig/water.liquid rename to tutorial_cases/side_sparger/0.orig/water.liquid index 10b4141c..1beba9f1 100644 --- a/OFsolvers/tutorial_cases/bubble_column/0.orig/water.liquid +++ b/tutorial_cases/side_sparger/0.orig/water.liquid @@ -32,7 +32,7 @@ boundaryField type inletOutlet; phi phi.liquid; inletValue uniform 0; - value uniform 0; + value uniform 1; } walls diff --git a/OFsolvers/tutorial_cases/loop_reactor/Allclean b/tutorial_cases/side_sparger/Allclean similarity index 93% rename from OFsolvers/tutorial_cases/loop_reactor/Allclean rename to tutorial_cases/side_sparger/Allclean index 4003a12b..b00a24a7 100755 --- a/OFsolvers/tutorial_cases/loop_reactor/Allclean +++ b/tutorial_cases/side_sparger/Allclean @@ -11,5 +11,6 @@ cd ${0%/*} || exit 1 # Run from this directory #rm -rf processor* > /dev/null 2>&1 rm -rf 0 cleanCase - +#rm system/blockMeshDict +rm *.obj #------------------------------------------------------------------------------ diff --git a/tutorial_cases/side_sparger/README.md b/tutorial_cases/side_sparger/README.md new file mode 100644 index 00000000..745bbf5e --- /dev/null +++ b/tutorial_cases/side_sparger/README.md @@ -0,0 +1,7 @@ +### Side sparger case + +Cross flow sparger injection (side sparger), meshed with block cylindrical mesh + +Single core exec + +1. `bash run.sh` diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/OrigfvModels b/tutorial_cases/side_sparger/constant/OrigfvModels similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/constant/OrigfvModels rename to tutorial_cases/side_sparger/constant/OrigfvModels diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/g b/tutorial_cases/side_sparger/constant/g similarity index 90% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/g rename to tutorial_cases/side_sparger/constant/g index 770a5619..610fffc9 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix/constant/g +++ b/tutorial_cases/side_sparger/constant/g @@ -2,14 +2,13 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class uniformDimensionedVectorField; - location "constant"; object g; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -17,5 +16,4 @@ FoamFile dimensions [0 1 -2 0 0 0 0]; value (0 -9.81 0); - // ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/globalVars b/tutorial_cases/side_sparger/constant/globalVars similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/constant/globalVars rename to tutorial_cases/side_sparger/constant/globalVars diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.gas b/tutorial_cases/side_sparger/constant/momentumTransport.gas similarity index 91% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.gas rename to tutorial_cases/side_sparger/constant/momentumTransport.gas index ca916714..6353de49 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.gas +++ b/tutorial_cases/side_sparger/constant/momentumTransport.gas @@ -2,14 +2,13 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class dictionary; - location "constant"; object momentumTransport.gas; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.liquid b/tutorial_cases/side_sparger/constant/momentumTransport.liquid similarity index 87% rename from OFsolvers/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.liquid rename to tutorial_cases/side_sparger/constant/momentumTransport.liquid index 2063de0d..a98b8c5b 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_reacting/constant/momentumTransport.liquid +++ b/tutorial_cases/side_sparger/constant/momentumTransport.liquid @@ -2,23 +2,22 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile { format ascii; class dictionary; - location "constant"; object momentumTransport.liquid; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//simulationType laminar; simulationType RAS; RAS { + //model kOmegaSSTSato; model mixtureKEpsilon; turbulence on; printCoeffs on; diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/phaseProperties b/tutorial_cases/side_sparger/constant/phaseProperties similarity index 72% rename from OFsolvers/tutorial_cases/bubble_column/constant/phaseProperties rename to tutorial_cases/side_sparger/constant/phaseProperties index f12d1d3d..878788f5 100644 --- a/OFsolvers/tutorial_cases/bubble_column/constant/phaseProperties +++ b/tutorial_cases/side_sparger/constant/phaseProperties @@ -93,27 +93,25 @@ populationBalanceCoeffs coalescenceModels ( - //LehrMilliesMewes_limited{ // Need to install the model available at https://github.com/NREL/BioReactorDesign - LehrMilliesMewes{ + LehrMilliesMewes_limited{ + //LehrMilliesMewes{ uCrit 0.08; alphaMax 0.6; - //height_lim $LiqHt_limit; - //height_dir 1; + height_lim $LiqHt_limit; + height_dir 1; } ); binaryBreakupModels - ( - // LehrMilliesMewes{} - ); + (); breakupModels ( - //Laakkonen_limited{ // Need to install the model available at https://github.com/NREL/BioReactorDesign - Laakkonen{ + Laakkonen_limited{ + //Laakkonen{ daughterSizeDistributionModel Laakkonen; - //height_lim $LiqHt_limit; - //height_dir 1; + height_lim $LiqHt_limit; + height_dir 1; } ); @@ -175,11 +173,11 @@ drag ( (gas in liquid) { - //type Grace_limited; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type IshiiZuber; + type Grace_limited; + //type IshiiZuber; residualRe 1e-3; - //height_lim $LiqHt_limit; - //height_dir 1; + height_lim $LiqHt_limit; + height_dir 1; swarmCorrection { type none; @@ -236,13 +234,10 @@ interfaceComposition.liquid ( (liquid and gas) { - //type Henry_limited; // Need to install the model available at https://github.com/NREL/BioReactorDesign type Henry; species ( CO2 CO H2); k ( $He_CO2 $He_CO $He_H2); Le $LeLiqMix; - //height_lim $LiqHt_limit; - //height_dir 1; } ); @@ -253,20 +248,20 @@ diffusiveMassTransfer.liquid ( (gas in liquid) { - //type Higbie_limited; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie_limited; + //type Frossling; Le $LeLiqMix; - //height_lim $LiqHt_limit; - //height_dir 1; + height_lim $LiqHt_limit; + height_dir 1; } (liquid in gas) { - //type spherical_limited; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type spherical; + type spherical_limited; + //type spherical; Le 1.0; //not used for spherical - //height_lim $LiqHt_limit; - //height_dir 1; + height_lim $LiqHt_limit; + height_dir 1; } ); @@ -287,10 +282,10 @@ lift lift { - //type Tomiyama_limited; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Tomiyama; - //height_lim $LiqHt_limit; - //height_dir 1; + type Tomiyama_limited; + //type Tomiyama; + height_lim $LiqHt_limit; + height_dir 1; swarmCorrection { @@ -305,12 +300,12 @@ wallLubrication ( (gas in liquid) { - //type Antal_limited; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Antal; + type Antal_limited; + //type Antal; Cw1 -0.01; Cw2 0.05; - //height_lim $LiqHt_limit; - //height_dir 1; + height_lim $LiqHt_limit; + height_dir 1; } ); @@ -318,11 +313,11 @@ turbulentDispersion ( (gas in liquid) { - //type Burns_limited; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Burns; + type Burns_limited; + //type Burns; sigma 0.9; - //height_lim $LiqHt_limit; - //height_dir 1; + height_lim $LiqHt_limit; + height_dir 1; } ); diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/thermophysicalProperties.gas b/tutorial_cases/side_sparger/constant/thermophysicalProperties.gas similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/constant/thermophysicalProperties.gas rename to tutorial_cases/side_sparger/constant/thermophysicalProperties.gas diff --git a/OFsolvers/tutorial_cases/bubble_column/constant/thermophysicalProperties.liquid b/tutorial_cases/side_sparger/constant/thermophysicalProperties.liquid similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/constant/thermophysicalProperties.liquid rename to tutorial_cases/side_sparger/constant/thermophysicalProperties.liquid diff --git a/OFsolvers/tutorial_cases/bubble_column/run.sh b/tutorial_cases/side_sparger/run.sh similarity index 73% rename from OFsolvers/tutorial_cases/bubble_column/run.sh rename to tutorial_cases/side_sparger/run.sh index c15accfb..8f029538 100755 --- a/OFsolvers/tutorial_cases/bubble_column/run.sh +++ b/tutorial_cases/side_sparger/run.sh @@ -10,8 +10,9 @@ if ! type "python" &> /dev/null; then echo " could not be found" echo "Skipping Mesh generation" else + BIRD_DIR=`python -c "import bird; print(bird.BIRD_DIR)"` # Generate blockmeshDict - python ../../../applications/write_block_cyl_mesh.py -i ../../../bird/meshing/block_cyl_mesh_templates/sideSparger/input.json -t ../../../bird/meshing/block_cyl_mesh_templates/sideSparger/topology.json -o system + python ../../applications/write_block_cyl_mesh.py -i ../../bird/meshing/block_cyl_mesh_templates/sideSparger/input.json -t ../../bird/meshing/block_cyl_mesh_templates/sideSparger/topology.json -o system fi @@ -35,7 +36,8 @@ else writeMeshObj # Run - birdmultiphaseEulerFoam + birdmultiphaseEulerFoam + fi diff --git a/tutorial_cases/side_sparger/system/circinlet.m4 b/tutorial_cases/side_sparger/system/circinlet.m4 new file mode 100644 index 00000000..518f8519 --- /dev/null +++ b/tutorial_cases/side_sparger/system/circinlet.m4 @@ -0,0 +1,229 @@ +//--------------------------------*- C++ -*---------------------------------- +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// ************************************ +changecom(//)changequote([,]) +define(calc, [esyscmd(perl -e 'printf ($1)')]) +define(calcint, [esyscmd(perl -e 'printf int($1)')]) +define(VCOUNT, 0) +define(vlabel, [[// ]Vertex $1 = VCOUNT define($1, VCOUNT)define([VCOUNT], incr(VCOUNT))]) + + convertToMeters 1; + + define(D1, 1.25) // outer cylinder diameter + define(L1, 10.0) // outer cylinder length + define(D2, calc(0.707*D1)) // inner cylinder diameter + + define(PI, 3.14159265) + + define(R1, calc(D1/2)) + define(R2, calc(D2/2)) + define(CW, calc(D2/4)) //Width of middle square section + + define(CX1, calc(R1*cos((PI/180)*45))) + define(CZ1, calc(R1*sin((PI/180)*45))) + + define(CX2, calc(R2*cos((PI/180)*45))) + define(CZ2, calc(R2*sin((PI/180)*45))) + + define(NPS, 16) //how many cells in the square section + define(NPD, 16) //how many cells from square section to perimeter + define(NPY, 400) // how many cells from top to bottom + + vertices + ( + //Bottom surface + //========== + + //square + ( CW 0.0 CW) vlabel(fiveoclock_sq1) + (-CW 0.0 CW) vlabel(sevenoclock_sq1) + (-CW 0.0 -CW) vlabel(elevenoclock_sq1) + ( CW 0.0 -CW) vlabel(oneoclock_sq1) + + //outer circle + ( CX1 0.0 CZ1) vlabel(fiveoclock_c11) + (-CX1 0.0 CZ1) vlabel(sevenoclock_c11) + (-CX1 0.0 -CZ1) vlabel(elevenoclock_c11) + ( CX1 0.0 -CZ1) vlabel(oneoclock_c11) + + //inner circle + ( CX2 0.0 CZ2) vlabel(fiveoclock_c21) + (-CX2 0.0 CZ2) vlabel(sevenoclock_c21) + (-CX2 0.0 -CZ2) vlabel(elevenoclock_c21) + ( CX2 0.0 -CZ2) vlabel(oneoclock_c21) + + + //Top surface + + //square + ( CW L1 CW) vlabel(fiveoclock_sq2) + (-CW L1 CW) vlabel(sevenoclock_sq2) + (-CW L1 -CW) vlabel(elevenoclock_sq2) + ( CW L1 -CW) vlabel(oneoclock_sq2) + + //outer circle + ( CX1 L1 CZ1) vlabel(fiveoclock_c12) + (-CX1 L1 CZ1) vlabel(sevenoclock_c12) + (-CX1 L1 -CZ1) vlabel(elevenoclock_c12) + ( CX1 L1 -CZ1) vlabel(oneoclock_c12) + + //inner circle + ( CX2 L1 CZ2) vlabel(fiveoclock_c22) + (-CX2 L1 CZ2) vlabel(sevenoclock_c22) + (-CX2 L1 -CZ2) vlabel(elevenoclock_c22) + ( CX2 L1 -CZ2) vlabel(oneoclock_c22) + + ); + + blocks + ( + //square block + hex ( + sevenoclock_sq1 fiveoclock_sq1 oneoclock_sq1 elevenoclock_sq1 + sevenoclock_sq2 fiveoclock_sq2 oneoclock_sq2 elevenoclock_sq2 + ) + (NPS NPS NPY) + simpleGrading (1 1 1) + + //slice1 + hex ( + sevenoclock_c21 fiveoclock_c21 fiveoclock_sq1 sevenoclock_sq1 + sevenoclock_c22 fiveoclock_c22 fiveoclock_sq2 sevenoclock_sq2 + ) + (NPS NPD NPY) + simpleGrading (1 1 1) + + //slice2 + hex ( + elevenoclock_c21 sevenoclock_c21 sevenoclock_sq1 elevenoclock_sq1 + elevenoclock_c22 sevenoclock_c22 sevenoclock_sq2 elevenoclock_sq2 + ) + (NPS NPD NPY) +simpleGrading (1 1 1) + + //slice3 + hex ( + oneoclock_c21 elevenoclock_c21 elevenoclock_sq1 oneoclock_sq1 + oneoclock_c22 elevenoclock_c22 elevenoclock_sq2 oneoclock_sq2 + ) + (NPS NPD NPY) +simpleGrading (1 1 1) + + //slice4 + hex ( + fiveoclock_c21 oneoclock_c21 oneoclock_sq1 fiveoclock_sq1 + fiveoclock_c22 oneoclock_c22 oneoclock_sq2 fiveoclock_sq2 + ) + (NPS NPD NPY) + simpleGrading (1 1 1) + + //slice1 + hex ( + fiveoclock_c11 fiveoclock_c21 sevenoclock_c21 sevenoclock_c11 + fiveoclock_c12 fiveoclock_c22 sevenoclock_c22 sevenoclock_c12 + ) + (NPD NPS NPY) + simpleGrading (1 1 1) + + //slice2 + hex ( + sevenoclock_c11 sevenoclock_c21 elevenoclock_c21 elevenoclock_c11 + sevenoclock_c12 sevenoclock_c22 elevenoclock_c22 elevenoclock_c12 + ) + (NPD NPS NPY) +simpleGrading (1 1 1) + + //slice3 + hex ( + elevenoclock_c11 elevenoclock_c21 oneoclock_c21 oneoclock_c11 + elevenoclock_c12 elevenoclock_c22 oneoclock_c22 oneoclock_c12 + ) + (NPD NPS NPY) +simpleGrading (1 1 1) + + //slice4 + hex ( + oneoclock_c11 oneoclock_c21 fiveoclock_c21 fiveoclock_c11 + oneoclock_c12 oneoclock_c22 fiveoclock_c22 fiveoclock_c12 + ) + (NPD NPS NPY) + simpleGrading (1 1 1) + + ); + + + //create the quarter circles + edges + ( + arc fiveoclock_c11 sevenoclock_c11 (0.0 0.0 R1) + arc sevenoclock_c11 elevenoclock_c11 (-R1 0.0 0.0) + arc elevenoclock_c11 oneoclock_c11 (0.0 0.0 -R1) + arc oneoclock_c11 fiveoclock_c11 (R1 0.0 0.0) + + arc fiveoclock_c12 sevenoclock_c12 (0.0 L1 R1) + arc sevenoclock_c12 elevenoclock_c12 (-R1 L1 0.0) + arc elevenoclock_c12 oneoclock_c12 (0.0 L1 -R1) + arc oneoclock_c12 fiveoclock_c12 (R1 L1 0.0) + + arc fiveoclock_c21 sevenoclock_c21 (0.0 0.0 R2) + arc sevenoclock_c21 elevenoclock_c21 (-R2 0.0 0.0) + arc elevenoclock_c21 oneoclock_c21 (0.0 0.0 -R2) + arc oneoclock_c21 fiveoclock_c21 (R2 0.0 0.0) + + arc fiveoclock_c22 sevenoclock_c22 (0.0 L1 R2) + arc sevenoclock_c22 elevenoclock_c22 (-R2 L1 0.0) + arc elevenoclock_c22 oneoclock_c22 (0.0 L1 -R2) + arc oneoclock_c22 fiveoclock_c22 (R2 L1 0.0) + ); + + patches + ( + patch inlet + ( + (fiveoclock_sq1 oneoclock_sq1 elevenoclock_sq1 sevenoclock_sq1) + (fiveoclock_sq1 fiveoclock_c21 sevenoclock_c21 sevenoclock_sq1) + (sevenoclock_sq1 sevenoclock_c21 elevenoclock_c21 elevenoclock_sq1) + (elevenoclock_sq1 elevenoclock_c21 oneoclock_c21 oneoclock_sq1) + (oneoclock_sq1 oneoclock_c21 fiveoclock_c21 fiveoclock_sq1) + ) + + patch outlet + ( + (fiveoclock_sq2 oneoclock_sq2 elevenoclock_sq2 sevenoclock_sq2) + (fiveoclock_sq2 fiveoclock_c22 sevenoclock_c22 sevenoclock_sq2) + (sevenoclock_sq2 sevenoclock_c22 elevenoclock_c22 elevenoclock_sq2) + (elevenoclock_sq2 elevenoclock_c22 oneoclock_c22 oneoclock_sq2) + (oneoclock_sq2 oneoclock_c22 fiveoclock_c22 fiveoclock_sq2) + + (fiveoclock_c22 fiveoclock_c12 sevenoclock_c12 sevenoclock_c22) + (sevenoclock_c22 sevenoclock_c12 elevenoclock_c12 elevenoclock_c22) + (elevenoclock_c22 elevenoclock_c12 oneoclock_c12 oneoclock_c22) + (oneoclock_c22 oneoclock_c12 fiveoclock_c12 fiveoclock_c22) + + ) + + wall walls + ( + (fiveoclock_c21 fiveoclock_c11 sevenoclock_c11 sevenoclock_c21) + (sevenoclock_c21 sevenoclock_c11 elevenoclock_c11 elevenoclock_c21) + (elevenoclock_c21 elevenoclock_c11 oneoclock_c11 oneoclock_c21) + (oneoclock_c21 oneoclock_c11 fiveoclock_c11 fiveoclock_c21) + + (fiveoclock_c11 fiveoclock_c12 sevenoclock_c12 sevenoclock_c11) + (sevenoclock_c11 sevenoclock_c12 elevenoclock_c12 elevenoclock_c11) + (elevenoclock_c11 elevenoclock_c12 oneoclock_c12 oneoclock_c11) + (oneoclock_c11 oneoclock_c12 fiveoclock_c12 fiveoclock_c11) + ) + +); + +mergePatchPairs +( +); diff --git a/OFsolvers/tutorial_cases/bubble_column/system/controlDict b/tutorial_cases/side_sparger/system/controlDict similarity index 98% rename from OFsolvers/tutorial_cases/bubble_column/system/controlDict rename to tutorial_cases/side_sparger/system/controlDict index 48186072..812bdde3 100644 --- a/OFsolvers/tutorial_cases/bubble_column/system/controlDict +++ b/tutorial_cases/side_sparger/system/controlDict @@ -19,7 +19,7 @@ startFrom latestTime; startTime 0; -stopAt endTime; +stopAt writeNow;//endTime; endTime 400; diff --git a/OFsolvers/tutorial_cases/bubble_column/system/controlDict.first b/tutorial_cases/side_sparger/system/controlDict.first similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/controlDict.first rename to tutorial_cases/side_sparger/system/controlDict.first diff --git a/OFsolvers/tutorial_cases/bubble_column/system/controlDict.second b/tutorial_cases/side_sparger/system/controlDict.second similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/controlDict.second rename to tutorial_cases/side_sparger/system/controlDict.second diff --git a/OFsolvers/tutorial_cases/bubble_column/system/decomposeParDict b/tutorial_cases/side_sparger/system/decomposeParDict similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/decomposeParDict rename to tutorial_cases/side_sparger/system/decomposeParDict diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvConstraints b/tutorial_cases/side_sparger/system/fvConstraints similarity index 93% rename from OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvConstraints rename to tutorial_cases/side_sparger/system/fvConstraints index 164c3e0b..dbf1d468 100644 --- a/OFsolvers/tutorial_cases/loop_reactor_pbe_dynmix_nonstat/system/fvConstraints +++ b/tutorial_cases/side_sparger/system/fvConstraints @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev + \\ / A nd | Version: 9 \\/ M anipulation | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/OFsolvers/tutorial_cases/bubble_column/system/fvSchemes b/tutorial_cases/side_sparger/system/fvSchemes similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/fvSchemes rename to tutorial_cases/side_sparger/system/fvSchemes diff --git a/OFsolvers/tutorial_cases/bubble_column/system/fvSchemes.second b/tutorial_cases/side_sparger/system/fvSchemes.second similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/fvSchemes.second rename to tutorial_cases/side_sparger/system/fvSchemes.second diff --git a/OFsolvers/tutorial_cases/bubble_column/system/fvSchemes.upwind b/tutorial_cases/side_sparger/system/fvSchemes.upwind similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/fvSchemes.upwind rename to tutorial_cases/side_sparger/system/fvSchemes.upwind diff --git a/OFsolvers/tutorial_cases/bubble_column/system/fvSolution b/tutorial_cases/side_sparger/system/fvSolution similarity index 100% rename from OFsolvers/tutorial_cases/bubble_column/system/fvSolution rename to tutorial_cases/side_sparger/system/fvSolution diff --git a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/decomposeParDict b/tutorial_cases/side_sparger/system/setFieldsDict old mode 100755 new mode 100644 similarity index 58% rename from OFsolvers/tutorial_cases/loop_reactor_pbe/system/decomposeParDict rename to tutorial_cases/side_sparger/system/setFieldsDict index a1cfef65..47b6de2e --- a/OFsolvers/tutorial_cases/loop_reactor_pbe/system/decomposeParDict +++ b/tutorial_cases/side_sparger/system/setFieldsDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 3.0.x | +| \\ / O peration | Version: 3.0.0 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -10,21 +10,34 @@ FoamFile version 2.0; format ascii; class dictionary; - object decomposeParDict; + location "system"; + object setFieldsDict; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#include "${FOAM_CASE}/constant/globalVars" -numberOfSubdomains 16; -method hierarchical; +Db #calc "$DiaBcol"; +mDb #calc "-$Db"; -hierarchicalCoeffs -{ - n (4 4 1); - delta 0.001; - order xyz; -} +defaultFieldValues +( + volScalarFieldValue alpha.gas 0.99 + volScalarFieldValue alpha.liquid 0.01 +); + +regions +( + boxToCell + { + box ($mDb 0.0 $mDb) ($Db $LiqHt $Db); + fieldValues + ( + volScalarFieldValue alpha.gas 0.01 + volScalarFieldValue alpha.liquid 0.99 + ); + } +); // ************************************************************************* // diff --git a/tutorial_cases/side_sparger/system/topoSetDict b/tutorial_cases/side_sparger/system/topoSetDict new file mode 100644 index 00000000..2b9aa515 --- /dev/null +++ b/tutorial_cases/side_sparger/system/topoSetDict @@ -0,0 +1,85 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: 9 + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + format ascii; + class dictionary; + object topoSetDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "${FOAM_CASE}/constant/globalVars" + +Dbcol #calc "$DiaBcol"; +mDbcol #calc "-$Dbcol"; + +delHt #calc "0.15*$Dbcol"; + +Bot1 #calc "0.5*$Dbcol"; +Bot2 #calc "$Bot1+$delHt"; + +Top1 #calc "0.9*$LiqHt"; +Top2 #calc "$Top1+$delHt"; + +actions +( + { + name injection; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + boxes + ( + ($mDbcol $Bot1 $mDbcol) ($Dbcol $Bot2 $Dbcol) + ); + } + } + + { + name injection; + type cellZoneSet; + action new; + source setToCellZone; + sourceInfo + { + set injection; + } + } + + //---------------------------------// + { + name outlet; + type cellSet; + action new; + source boxToCell; + sourceInfo + { + boxes + ( + // (0 -1 0.89) (0.025 1 0.9) + ($mDbcol $Top1 $mDbcol) ($Dbcol $Top2 $Dbcol) + ); + } + } + + { + name outlet; + type cellZoneSet; + action new; + source setToCellZone; + sourceInfo + { + set outlet; + } + } + +); + +// ************************************************************************* // diff --git a/OFsolvers/tutorial_cases/stir_tank/Allclean b/tutorial_cases/stirred_tank/Allclean similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/Allclean rename to tutorial_cases/stirred_tank/Allclean diff --git a/tutorial_cases/stirred_tank/README.md b/tutorial_cases/stirred_tank/README.md new file mode 100644 index 00000000..14bd3bd4 --- /dev/null +++ b/tutorial_cases/stirred_tank/README.md @@ -0,0 +1,7 @@ +### Stirred tank reactor + +Stirred tank case with baffles + +Single core exec + +1. `bash run.sh` diff --git a/bird/meshing/stir_tank_case_templates/base/constant/MRFProperties b/tutorial_cases/stirred_tank/constant/MRFProperties similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/MRFProperties rename to tutorial_cases/stirred_tank/constant/MRFProperties diff --git a/bird/meshing/stir_tank_case_templates/base/constant/g b/tutorial_cases/stirred_tank/constant/g similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/g rename to tutorial_cases/stirred_tank/constant/g diff --git a/bird/meshing/stir_tank_case_templates/base/constant/globalTransport b/tutorial_cases/stirred_tank/constant/globalTransport similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/globalTransport rename to tutorial_cases/stirred_tank/constant/globalTransport diff --git a/bird/meshing/stir_tank_case_templates/base/constant/globalVars b/tutorial_cases/stirred_tank/constant/globalVars similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/globalVars rename to tutorial_cases/stirred_tank/constant/globalVars diff --git a/OFsolvers/tutorial_cases/stir_tank/constant/phaseProperties b/tutorial_cases/stirred_tank/constant/phaseProperties similarity index 93% rename from OFsolvers/tutorial_cases/stir_tank/constant/phaseProperties rename to tutorial_cases/stirred_tank/constant/phaseProperties index 2017968c..28ba9503 100644 --- a/OFsolvers/tutorial_cases/stir_tank/constant/phaseProperties +++ b/tutorial_cases/stirred_tank/constant/phaseProperties @@ -212,8 +212,8 @@ drag ( (gas in liquid) { - //type Grace;// Need to install the model available at https://github.com/NREL/BioReactorDesign - type IshiiZuber; + type Grace; + //type IshiiZuber; residualRe 1e-3; swarmCorrection { @@ -306,8 +306,8 @@ diffusiveMassTransfer.liquid ( (gas in liquid) { - //type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie; + //type Frossling; Le $LeLiqMix; } @@ -328,8 +328,8 @@ massTransfer.gas (liquid in gas) { - //type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie; + //type Frossling; Le $LeLiq; } ); @@ -338,8 +338,8 @@ massTransfer.liquid ( (gas in liquid) { - //type Higbie; // Need to install the model available at https://github.com/NREL/BioReactorDesign - type Frossling; + type Higbie; + //type Frossling; Le $LeLiq; } diff --git a/bird/meshing/stir_tank_case_templates/base/constant/thermophysicalProperties.gas b/tutorial_cases/stirred_tank/constant/thermophysicalProperties.gas similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/thermophysicalProperties.gas rename to tutorial_cases/stirred_tank/constant/thermophysicalProperties.gas diff --git a/bird/meshing/stir_tank_case_templates/base/constant/thermophysicalProperties.liquid b/tutorial_cases/stirred_tank/constant/thermophysicalProperties.liquid similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/thermophysicalProperties.liquid rename to tutorial_cases/stirred_tank/constant/thermophysicalProperties.liquid diff --git a/bird/meshing/stir_tank_case_templates/base/constant/turbulenceProperties.gas b/tutorial_cases/stirred_tank/constant/turbulenceProperties.gas similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/turbulenceProperties.gas rename to tutorial_cases/stirred_tank/constant/turbulenceProperties.gas diff --git a/bird/meshing/stir_tank_case_templates/base/constant/turbulenceProperties.liquid b/tutorial_cases/stirred_tank/constant/turbulenceProperties.liquid similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/constant/turbulenceProperties.liquid rename to tutorial_cases/stirred_tank/constant/turbulenceProperties.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/CO2.gas b/tutorial_cases/stirred_tank/orig0/CO2.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/CO2.gas rename to tutorial_cases/stirred_tank/orig0/CO2.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/CO2.liquid b/tutorial_cases/stirred_tank/orig0/CO2.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/CO2.liquid rename to tutorial_cases/stirred_tank/orig0/CO2.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/T.gas b/tutorial_cases/stirred_tank/orig0/T.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/T.gas rename to tutorial_cases/stirred_tank/orig0/T.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/T.liquid b/tutorial_cases/stirred_tank/orig0/T.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/T.liquid rename to tutorial_cases/stirred_tank/orig0/T.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/U.gas b/tutorial_cases/stirred_tank/orig0/U.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/U.gas rename to tutorial_cases/stirred_tank/orig0/U.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/U.liquid b/tutorial_cases/stirred_tank/orig0/U.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/U.liquid rename to tutorial_cases/stirred_tank/orig0/U.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/Ydefault.gas b/tutorial_cases/stirred_tank/orig0/Ydefault.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/Ydefault.gas rename to tutorial_cases/stirred_tank/orig0/Ydefault.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/Ydefault.liquid b/tutorial_cases/stirred_tank/orig0/Ydefault.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/Ydefault.liquid rename to tutorial_cases/stirred_tank/orig0/Ydefault.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/alpha.gas b/tutorial_cases/stirred_tank/orig0/alpha.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/alpha.gas rename to tutorial_cases/stirred_tank/orig0/alpha.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/alpha.liquid b/tutorial_cases/stirred_tank/orig0/alpha.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/alpha.liquid rename to tutorial_cases/stirred_tank/orig0/alpha.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/alphat.gas b/tutorial_cases/stirred_tank/orig0/alphat.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/alphat.gas rename to tutorial_cases/stirred_tank/orig0/alphat.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/alphat.liquid b/tutorial_cases/stirred_tank/orig0/alphat.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/alphat.liquid rename to tutorial_cases/stirred_tank/orig0/alphat.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/epsilon.gas b/tutorial_cases/stirred_tank/orig0/epsilon.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/epsilon.gas rename to tutorial_cases/stirred_tank/orig0/epsilon.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/epsilon.liquid b/tutorial_cases/stirred_tank/orig0/epsilon.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/epsilon.liquid rename to tutorial_cases/stirred_tank/orig0/epsilon.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/f.gas b/tutorial_cases/stirred_tank/orig0/f.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/f.gas rename to tutorial_cases/stirred_tank/orig0/f.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/k.gas b/tutorial_cases/stirred_tank/orig0/k.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/k.gas rename to tutorial_cases/stirred_tank/orig0/k.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/k.liquid b/tutorial_cases/stirred_tank/orig0/k.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/k.liquid rename to tutorial_cases/stirred_tank/orig0/k.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/nut.gas b/tutorial_cases/stirred_tank/orig0/nut.gas similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/nut.gas rename to tutorial_cases/stirred_tank/orig0/nut.gas diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/nut.liquid b/tutorial_cases/stirred_tank/orig0/nut.liquid similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/nut.liquid rename to tutorial_cases/stirred_tank/orig0/nut.liquid diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/p b/tutorial_cases/stirred_tank/orig0/p similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/p rename to tutorial_cases/stirred_tank/orig0/p diff --git a/OFsolvers/tutorial_cases/stir_tank/orig0/p_rgh b/tutorial_cases/stirred_tank/orig0/p_rgh similarity index 100% rename from OFsolvers/tutorial_cases/stir_tank/orig0/p_rgh rename to tutorial_cases/stirred_tank/orig0/p_rgh diff --git a/OFsolvers/tutorial_cases/stir_tank/run.sh b/tutorial_cases/stirred_tank/run.sh similarity index 87% rename from OFsolvers/tutorial_cases/stir_tank/run.sh rename to tutorial_cases/stirred_tank/run.sh index c17df984..307e7b84 100644 --- a/OFsolvers/tutorial_cases/stir_tank/run.sh +++ b/tutorial_cases/stirred_tank/run.sh @@ -11,7 +11,7 @@ if ! type "python" &> /dev/null; then echo "Skipping Mesh generation" else # Generate blockmeshDict - python ../../../applications/write_stir_tank_mesh.py -i ../../../bird/meshing/stir_tank_mesh_templates/base_tank/tank_par.yaml -o system/blockMeshDict + python ../../applications/write_stirred_tank_mesh.py -i ../../bird/meshing/stirred_tank_mesh_templates/base_tank/tank_par.yaml -o system/blockMeshDict fi diff --git a/bird/meshing/stir_tank_case_templates/base/system/controlDict b/tutorial_cases/stirred_tank/system/controlDict similarity index 97% rename from bird/meshing/stir_tank_case_templates/base/system/controlDict rename to tutorial_cases/stirred_tank/system/controlDict index ff5b52e1..0f981f30 100644 --- a/bird/meshing/stir_tank_case_templates/base/system/controlDict +++ b/tutorial_cases/stirred_tank/system/controlDict @@ -21,7 +21,7 @@ startFrom latestTime; //startTime; //latestTime startTime 0; -stopAt endTime; +stopAt writeNow;//endTime; endTime 500; diff --git a/bird/meshing/stir_tank_case_templates/base/system/decomposeParDict b/tutorial_cases/stirred_tank/system/decomposeParDict similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/system/decomposeParDict rename to tutorial_cases/stirred_tank/system/decomposeParDict diff --git a/bird/meshing/stir_tank_case_templates/base/system/fvSchemes b/tutorial_cases/stirred_tank/system/fvSchemes similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/system/fvSchemes rename to tutorial_cases/stirred_tank/system/fvSchemes diff --git a/bird/meshing/stir_tank_case_templates/base/system/fvSolution b/tutorial_cases/stirred_tank/system/fvSolution similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/system/fvSolution rename to tutorial_cases/stirred_tank/system/fvSolution diff --git a/bird/meshing/stir_tank_case_templates/base/system/setFieldsDict b/tutorial_cases/stirred_tank/system/setFieldsDict similarity index 100% rename from bird/meshing/stir_tank_case_templates/base/system/setFieldsDict rename to tutorial_cases/stirred_tank/system/setFieldsDict