From 95f3adb1fb799df96d04c7d5f7b2208cc01c8c52 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Thu, 15 Dec 2016 12:45:14 +0000
Subject: [PATCH] ENH: waveModels - moved to main source tree and simplified
---
integration/OpenCFD/code/waveBCs/Make/files | 4 -
integration/OpenCFD/code/waveBCs/Make/options | 10 --
...sorptionOutletVelocityFvPatchVectorField.C | 150 ----------------
...sorptionOutletVelocityFvPatchVectorField.H | 165 ------------------
src/Allwmake | 1 +
.../waveModel => src/waveModels}/Make/files | 4 +-
.../waveModel => src/waveModels}/Make/options | 0
.../waveAlpha/waveAlphaFvPatchScalarField.C | 24 +--
.../waveAlpha/waveAlphaFvPatchScalarField.H | 40 ++---
.../waveVelocityFvPatchVectorField.C | 24 +--
.../waveVelocityFvPatchVectorField.H | 43 ++---
.../waveAbsorptionModel/waveAbsorptionModel.C | 0
.../waveAbsorptionModel/waveAbsorptionModel.H | 0
.../shallowWaterAbsorption.C | 0
.../shallowWaterAbsorption.H | 0
.../base/regularWaveModel/regularWaveModel.C | 0
.../base/regularWaveModel/regularWaveModel.H | 0
.../solitaryWaveModel/solitaryWaveModel.C | 0
.../solitaryWaveModel/solitaryWaveModel.H | 0
.../waveGenerationModel/waveGenerationModel.C | 0
.../waveGenerationModel/waveGenerationModel.H | 0
.../derived/Boussinesq/BoussinesqWaveModel.C | 0
.../derived/Boussinesq/BoussinesqWaveModel.H | 0
.../derived/StokesI/StokesIWaveModel.C | 0
.../derived/StokesI/StokesIWaveModel.H | 0
.../derived/StokesII/StokesIIWaveModel.C | 0
.../derived/StokesII/StokesIIWaveModel.H | 0
.../derived/StokesV/StokesVWaveModel.C | 8 +-
.../derived/StokesV/StokesVWaveModel.H | 0
.../derived/cnoidal/Elliptic.H | 0
.../derived/cnoidal/cnoidalWaveModel.C | 0
.../derived/cnoidal/cnoidalWaveModel.H | 0
.../waveModels}/waveModel/waveModel.C | 6 +-
.../waveModels}/waveModel/waveModel.H | 1 +
.../waveModels}/waveModel/waveModelNew.C | 0
.../laminar/waveExampleCnoidal}/0.orig/U | 6 +-
.../waveExampleCnoidal}/0.orig/alpha.water | 2 +-
.../laminar}/waveExampleCnoidal/0.orig/p_rgh | 0
.../laminar}/waveExampleCnoidal/Allclean | 0
.../laminar}/waveExampleCnoidal/Allrun | 0
.../laminar}/waveExampleCnoidal/constant/g | 0
.../constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../constant/waveProperties | 0
.../waveExampleCnoidal/system/blockMeshDict | 0
.../waveExampleCnoidal/system/controlDict | 6 -
.../system/decomposeParDict | 0
.../waveExampleCnoidal/system/fvSchemes | 0
.../waveExampleCnoidal/system/fvSolution | 0
.../waveExampleCnoidal/system/setFieldsDict | 0
.../laminar/waveExampleSolitary}/0.orig/U | 4 +-
.../waveExampleSolitary}/0.orig/alpha.water | 2 +-
.../laminar}/waveExampleSolitary/0.orig/p_rgh | 0
.../laminar}/waveExampleSolitary/Allclean | 0
.../laminar}/waveExampleSolitary/Allrun | 0
.../laminar}/waveExampleSolitary/constant/g | 0
.../constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../constant/waveProperties | 0
.../waveExampleSolitary/system/blockMeshDict | 0
.../waveExampleSolitary/system/controlDict | 6 -
.../system/decomposeParDict | 0
.../waveExampleSolitary/system/fvSchemes | 0
.../waveExampleSolitary/system/fvSolution | 0
.../waveExampleSolitary/system/setFieldsDict | 0
.../laminar/waveExampleStokesI}/0.orig/U | 4 +-
.../waveExampleStokesI}/0.orig/alpha.water | 2 +-
.../laminar}/waveExampleStokesI/0.orig/p_rgh | 0
.../laminar}/waveExampleStokesI/Allclean | 0
.../laminar}/waveExampleStokesI/Allrun | 0
.../laminar}/waveExampleStokesI/constant/g | 0
.../constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../constant/waveProperties | 0
.../waveExampleStokesI/system/blockMeshDict | 0
.../waveExampleStokesI/system/controlDict | 6 -
.../system/decomposeParDict | 0
.../waveExampleStokesI/system/fvSchemes | 0
.../waveExampleStokesI/system/fvSolution | 0
.../waveExampleStokesI/system/setFieldsDict | 0
.../laminar}/waveExampleStokesII/0.orig/U | 4 +-
.../waveExampleStokesII/0.orig/alpha.water | 2 +-
.../laminar}/waveExampleStokesII/0.orig/p_rgh | 0
.../laminar}/waveExampleStokesII/Allclean | 0
.../laminar}/waveExampleStokesII/Allrun | 0
.../laminar}/waveExampleStokesII/constant/g | 0
.../constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../constant/waveProperties | 0
.../waveExampleStokesII/system/blockMeshDict | 0
.../waveExampleStokesII/system/controlDict | 6 -
.../system/decomposeParDict | 0
.../waveExampleStokesII/system/fvSchemes | 0
.../waveExampleStokesII/system/fvSolution | 0
.../waveExampleStokesII/system/setFieldsDict | 0
.../laminar}/waveExampleStokesV/0.orig/U | 4 +-
.../waveExampleStokesV/0.orig/alpha.water | 4 +-
.../laminar}/waveExampleStokesV/0.orig/p_rgh | 0
.../laminar}/waveExampleStokesV/Allclean | 0
.../laminar}/waveExampleStokesV/Allrun | 0
.../laminar}/waveExampleStokesV/constant/g | 0
.../constant/transportProperties | 0
.../constant/turbulenceProperties | 0
.../constant/waveProperties | 0
.../waveExampleStokesV/system/blockMeshDict | 0
.../waveExampleStokesV/system/controlDict | 6 -
.../system/decomposeParDict | 0
.../waveExampleStokesV/system/fvSchemes | 0
.../waveExampleStokesV/system/fvSolution | 0
.../waveExampleStokesV/system/setFieldsDict | 0
110 files changed, 97 insertions(+), 447 deletions(-)
delete mode 100644 integration/OpenCFD/code/waveBCs/Make/files
delete mode 100644 integration/OpenCFD/code/waveBCs/Make/options
delete mode 100644 integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
delete mode 100644 integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
rename {integration/OpenCFD/code/waveModel => src/waveModels}/Make/files (80%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/Make/options (100%)
rename integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C => src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C (81%)
rename integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H => src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H (80%)
rename integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C => src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C (79%)
rename integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H => src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H (78%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/regularWaveModel/regularWaveModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/regularWaveModel/regularWaveModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesI/StokesIWaveModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesI/StokesIWaveModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesV/StokesVWaveModel.C (99%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/StokesV/StokesVWaveModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/cnoidal/Elliptic.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H (100%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveModel/waveModel.C (98%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveModel/waveModel.H (99%)
rename {integration/OpenCFD/code/waveModel => src/waveModels}/waveModel/waveModelNew.C (100%)
rename {integration/OpenCFD/testCases/waveExampleSolitary => tutorials/multiphase/interFoam/laminar/waveExampleCnoidal}/0.orig/U (92%)
rename {integration/OpenCFD/testCases/waveExampleSolitary => tutorials/multiphase/interFoam/laminar/waveExampleCnoidal}/0.orig/alpha.water (96%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/0.orig/p_rgh (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/Allclean (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/Allrun (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/g (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/transportProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/turbulenceProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/constant/waveProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/blockMeshDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/controlDict (98%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/decomposeParDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/fvSchemes (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/fvSolution (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleCnoidal/system/setFieldsDict (100%)
rename {integration/OpenCFD/testCases/waveExampleStokesI => tutorials/multiphase/interFoam/laminar/waveExampleSolitary}/0.orig/U (93%)
rename {integration/OpenCFD/testCases/waveExampleStokesI => tutorials/multiphase/interFoam/laminar/waveExampleSolitary}/0.orig/alpha.water (96%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/0.orig/p_rgh (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/Allclean (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/Allrun (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/g (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/transportProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/turbulenceProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/constant/waveProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/blockMeshDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/controlDict (98%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/decomposeParDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/fvSchemes (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/fvSolution (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleSolitary/system/setFieldsDict (100%)
rename {integration/OpenCFD/testCases/waveExampleCnoidal => tutorials/multiphase/interFoam/laminar/waveExampleStokesI}/0.orig/U (93%)
rename {integration/OpenCFD/testCases/waveExampleCnoidal => tutorials/multiphase/interFoam/laminar/waveExampleStokesI}/0.orig/alpha.water (96%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/0.orig/p_rgh (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/Allclean (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/Allrun (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/g (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/transportProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/turbulenceProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/constant/waveProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/blockMeshDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/controlDict (98%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/decomposeParDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/fvSchemes (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/fvSolution (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesI/system/setFieldsDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/0.orig/U (93%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/0.orig/alpha.water (96%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/0.orig/p_rgh (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/Allclean (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/Allrun (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/g (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/transportProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/turbulenceProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/constant/waveProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/blockMeshDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/controlDict (98%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/decomposeParDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/fvSchemes (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/fvSolution (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesII/system/setFieldsDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/0.orig/U (93%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/0.orig/alpha.water (94%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/0.orig/p_rgh (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/Allclean (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/Allrun (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/g (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/transportProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/turbulenceProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/constant/waveProperties (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/blockMeshDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/controlDict (98%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/decomposeParDict (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/fvSchemes (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/fvSolution (100%)
rename {integration/OpenCFD/testCases => tutorials/multiphase/interFoam/laminar}/waveExampleStokesV/system/setFieldsDict (100%)
diff --git a/integration/OpenCFD/code/waveBCs/Make/files b/integration/OpenCFD/code/waveBCs/Make/files
deleted file mode 100644
index 734e8d76a91..00000000000
--- a/integration/OpenCFD/code/waveBCs/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-waveInletVelocity/waveInletVelocityFvPatchVectorField.C
-waveInletAlpha/waveInletAlphaFvPatchScalarField.C
-
-LIB = $(FOAM_USER_LIBBIN)/libwaveBCs
diff --git a/integration/OpenCFD/code/waveBCs/Make/options b/integration/OpenCFD/code/waveBCs/Make/options
deleted file mode 100644
index dac0999deba..00000000000
--- a/integration/OpenCFD/code/waveBCs/Make/options
+++ /dev/null
@@ -1,10 +0,0 @@
-DEV_PATH = ..
-
-EXE_INC = \
- -I$(DEV_PATH)/waveModel/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
- -L$(FOAM_USER_LIBBIN) \
- -lwaveModels \
- -lfiniteVolume
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
deleted file mode 100644
index e4a462c001c..00000000000
--- a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.C
+++ /dev/null
@@ -1,150 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
- \\/ M anipulation | Copyright (C) 2015 IH-Cantabria
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "waveAbsorptionOutletVelocityFvPatchVectorField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "waveModel.H"
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
- const fvPatch& p,
- const DimensionedField<vector, volMesh>& iF
-)
-:
- fixedValueFvPatchField<vector>(p, iF),
- waveDictName_(waveModel::dictName)
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
- const waveAbsorptionOutletVelocityFvPatchVectorField& ptf,
- const fvPatch& p,
- const DimensionedField<vector, volMesh>& iF,
- const fvPatchFieldMapper& mapper
-)
-:
- fixedValueFvPatchField<vector>(ptf, p, iF, mapper),
- waveDictName_(ptf.waveDictName_)
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
- const fvPatch& p,
- const DimensionedField<vector, volMesh>& iF,
- const dictionary& dict
-)
-:
- fixedValueFvPatchField<vector>(p, iF, dict),
- waveDictName_(dict.lookupOrDefault<word>("waveDict", waveModel::dictName))
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
- const waveAbsorptionOutletVelocityFvPatchVectorField& ptf
-)
-:
- fixedValueFvPatchField<vector>(ptf),
- waveDictName_(ptf.waveDictName_)
-{}
-
-
-Foam::waveAbsorptionOutletVelocityFvPatchVectorField::
-waveAbsorptionOutletVelocityFvPatchVectorField
-(
- const waveAbsorptionOutletVelocityFvPatchVectorField& ptf,
- const DimensionedField<vector, volMesh>& iF
-)
-:
- fixedValueFvPatchField<vector>(ptf, iF),
- waveDictName_(ptf.waveDictName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-void Foam::waveAbsorptionOutletVelocityFvPatchVectorField::updateCoeffs()
-{
- if (updated())
- {
- return;
- }
-
- tmp<waveModel> tmodel
- (
- waveModel::lookupOrCreate
- (
- patch().patch(),
- internalField().mesh(),
- waveDictName_
- )
- );
-
- waveModel& model = const_cast<waveModel&>(tmodel());
-
- model.correct(db().time().value());
-
- operator == (model.U());
-
- fixedValueFvPatchField<vector>::updateCoeffs();
-}
-
-
-void Foam::waveAbsorptionOutletVelocityFvPatchVectorField::write
-(
- Ostream& os
-) const
-{
- fvPatchField<vector>::write(os);
-
- os.writeKeyword("waveDictName") << waveDictName_
- << token::END_STATEMENT << nl;
-
- writeEntry("value", os);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- makePatchTypeField
- (
- fvPatchVectorField,
- waveAbsorptionOutletVelocityFvPatchVectorField
- );
-}
-
-
-// ************************************************************************* //
diff --git a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H b/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
deleted file mode 100644
index d797e8017c0..00000000000
--- a/integration/OpenCFD/code/waveBCs/waveAbsorptionOutletVelocity/waveAbsorptionOutletVelocityFvPatchVectorField.H
+++ /dev/null
@@ -1,165 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
-
-Class
- Foam::waveAbsorptionOutletVelocityFvPatchVectorField
-
-Description
- Example of the boundary condition specification:
- \verbatim
- inlet
- {
- type waveAbsorptionOutletVelocity;
- waveDict wavesDict;
- value uniform (0 0 0);
- }
- \endverbatim
-
-Usage
- \table
- Property | Description | Required | Default value
- type | type: waveAbsorptionOutletVelocity | yes |
- waveDict | Dictionary specifying wave variables | no | waveProperties
- \endtable
-
-Note
- - The value is positive inwards
- - May not work correctly for transonic inlets
- - Strange behaviour with potentialFoam since the U equation is not solved
-
-SourceFiles
- waveAbsorptionOutletVelocityFvPatchVectorField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef waveAbsorptionOutletVelocityFvPatchVectorField_H
-#define waveAbsorptionOutletVelocityFvPatchVectorField_H
-
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-/*---------------------------------------------------------------------------*\
- Class waveAbsorptionOutletVelocityFvPatchVectorField Declaration
-\*---------------------------------------------------------------------------*/
-
-class waveAbsorptionOutletVelocityFvPatchVectorField
-:
- public fixedValueFvPatchVectorField
-{
- // Private data
-
- //- Dictionary name
- word waveDictName_;
-
-
-public:
-
- //- Runtime type information
- TypeName("waveAbsorptionOutletVelocity");
-
-
- // Constructors
-
- //- Construct from patch and internal field
- waveAbsorptionOutletVelocityFvPatchVectorField
- (
- const fvPatch&,
- const DimensionedField<vector, volMesh>&
- );
-
- //- Construct from patch, internal field and dictionary
- waveAbsorptionOutletVelocityFvPatchVectorField
- (
- const fvPatch&,
- const DimensionedField<vector, volMesh>&,
- const dictionary&
- );
-
- //- Construct by mapping given
- // waveAbsorptionOutletVelocityFvPatchVectorField
- // onto a new patch
- waveAbsorptionOutletVelocityFvPatchVectorField
- (
- const waveAbsorptionOutletVelocityFvPatchVectorField&,
- const fvPatch&,
- const DimensionedField<vector, volMesh>&,
- const fvPatchFieldMapper&
- );
-
- //- Construct as copy
- waveAbsorptionOutletVelocityFvPatchVectorField
- (
- const waveAbsorptionOutletVelocityFvPatchVectorField&
- );
-
- //- Construct and return a clone
- virtual tmp<fvPatchVectorField> clone() const
- {
- return tmp<fvPatchVectorField>
- (
- new waveAbsorptionOutletVelocityFvPatchVectorField(*this)
- );
- }
-
- //- Construct as copy setting internal field reference
- waveAbsorptionOutletVelocityFvPatchVectorField
- (
- const waveAbsorptionOutletVelocityFvPatchVectorField&,
- const DimensionedField<vector, volMesh>&
- );
-
- //- Construct and return a clone setting internal field reference
- virtual tmp<fvPatchVectorField> clone
- (
- const DimensionedField<vector, volMesh>& iF
- ) const
- {
- return tmp<fvPatchVectorField>
- (
- new waveAbsorptionOutletVelocityFvPatchVectorField(*this, iF)
- );
- }
-
-
- // Member functions
-
- //- Update the coefficients associated with the patch field
- virtual void updateCoeffs();
-
- //- Write
- virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/Allwmake b/src/Allwmake
index 511c735a7e5..bb74a0e6db1 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -72,6 +72,7 @@ lagrangian/Allwmake $targetType $*
mesh/Allwmake $targetType $*
renumber/Allwmake $targetType $*
fvAgglomerationMethods/Allwmake $targetType $*
+wmake $targetType waveModels
wmake $targetType engine
wmake $targetType fvOptions
diff --git a/integration/OpenCFD/code/waveModel/Make/files b/src/waveModels/Make/files
similarity index 80%
rename from integration/OpenCFD/code/waveModel/Make/files
rename to src/waveModels/Make/files
index 36161a0045c..67333fa8212 100644
--- a/integration/OpenCFD/code/waveModel/Make/files
+++ b/src/waveModels/Make/files
@@ -14,5 +14,7 @@ waveGenerationModels/derived/StokesV/StokesVWaveModel.C
waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
+derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
+derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
-LIB = $(FOAM_USER_LIBBIN)/libwaveModels
+LIB = $(FOAM_LIBBIN)/libwaveModels
diff --git a/integration/OpenCFD/code/waveModel/Make/options b/src/waveModels/Make/options
similarity index 100%
rename from integration/OpenCFD/code/waveModel/Make/options
rename to src/waveModels/Make/options
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
similarity index 81%
rename from integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
rename to src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
index 3dd4e5bcd83..6117513bc99 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.C
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
@@ -23,14 +23,14 @@ License
\*---------------------------------------------------------------------------*/
-#include "waveInletAlphaFvPatchScalarField.H"
+#include "waveAlphaFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "waveModel.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF
@@ -41,9 +41,9 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
{}
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
(
- const waveInletAlphaFvPatchScalarField& ptf,
+ const waveAlphaFvPatchScalarField& ptf,
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -54,7 +54,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
{}
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF,
@@ -66,9 +66,9 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
{}
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
(
- const waveInletAlphaFvPatchScalarField& ptf
+ const waveAlphaFvPatchScalarField& ptf
)
:
fixedValueFvPatchField<scalar>(ptf),
@@ -76,9 +76,9 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
{}
-Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
+Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
(
- const waveInletAlphaFvPatchScalarField& ptf,
+ const waveAlphaFvPatchScalarField& ptf,
const DimensionedField<scalar, volMesh>& iF
)
:
@@ -89,7 +89,7 @@ Foam::waveInletAlphaFvPatchScalarField::waveInletAlphaFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::waveInletAlphaFvPatchScalarField::updateCoeffs()
+void Foam::waveAlphaFvPatchScalarField::updateCoeffs()
{
if (updated())
{
@@ -116,7 +116,7 @@ void Foam::waveInletAlphaFvPatchScalarField::updateCoeffs()
}
-void Foam::waveInletAlphaFvPatchScalarField::write(Ostream& os) const
+void Foam::waveAlphaFvPatchScalarField::write(Ostream& os) const
{
fvPatchField<scalar>::write(os);
@@ -134,7 +134,7 @@ namespace Foam
makePatchTypeField
(
fvPatchScalarField,
- waveInletAlphaFvPatchScalarField
+ waveAlphaFvPatchScalarField
);
}
diff --git a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H
similarity index 80%
rename from integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
rename to src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H
index eb84795be1f..4286d15a7ab 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletAlpha/waveInletAlphaFvPatchScalarField.H
+++ b/src/waveModels/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::waveInletAlphaFvPatchScalarField
+ Foam::waveAlphaFvPatchScalarField
Description
@@ -30,7 +30,7 @@ Description
\verbatim
inlet
{
- type waveInletAlpha;
+ type waveAlpha;
value uniform (0 0 0);
}
\endverbatim
@@ -38,7 +38,7 @@ Description
Usage
\table
Property | Description | Required | Default value
- type | type: waveInletAlpha | yes |
+ type | type: waveAlpha | yes |
waveDict | Dictionary specifying wave variables | no | waveProperties
\endtable
@@ -48,12 +48,12 @@ Note
- Strange behaviour with potentialFoam since the U equation is not solved
SourceFiles
- waveInletAlphaFvPatchScalarField.C
+ waveAlphaFvPatchScalarField.C
\*---------------------------------------------------------------------------*/
-#ifndef waveInletAlphaFvPatchScalarField_H
-#define waveInletAlphaFvPatchScalarField_H
+#ifndef waveAlphaFvPatchScalarField_H
+#define waveAlphaFvPatchScalarField_H
#include "fixedValueFvPatchFields.H"
@@ -62,10 +62,10 @@ SourceFiles
namespace Foam
{
/*---------------------------------------------------------------------------*\
- class waveInletAlphaFvPatchScalarField Declaration
+ class waveAlphaFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/
-class waveInletAlphaFvPatchScalarField
+class waveAlphaFvPatchScalarField
:
public fixedValueFvPatchScalarField
{
@@ -78,20 +78,20 @@ class waveInletAlphaFvPatchScalarField
public:
//- Runtime type information
- TypeName("waveInletAlpha");
+ TypeName("waveAlpha");
// Constructors
//- Construct from patch and internal field
- waveInletAlphaFvPatchScalarField
+ waveAlphaFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
- waveInletAlphaFvPatchScalarField
+ waveAlphaFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
@@ -99,20 +99,20 @@ public:
);
//- Construct by mapping given
- // waveInletAlphaFvPatchScalarField
+ // waveAlphaFvPatchScalarField
// onto a new patch
- waveInletAlphaFvPatchScalarField
+ waveAlphaFvPatchScalarField
(
- const waveInletAlphaFvPatchScalarField&,
+ const waveAlphaFvPatchScalarField&,
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
- waveInletAlphaFvPatchScalarField
+ waveAlphaFvPatchScalarField
(
- const waveInletAlphaFvPatchScalarField&
+ const waveAlphaFvPatchScalarField&
);
//- Construct and return a clone
@@ -120,14 +120,14 @@ public:
{
return tmp<fvPatchScalarField>
(
- new waveInletAlphaFvPatchScalarField(*this)
+ new waveAlphaFvPatchScalarField(*this)
);
}
//- Construct as copy setting internal field reference
- waveInletAlphaFvPatchScalarField
+ waveAlphaFvPatchScalarField
(
- const waveInletAlphaFvPatchScalarField&,
+ const waveAlphaFvPatchScalarField&,
const DimensionedField<scalar, volMesh>&
);
@@ -139,7 +139,7 @@ public:
{
return tmp<fvPatchScalarField>
(
- new waveInletAlphaFvPatchScalarField(*this, iF)
+ new waveAlphaFvPatchScalarField(*this, iF)
);
}
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
similarity index 79%
rename from integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
rename to src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
index 5c36dc49d99..a237aabbc17 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.C
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.C
@@ -23,14 +23,14 @@ License
\*---------------------------------------------------------------------------*/
-#include "waveInletVelocityFvPatchVectorField.H"
+#include "waveVelocityFvPatchVectorField.H"
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "waveModel.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF
@@ -41,9 +41,9 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
{}
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
(
- const waveInletVelocityFvPatchVectorField& ptf,
+ const waveVelocityFvPatchVectorField& ptf,
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
const fvPatchFieldMapper& mapper
@@ -54,7 +54,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
{}
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
(
const fvPatch& p,
const DimensionedField<vector, volMesh>& iF,
@@ -66,9 +66,9 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
{}
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
(
- const waveInletVelocityFvPatchVectorField& ptf
+ const waveVelocityFvPatchVectorField& ptf
)
:
fixedValueFvPatchField<vector>(ptf),
@@ -76,9 +76,9 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
{}
-Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
+Foam::waveVelocityFvPatchVectorField::waveVelocityFvPatchVectorField
(
- const waveInletVelocityFvPatchVectorField& ptf,
+ const waveVelocityFvPatchVectorField& ptf,
const DimensionedField<vector, volMesh>& iF
)
:
@@ -89,7 +89,7 @@ Foam::waveInletVelocityFvPatchVectorField::waveInletVelocityFvPatchVectorField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::waveInletVelocityFvPatchVectorField::updateCoeffs()
+void Foam::waveVelocityFvPatchVectorField::updateCoeffs()
{
if (updated())
{
@@ -116,7 +116,7 @@ void Foam::waveInletVelocityFvPatchVectorField::updateCoeffs()
}
-void Foam::waveInletVelocityFvPatchVectorField::write(Ostream& os) const
+void Foam::waveVelocityFvPatchVectorField::write(Ostream& os) const
{
fvPatchField<vector>::write(os);
@@ -134,7 +134,7 @@ namespace Foam
makePatchTypeField
(
fvPatchVectorField,
- waveInletVelocityFvPatchVectorField
+ waveVelocityFvPatchVectorField
);
}
diff --git a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H
similarity index 78%
rename from integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
rename to src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H
index 1356702d9d6..5098102dd1a 100644
--- a/integration/OpenCFD/code/waveBCs/waveInletVelocity/waveInletVelocityFvPatchVectorField.H
+++ b/src/waveModels/derivedFvPatchFields/waveVelocity/waveVelocityFvPatchVectorField.H
@@ -22,22 +22,22 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::waveInletVelocityFvPatchVectorField
+ Foam::waveVelocityFvPatchVectorField
Description
Example of the boundary condition specification:
\verbatim
inlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
\endverbatim
Usage
\table
- Property | Description | Required | Default value
- type | type: waveInletVelocity | yes |
+ Property | Description | Required | Default value
+ type | type: waveVelocity | yes |
waveDict | Dictionary specifying wave variables | no | waveProperties
\endtable
@@ -47,12 +47,12 @@ Note
- Strange behaviour with potentialFoam since the U equation is not solved
SourceFiles
- waveInletVelocityFvPatchVectorField.C
+ waveVelocityFvPatchVectorField.C
\*---------------------------------------------------------------------------*/
-#ifndef waveInletVelocityFvPatchVectorField_H
-#define waveInletVelocityFvPatchVectorField_H
+#ifndef waveVelocityFvPatchVectorField_H
+#define waveVelocityFvPatchVectorField_H
#include "fixedValueFvPatchFields.H"
@@ -60,11 +60,12 @@ SourceFiles
namespace Foam
{
+
/*---------------------------------------------------------------------------*\
- Class waveInletVelocityFvPatchVectorField Declaration
+ Class waveVelocityFvPatchVectorField Declaration
\*---------------------------------------------------------------------------*/
-class waveInletVelocityFvPatchVectorField
+class waveVelocityFvPatchVectorField
:
public fixedValueFvPatchVectorField
{
@@ -77,20 +78,20 @@ class waveInletVelocityFvPatchVectorField
public:
//- Runtime type information
- TypeName("waveInletVelocity");
+ TypeName("waveVelocity");
// Constructors
//- Construct from patch and internal field
- waveInletVelocityFvPatchVectorField
+ waveVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&
);
//- Construct from patch, internal field and dictionary
- waveInletVelocityFvPatchVectorField
+ waveVelocityFvPatchVectorField
(
const fvPatch&,
const DimensionedField<vector, volMesh>&,
@@ -98,20 +99,20 @@ public:
);
//- Construct by mapping given
- // waveInletVelocityFvPatchVectorField
+ // waveVelocityFvPatchVectorField
// onto a new patch
- waveInletVelocityFvPatchVectorField
+ waveVelocityFvPatchVectorField
(
- const waveInletVelocityFvPatchVectorField&,
+ const waveVelocityFvPatchVectorField&,
const fvPatch&,
const DimensionedField<vector, volMesh>&,
const fvPatchFieldMapper&
);
//- Construct as copy
- waveInletVelocityFvPatchVectorField
+ waveVelocityFvPatchVectorField
(
- const waveInletVelocityFvPatchVectorField&
+ const waveVelocityFvPatchVectorField&
);
//- Construct and return a clone
@@ -119,14 +120,14 @@ public:
{
return tmp<fvPatchVectorField>
(
- new waveInletVelocityFvPatchVectorField(*this)
+ new waveVelocityFvPatchVectorField(*this)
);
}
//- Construct as copy setting internal field reference
- waveInletVelocityFvPatchVectorField
+ waveVelocityFvPatchVectorField
(
- const waveInletVelocityFvPatchVectorField&,
+ const waveVelocityFvPatchVectorField&,
const DimensionedField<vector, volMesh>&
);
@@ -138,7 +139,7 @@ public:
{
return tmp<fvPatchVectorField>
(
- new waveInletVelocityFvPatchVectorField(*this, iF)
+ new waveVelocityFvPatchVectorField(*this, iF)
);
}
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
rename to src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
rename to src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
rename to src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C
diff --git a/integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
rename to src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
rename to src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
rename to src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
rename to src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
rename to src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
rename to src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
rename to src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
similarity index 99%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
index e7273e91c32..643acedeb24 100644
--- a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
+++ b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
@@ -388,7 +388,7 @@ Foam::scalar Foam::waveModels::StokesV::B55k
- 8*7280*pow(c, 7)*ck
+ 6*7160*pow(c, 5)*ck
- 4*1800*pow(c, 3)*ck
- - 2*1050*pow(c,1)*ck
+ - 2*1050*pow(c, 1)*ck
)
/(12288*pow(s, 10)*(6*sqr(c) - 1)*(8*pow(c, 4) - 11*sqr(c) + 3))
- (
@@ -552,7 +552,7 @@ Foam::scalar Foam::waveModels::StokesV::C4
const scalar c = cosh(k*h);
return
- (12*pow(c, 8) + 36*pow(c, 6) - 162*pow(c, 4) + 141*sqr(c) -27)
+ (12*pow(c, 8) + 36*pow(c, 6) - 162*pow(c, 4) + 141*sqr(c) - 27)
/(192*c*pow(s, 9));
}
@@ -577,8 +577,8 @@ void Foam::waveModels::StokesV::initialise
label n = 0;
- const scalar tolerance = 1e-12;
- const label iterMax = 10000;
+ static const scalar tolerance = 1e-12;
+ static const label iterMax = 10000;
while ((mag(f1) > tolerance || mag(f2) > tolerance) && (n < iterMax))
{
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H b/src/waveModels/waveGenerationModels/derived/cnoidal/Elliptic.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/Elliptic.H
rename to src/waveModels/waveGenerationModels/derived/cnoidal/Elliptic.H
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
rename to src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
diff --git a/integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
rename to src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C b/src/waveModels/waveModel/waveModel.C
similarity index 98%
rename from integration/OpenCFD/code/waveModel/waveModel/waveModel.C
rename to src/waveModels/waveModel/waveModel.C
index 3fee2d90a6b..01f5749b9b5 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.C
+++ b/src/waveModels/waveModel/waveModel.C
@@ -147,7 +147,8 @@ Foam::tmp<Foam::scalarField> Foam::waveModel::waterLevel() const
reduce(paddleMagSf[paddlei], sumOp<scalar>());
reduce(paddleWettedMagSf[paddlei], sumOp<scalar>());
level[paddlei] +=
- paddleWettedMagSf[paddlei]/paddleMagSf[paddlei]*zSpan_;
+ paddleWettedMagSf[paddlei]
+ /(paddleMagSf[paddlei]*zSpan_ + ROOTVSMALL);
}
return tlevel;
@@ -333,6 +334,9 @@ bool Foam::waveModel::read(const dictionary& overrideDict)
}
}
+ // Avoid potential zero...
+ waterDepthRef_ += SMALL;
+
// Insert the reference water depth into [this] to enable restart
add("waterDepthRef", waterDepthRef_);
}
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H b/src/waveModels/waveModel/waveModel.H
similarity index 99%
rename from integration/OpenCFD/code/waveModel/waveModel/waveModel.H
rename to src/waveModels/waveModel/waveModel.H
index 399cf406767..7a0efd45705 100644
--- a/integration/OpenCFD/code/waveModel/waveModel/waveModel.H
+++ b/src/waveModels/waveModel/waveModel.H
@@ -25,6 +25,7 @@ Class
Foam::waveModel
Description
+ Base class for waveModels
\*---------------------------------------------------------------------------*/
diff --git a/integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C
similarity index 100%
rename from integration/OpenCFD/code/waveModel/waveModel/waveModelNew.C
rename to src/waveModels/waveModel/waveModelNew.C
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U
similarity index 92%
rename from integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U
index b215c9cd484..097dae5bea7 100644
--- a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/U
@@ -23,19 +23,19 @@ boundaryField
{
inlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
outlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
sides
{
- type empty;
+ type empty;
}
ground
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water
index a99cef99e90..424d4759025 100644
--- a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
{
inlet
{
- type waveInletAlpha;
+ type waveAlpha;
value uniform 0;
}
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict
index f65efdb4568..92a1a646e9e 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs
-(
- "libwaveBCs.so"
- "libwaveModels.so"
-);
-
application interFoam;
startFrom latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleCnoidal/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U
index b215c9cd484..95453554e55 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
{
inlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
outlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water
index a99cef99e90..424d4759025 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
{
inlet
{
- type waveInletAlpha;
+ type waveAlpha;
value uniform 0;
}
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict
index 7894dff7567..87022a24ceb 100644
--- a/integration/OpenCFD/testCases/waveExampleSolitary/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs
-(
- "libwaveBCs.so"
- "libwaveModels.so"
-);
-
application interFoam;
startFrom latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleSolitary/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleSolitary/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U
index b215c9cd484..95453554e55 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
{
inlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
outlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water
index a99cef99e90..424d4759025 100644
--- a/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
{
inlet
{
- type waveInletAlpha;
+ type waveAlpha;
value uniform 0;
}
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict
index c0d020cf652..91f0a8a1440 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesI/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs
-(
- "libwaveBCs.so"
- "libwaveModels.so"
-);
-
application interFoam;
startFrom latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesI/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesI/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U
index b215c9cd484..95453554e55 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
{
inlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
outlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water
similarity index 96%
rename from integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water
index a99cef99e90..424d4759025 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
{
inlet
{
- type waveInletAlpha;
+ type waveAlpha;
value uniform 0;
}
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict
index f779aa6fe6e..8c005190cc1 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesII/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs
-(
- "libwaveBCs.so"
- "libwaveModels.so"
-);
-
application interFoam;
startFrom latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesII/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesII/system/setFieldsDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U
similarity index 93%
rename from integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U
index 523da1ac2dd..02f000b04a9 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/U
@@ -23,13 +23,13 @@ boundaryField
{
inlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
outlet
{
- type waveInletVelocity;
+ type waveVelocity;
value uniform (0 0 0);
}
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water
similarity index 94%
rename from integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water
index b309a9dfb8d..9069a26b66b 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/alpha.water
@@ -22,7 +22,7 @@ boundaryField
{
inlet
{
- type waveInletAlpha;
+ type waveAlpha;
value uniform 0;
}
@@ -38,7 +38,7 @@ boundaryField
sides
{
- type empty;
+ type empty;
}
top
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/0.orig/p_rgh
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allclean b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allclean
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/Allclean
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allclean
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allrun b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allrun
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/Allrun
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/Allrun
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/g b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/g
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/g
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/g
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/transportProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/transportProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/turbulenceProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/turbulenceProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/constant/waveProperties
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/blockMeshDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/blockMeshDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict
similarity index 98%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict
index c45cdd924de..76911c1e87a 100644
--- a/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
+++ b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/controlDict
@@ -15,12 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-libs
-(
- "libwaveBCs.so"
- "libwaveModels.so"
-);
-
application interFoam;
startFrom latestTime;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/decomposeParDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/decomposeParDict
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSchemes
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/fvSolution
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict b/tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/setFieldsDict
similarity index 100%
rename from integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
rename to tutorials/multiphase/interFoam/laminar/waveExampleStokesV/system/setFieldsDict
--
GitLab