From c21c5e070a87d5a06b33e93bb5183a93515a16f6 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 15 Jun 2020 14:11:10 +0200
Subject: [PATCH] COMP: relocate compressibleInterIsoFoam (#1726)
- place under compressibleInterFoam to ensure that the library
dependency on VoFphaseCompressibleTurbulenceModels is satisfied
---
.../solvers/multiphase/compressibleInterFoam/Allwclean | 1 +
.../solvers/multiphase/compressibleInterFoam/Allwmake | 1 +
.../compressibleInterIsoFoam/Make/files | 0
.../compressibleInterIsoFoam/Make/options | 10 +++++-----
.../compressibleInterIsoFoam/alphaControls.H | 0
.../compressibleInterIsoFoam/alphaEqn.H | 0
.../compressibleInterIsoFoam/alphaSuSp.H | 0
.../compressibleAlphaEqnSubCycle.H | 0
.../compressibleInterIsoFoam.C | 0
.../compressibleInterIsoFoam/correctPhi.H | 0
.../compressibleInterIsoFoam/createFields.H | 0
.../compressibleInterIsoFoam/pEqn.H | 0
12 files changed, 7 insertions(+), 5 deletions(-)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/Make/files (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/Make/options (83%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/alphaControls.H (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/alphaEqn.H (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/alphaSuSp.H (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/compressibleInterIsoFoam.C (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/correctPhi.H (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/createFields.H (100%)
rename applications/solvers/multiphase/{ => compressibleInterFoam}/compressibleInterIsoFoam/pEqn.H (100%)
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
index fff0fcd93a2..5a4d26d0d22 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean
@@ -8,5 +8,6 @@ wclean libso VoFphaseCompressibleTurbulenceModels
wclean
wclean compressibleInterDyMFoam
wclean compressibleInterFilmFoam
+wclean compressibleInterIsoFoam
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
index c606cfcb552..f226247da2e 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
@@ -11,5 +11,6 @@ wmake $targetType VoFphaseCompressibleTurbulenceModels
wmake $targetType
wmake $targetType compressibleInterDyMFoam
wmake $targetType compressibleInterFilmFoam
+wmake $targetType compressibleInterIsoFoam
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/Make/files b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/files
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/Make/files
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/files
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
similarity index 83%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/Make/options
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
index 9a2c766179f..bb9d9dc559a 100644
--- a/applications/solvers/multiphase/compressibleInterIsoFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
- -I. \
- -I../VoF \
- -I../compressibleInterFoam \
- -I$(FOAM_SOLVERS)/multiphase/compressibleInterFoam/twoPhaseMixtureThermo \
- -I$(FOAM_SOLVERS)/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels \
+ -I.. \
+ -I../../VoF \
+ -I../twoPhaseMixtureThermo \
+ -I../VoFphaseCompressibleTurbulenceModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/fvOptions/lnInclude \
-I$(LIB_SRC)/surfMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/alphaControls.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaControls.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/alphaControls.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaControls.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/alphaEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaEqn.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/alphaEqn.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaEqn.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/alphaSuSp.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaSuSp.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/alphaSuSp.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/alphaSuSp.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleAlphaEqnSubCycle.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/compressibleInterIsoFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleInterIsoFoam.C
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/compressibleInterIsoFoam.C
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/compressibleInterIsoFoam.C
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/correctPhi.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/correctPhi.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/correctPhi.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/createFields.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/createFields.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/createFields.H
diff --git a/applications/solvers/multiphase/compressibleInterIsoFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/pEqn.H
similarity index 100%
rename from applications/solvers/multiphase/compressibleInterIsoFoam/pEqn.H
rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/pEqn.H
--
GitLab