From b85457fc3578da55efd96d0962f43605d1514e93 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Wed, 19 Jul 2017 08:24:17 +0100 Subject: [PATCH 1/2] STYLE: Updated directory names for interCondensatingEvaporatingFoam solver. Fixes #533 --- .../Allwclean | 0 .../Allwmake | 0 .../Make/files | 0 .../Make/options | 0 .../UEqn.H | 0 .../createFields.H | 0 .../eEqn.H | 0 .../interCondensatingEvaporatingFoam.C | 0 .../pEqn.H | 0 .../temperaturePhaseChangeTwoPhaseMixtures/Make/files | 0 .../temperaturePhaseChangeTwoPhaseMixtures/Make/options | 0 .../temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C | 0 .../temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H | 0 .../newtemperaturePhaseChangeTwoPhaseMixture.C | 0 .../temperaturePhaseChangeTwoPhaseMixture.C | 0 .../temperaturePhaseChangeTwoPhaseMixture.H | 0 .../thermoIncompressibleTwoPhaseMixture.C | 0 .../thermoIncompressibleTwoPhaseMixture.H | 0 .../twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C | 0 .../twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H | 0 .../condensatingVessel/0/T | 0 .../condensatingVessel/0/U | 0 .../condensatingVessel/0/alpha.liquid | 0 .../condensatingVessel/0/epsilon | 0 .../condensatingVessel/0/k | 0 .../condensatingVessel/0/nut | 0 .../condensatingVessel/0/omega | 0 .../condensatingVessel/0/p | 0 .../condensatingVessel/0/p_rgh | 0 .../condensatingVessel/Allclean | 0 .../condensatingVessel/Allrun | 0 .../condensatingVessel/constant/g | 0 .../condensatingVessel/constant/phaseChangeProperties | 0 .../condensatingVessel/constant/thermophysicalProperties | 0 .../condensatingVessel/constant/transportProperties | 0 .../condensatingVessel/constant/turbulenceProperties | 0 .../condensatingVessel/system/blockMeshDict | 0 .../condensatingVessel/system/controlDict | 0 .../condensatingVessel/system/fvSchemes | 0 .../condensatingVessel/system/fvSolution | 0 40 files changed, 0 insertions(+), 0 deletions(-) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/Allwclean (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/Allwmake (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/Make/files (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/Make/options (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/UEqn.H (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/createFields.H (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/eEqn.H (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/interCondensatingEvaporatingFoam.C (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/pEqn.H (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/Make/files (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/Make/options (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C (100%) rename applications/solvers/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/T (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/U (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/alpha.liquid (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/epsilon (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/k (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/nut (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/omega (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/p (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/0/p_rgh (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/Allclean (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/Allrun (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/constant/g (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/constant/phaseChangeProperties (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/constant/thermophysicalProperties (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/constant/transportProperties (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/constant/turbulenceProperties (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/system/blockMeshDict (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/system/controlDict (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/system/fvSchemes (100%) rename tutorials/multiphase/{interCondensingEvaporatingFoam => interCondensatingEvaporatingFoam}/condensatingVessel/system/fvSolution (100%) diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/Allwclean b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/Allwclean rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwclean diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/Allwmake b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/Allwmake rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/Allwmake diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/Make/files b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/files similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/Make/files rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/files diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/Make/options rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/UEqn.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/UEqn.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/UEqn.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/UEqn.H diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/createFields.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/createFields.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/createFields.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/createFields.H diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/eEqn.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/eEqn.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/eEqn.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/eEqn.H diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/interCondensatingEvaporatingFoam.C rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/pEqn.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/pEqn.H diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/files diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.H diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.C diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixture.H diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.C diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/thermoIncompressibleTwoPhaseMixture/thermoIncompressibleTwoPhaseMixture.H diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H similarity index 100% rename from applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H rename to applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/T b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/T similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/T rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/T diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/U b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/U similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/U rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/U diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/alpha.liquid b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/alpha.liquid similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/alpha.liquid rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/alpha.liquid diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/epsilon b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/epsilon similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/epsilon rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/epsilon diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/k b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/k similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/k rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/k diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/nut b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/nut similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/nut rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/nut diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/omega b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/omega similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/omega rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/omega diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/p similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/p diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/p_rgh similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/0/p_rgh rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/0/p_rgh diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allclean b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allclean similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allclean rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allclean diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/Allrun rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/Allrun diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/g b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/g rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/g diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/phaseChangeProperties diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/thermophysicalProperties diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/transportProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/transportProperties rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/transportProperties diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/constant/turbulenceProperties diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/blockMeshDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/blockMeshDict rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/blockMeshDict diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/controlDict b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/controlDict rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/controlDict diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSchemes rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSchemes diff --git a/tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution b/tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution similarity index 100% rename from tutorials/multiphase/interCondensingEvaporatingFoam/condensatingVessel/system/fvSolution rename to tutorials/multiphase/interCondensatingEvaporatingFoam/condensatingVessel/system/fvSolution From 01292a9a76c5ce3a73e51db890fa39be96675e7a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 20 Jul 2017 12:15:08 +0200 Subject: [PATCH 2/2] BUG: failed check for scotch headers on ubuntu (closes #543) - installed under /usr/include/scotch/scotch.h ENH: obtain fallback value for SCOTCH_VERSION from the header COMP: add support for metis, scotch static libraries (eg, EasyBuild) --- src/parallel/decompose/Allwmake | 88 ++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 22 deletions(-) diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake index b29e68ce29..a90f705601 100755 --- a/src/parallel/decompose/Allwmake +++ b/src/parallel/decompose/Allwmake @@ -7,11 +7,30 @@ cd ${0%/*} || exit 1 # Run from this directory : ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH} # Extra safety export FOAM_EXT_LIBBIN +# Check for the existence of any of the files +# On success, echoes the file found and returns 0, otherwise returns 2 +findFirstFile() +{ + local file + for file + do + if [ -f "$file" -a -r "$file" ] + then + echo "$file" + return 0 + fi + done + + return 2 +} + + # Test for metis. # - return 0 and export METIS_ARCH_PATH on success hasMetis() { local warning="==> skip metis" + local header label settings unset METIS_ARCH_PATH METIS_VERSION settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis) || { @@ -27,28 +46,30 @@ hasMetis() fi # Header - local header=$METIS_ARCH_PATH/include/metis.h - if [ "${METIS_ARCH_PATH##*-}" = system ] - then - [ -f "$header" ] || header=/usr/include/metis.h - fi - [ -f "$header" ] || { + header=$(findFirstFile \ + $METIS_ARCH_PATH/include/metis.h \ + /usr/include/metis.h \ + ) || { echo "$warning (no header)" return 2 # file not found } # Library - [ -r $FOAM_EXT_LIBBIN/libmetis.so ] || \ - [ -r $METIS_ARCH_PATH/lib/libmetis.so ] || \ - [ -r $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so ] || \ - [ "${METIS_ARCH_PATH##*-}" = system ] || { + [ "${METIS_ARCH_PATH##*-}" = system ] || \ + findFirstFile \ + $FOAM_EXT_LIBBIN/libmetis.so \ + $METIS_ARCH_PATH/lib/libmetis.a \ + $METIS_ARCH_PATH/lib/libmetis.so \ + $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.a \ + $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmetis.so \ + > /dev/null || { echo "$warning (missing library)" return 2 } # Ensure consistent sizes between OpenFOAM and metis header # Extract IDXTYPEWIDTH from metis.h: regex as per ThirdParty Allwmake - local label=$(sed -ne 's/^.*#define *IDXTYPEWIDTH *\([1-9][0-9]\).*/\1/p' $header) + label=$(sed -ne 's/^.*#define *IDXTYPEWIDTH *\([1-9][0-9]\).*/\1/p' $header) : ${label:=unknown} if [ "$WM_LABEL_SIZE" = "$label" ] @@ -67,6 +88,7 @@ hasMetis() hasScotch() { local warning="==> skip scotch" + local header label settings unset SCOTCH_ARCH_PATH SCOTCH_VERSION settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch) || { @@ -82,33 +104,54 @@ hasScotch() fi # Header - local header=$SCOTCH_ARCH_PATH/include/scotch.h - if [ "${SCOTCH_ARCH_PATH##*-}" = system ] - then - [ -f "$header" ] || header=/usr/include/scotch.h - fi - [ -f "$header" ] || { + header=$(findFirstFile \ + $SCOTCH_ARCH_PATH/include/scotch.h \ + /usr/include/scotch/scotch.h \ + /usr/include/scotch.h + ) || { echo "$warning (no header)" return 2 # file not found } # Library - [ -r $FOAM_EXT_LIBBIN/libscotch.so ] || \ - [ -r $SCOTCH_ARCH_PATH/lib/libscotch.so ] || \ - [ -r $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so ] || \ - [ "${SCOTCH_ARCH_PATH##*-}" = system ] || { + [ "${SCOTCH_ARCH_PATH##*-}" = system ] || \ + findFirstFile \ + $FOAM_EXT_LIBBIN/libscotch.so \ + $SCOTCH_ARCH_PATH/lib/libscotch.a \ + $SCOTCH_ARCH_PATH/lib/libscotch.so \ + $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.a \ + $SCOTCH_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libscotch.so \ + > /dev/null || { echo "$warning (missing library)" return 2 } # Ensure consistent sizes between OpenFOAM and scotch header # extract 'typedef int64_t SCOTCH_Num' or equivalent - local label=$(sed -ne \ + label=$(sed -ne \ 's/^.*typedef *\([^ ]*\) *SCOTCH_Num.*/\1/ip' \ "$header") : ${label:=unknown} + # No SCOTCH_VERSION set? Try to obtain from header + # extract #define SCOTCH_VERSION, SCOTCH_RELEASE, SCOTCH_PATCHLEVEL + [ -n "$SCOTCH_VERSION" ] || \ + SCOTCH_VERSION=$( + eval $( + sed -ne \ + 's/^ *#define *SCOTCH_\(VERSION\|RELEASE\|PATCHLEVEL\) *\([0-9][0-9]*\).*$/\1=\2/p' \ + "$header" + ) + + set -- $VERSION $RELEASE $PATCHLEVEL + IFS="." + [ "$#" -gt 0 ] && echo "scotch-$*" + ) + + # Failsafe value + : ${SCOTCH_VERSION:=scotch} + case "$WM_LABEL_SIZE:$label" in (32:int32_t | 32:int | 64:int64_t | 64:long) echo "Scotch (label=$label) - $SCOTCH_ARCH_PATH" @@ -168,4 +211,5 @@ fi wmake $targetType decompositionMethods wmake $targetType decompose + #------------------------------------------------------------------------------