From 3521ab03a2a9ebb579f79c540f8ae6ff0555c024 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 21 Oct 2022 19:45:26 +0100 Subject: [PATCH] ThermophysicalTransportModels: Reorganisation to support a new abstract base-class fluidThermophysicalTransportModel The previous fluidThermophysicalTransportModel typedef has been renamed fluidThermoThermophysicalTransportModel as it is instantiated on fluidThermo, freeing the name fluidThermophysicalTransportModel for the new base-class. --- .../solvers/combustion/XiFoam/Make/options | 6 ++++-- .../combustion/XiFoam/PDRFoam/Make/options | 4 +++- .../combustion/XiFoam/PDRFoam/PDRFoam.C | 2 +- .../XiFoam/PDRFoam/PDRFoamAutoRefine.C | 2 +- .../solvers/combustion/XiFoam/XiFoam.C | 2 +- .../solvers/combustion/XiFoam/createFields.H | 4 ++-- .../compressible/rhoCentralFoam/Make/options | 4 +++- .../rhoCentralFoam/createFields.H | 4 ++-- .../rhoCentralFoam/rhoCentralFoam.C | 2 +- .../rhoPorousSimpleFoam/Make/options | 4 +++- .../rhoPorousSimpleFoam/createFields.H | 4 ++-- .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 2 +- .../heatTransfer/thermoFoam/Make/options | 4 +++- .../heatTransfer/thermoFoam/createFields.H | 4 ++-- .../heatTransfer/thermoFoam/thermoFoam.C | 2 +- .../solvers/modules/fluid/fluid/Make/options | 4 +++- .../solvers/modules/fluid/fluid/fluid.C | 2 +- .../solvers/modules/fluid/fluid/fluid.H | 5 +++-- .../fluid/multicomponentFluid/Make/options | 3 ++- .../solvers/modules/solid/solid/Make/options | 2 +- .../phaseSystems/Make/options | 3 ++- .../solidDisplacementFoam/Make/options | 2 +- .../Make/options | 2 +- src/OpenFOAM/include/listOptions.H | 2 +- src/OpenFOAM/include/listOutput.H | 12 ++++++----- src/ThermophysicalTransportModels/Allwmake | 7 +++++-- .../Make/options | 8 +++++--- .../{ => fluid}/Make/files | 6 ++---- .../fluid/Make/options | 19 ++++++++++++++++++ .../PhaseThermophysicalTransportModel.C | 2 +- .../PhaseThermophysicalTransportModel.H | 2 +- .../ThermophysicalTransportModel.C | 2 +- .../ThermophysicalTransportModel.H | 0 ...ayatillekeWallFunctionFvPatchScalarField.C | 0 ...ayatillekeWallFunctionFvPatchScalarField.H | 2 +- .../alphatWallFunctionFvPatchScalarField.C | 2 +- .../alphatWallFunctionFvPatchScalarField.H | 2 +- ...convectiveHeatTransferFvPatchScalarField.C | 2 +- ...convectiveHeatTransferFvPatchScalarField.H | 2 +- ...oupledTemperatureMixedFvPatchScalarField.C | 0 ...oupledTemperatureMixedFvPatchScalarField.H | 2 +- .../thermalBaffle1DFvPatchScalarField.C | 0 .../thermalBaffle1DFvPatchScalarField.H | 0 .../thermalBaffle1DFvPatchScalarFields.C | 2 +- ...RateAdvectiveDiffusiveFvPatchScalarField.C | 0 ...RateAdvectiveDiffusiveFvPatchScalarField.H | 0 .../{ => fluid}/laminar/Fickian/Fickian.C | 2 +- .../{ => fluid}/laminar/Fickian/Fickian.H | 2 +- .../laminar/FickianFourier/FickianFourier.C | 0 .../laminar/FickianFourier/FickianFourier.H | 2 +- .../{ => fluid}/laminar/Fourier/Fourier.C | 0 .../{ => fluid}/laminar/Fourier/Fourier.H | 2 +- .../laminar/MaxwellStefan/MaxwellStefan.C | 2 +- .../laminar/MaxwellStefan/MaxwellStefan.H | 2 +- .../MaxwellStefanFourier.C | 0 .../MaxwellStefanFourier.H | 2 +- .../laminarThermophysicalTransportModel.C | 0 .../laminarThermophysicalTransportModel.H | 0 .../unityLewisFourier/unityLewisFourier.C | 0 .../unityLewisFourier/unityLewisFourier.H | 0 .../FickianEddyDiffusivity.C | 0 .../FickianEddyDiffusivity.H | 2 +- .../LESThermophysicalTransportModel.C | 2 +- .../LESThermophysicalTransportModel.H | 0 .../RASThermophysicalTransportModel.C | 2 +- .../RASThermophysicalTransportModel.H | 0 .../eddyDiffusivity/eddyDiffusivity.C | 2 +- .../eddyDiffusivity/eddyDiffusivity.H | 0 .../nonUnityLewisEddyDiffusivity.C | 0 .../nonUnityLewisEddyDiffusivity.H | 0 .../unityLewisEddyDiffusivity.C | 0 .../unityLewisEddyDiffusivity.H | 0 .../fluidMulticomponentThermo/Make/options | 4 +++- .../fluidThermo/Make/files | 3 +++ .../fluidThermo/Make/options | 20 +++++++++++++++++++ ...fluidThermoThermophysicalTransportModel.H} | 16 +++++++-------- ...luidThermoThermophysicalTransportModels.C} | 4 ++-- ...luidThermoThermophysicalTransportModels.H} | 4 ++-- .../Make/options | 4 +++- .../phaseFluidThermo/Make/options | 4 +++- .../Make/files | 0 .../Make/options | 1 + .../anisotropic/anisotropic.C | 0 .../anisotropic/anisotropic.H | 0 .../isotropic/isotropic.C | 0 .../isotropic/isotropic.H | 0 .../solidThermophysicalTransportModel.C | 0 .../solidThermophysicalTransportModel.H | 0 .../thermophysicalTransportModel/Make/files | 3 +++ .../Make/options | 1 - src/functionObjects/field/Make/options | 7 ++++--- src/fvConstraints/Make/options | 5 +++-- src/fvModels/Make/options | 5 +++-- .../surfaceFilmModels/Make/options | 5 +++-- src/regionModels/thermalBaffle/Make/options | 6 ++++-- src/specieTransfer/Make/options | 5 +++-- .../aachenBomb/system/fvSchemes | 2 +- 97 files changed, 173 insertions(+), 95 deletions(-) rename src/ThermophysicalTransportModels/{ => fluid}/Make/files (76%) create mode 100644 src/ThermophysicalTransportModels/fluid/Make/options rename src/ThermophysicalTransportModels/{ => fluid}/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.C (97%) rename src/ThermophysicalTransportModels/{ => fluid}/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.H (97%) rename src/ThermophysicalTransportModels/{ => fluid}/ThermophysicalTransportModel/ThermophysicalTransportModel.C (97%) rename src/ThermophysicalTransportModels/{ => fluid}/ThermophysicalTransportModel/ThermophysicalTransportModel.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C (98%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C (98%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H (99%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C (97%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/Fickian/Fickian.C (99%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/Fickian/Fickian.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/FickianFourier/FickianFourier.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/FickianFourier/FickianFourier.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/Fourier/Fourier.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/Fourier/Fourier.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/MaxwellStefan/MaxwellStefan.C (99%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/MaxwellStefan/MaxwellStefan.H (99%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/MaxwellStefanFourier/MaxwellStefanFourier.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/MaxwellStefanFourier/MaxwellStefanFourier.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/unityLewisFourier/unityLewisFourier.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/laminar/unityLewisFourier/unityLewisFourier.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H (98%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.C (98%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.C (98%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/eddyDiffusivity/eddyDiffusivity.C (98%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/eddyDiffusivity/eddyDiffusivity.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.H (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.C (100%) rename src/ThermophysicalTransportModels/{ => fluid}/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H (100%) create mode 100644 src/ThermophysicalTransportModels/fluidThermo/Make/files create mode 100644 src/ThermophysicalTransportModels/fluidThermo/Make/options rename src/ThermophysicalTransportModels/fluidThermo/{fluidThermophysicalTransportModel.H => fluidThermoThermophysicalTransportModel.H} (84%) rename src/ThermophysicalTransportModels/fluidThermo/{fluidThermophysicalTransportModels.C => fluidThermoThermophysicalTransportModels.C} (95%) rename src/ThermophysicalTransportModels/fluidThermo/{fluidThermophysicalTransportModels.H => fluidThermoThermophysicalTransportModels.H} (97%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/Make/files (100%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/Make/options (82%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/anisotropic/anisotropic.C (100%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/anisotropic/anisotropic.H (100%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/isotropic/isotropic.C (100%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/isotropic/isotropic.H (100%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/solidThermophysicalTransportModel/solidThermophysicalTransportModel.C (100%) rename src/ThermophysicalTransportModels/{solidThermophysicalTransportModels => solid}/solidThermophysicalTransportModel/solidThermophysicalTransportModel.H (100%) create mode 100644 src/ThermophysicalTransportModels/thermophysicalTransportModel/Make/files rename src/ThermophysicalTransportModels/{ => thermophysicalTransportModel}/Make/options (96%) diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 674d20c37b..51d632001a 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -6,7 +6,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -16,7 +18,7 @@ EXE_LIBS = \ -lXiIgnition \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels \ + -lfluidThermoThermophysicalTransportModels \ -lcoupledThermophysicalTransportModels \ -lmulticomponentThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/Make/options b/applications/solvers/combustion/XiFoam/PDRFoam/Make/options index ebe9e5779b..9528af0e4d 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/PDRFoam/Make/options @@ -28,7 +28,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C index 8eea5e0639..c9bbf49dde 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoam.C @@ -70,7 +70,7 @@ Description #include "fvCFD.H" #include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" #include "PDRDragModel.H" diff --git a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C index ba7c9af658..0fb56bc73f 100644 --- a/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/XiFoam/PDRFoam/PDRFoamAutoRefine.C @@ -58,7 +58,7 @@ Description #include "fvCFD.H" #include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" #include "PDRDragModel.H" diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index e43f92ccd3..4173dc9d88 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -52,7 +52,7 @@ Description #include "fvCFD.H" #include "psiuMulticomponentThermo.H" #include "compressibleMomentumTransportModels.H" -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" #include "Switch.H" diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index b2c42b26b5..8108df0ce6 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -59,9 +59,9 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + fluidThermoThermophysicalTransportModel::New(turbulence(), thermo) ); Info<< "Creating field dpdt\n" << endl; diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index aff36bf1ad..f7b1cf9d1e 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -6,7 +6,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidThermo/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index 4b8d4d6f81..b941718b71 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -102,7 +102,7 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + fluidThermoThermophysicalTransportModel::New(turbulence(), thermo) ); diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 4d29416ab6..c60ef4d424 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "psiThermo.H" #include "compressibleMomentumTransportModels.H" -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" #include "fixedRhoFvPatchScalarField.H" #include "directionInterpolate.H" #include "localEulerDdtScheme.H" diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options index c8c0b1835a..bf973fdcd7 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options @@ -5,7 +5,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H index 7ec066bb15..cac828a677 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H @@ -60,9 +60,9 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + fluidThermoThermophysicalTransportModel::New(turbulence(), thermo) ); dimensionedScalar initialMass = fvc::domainIntegrate(rho); diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index de6cb7d7cd..c760a104bd 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "fluidThermo.H" #include "compressibleMomentumTransportModels.H" -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" #include "simpleControl.H" #include "pressureReference.H" #include "fvModels.H" diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index b271026172..ea4679fd02 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/applications/solvers/heatTransfer/thermoFoam/Make/options @@ -6,7 +6,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidThermo/lnInclude EXE_LIBS = \ -lfiniteVolume \ diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index e929ef96a4..6882864ebb 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H @@ -48,9 +48,9 @@ autoPtr turbulence ); Info<< "Creating thermophysical transport model\n" << endl; -autoPtr thermophysicalTransport +autoPtr thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + fluidThermoThermophysicalTransportModel::New(turbulence(), thermo) ); Info<< "Creating field dpdt\n" << endl; diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index 1ceb6bf73b..e7f1edb6aa 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "fluidThermo.H" #include "compressibleMomentumTransportModels.H" -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" #include "LESModel.H" #include "fvModels.H" #include "fvConstraints.H" diff --git a/applications/solvers/modules/fluid/fluid/Make/options b/applications/solvers/modules/fluid/fluid/Make/options index 57be1aadc9..7b01b11cfd 100644 --- a/applications/solvers/modules/fluid/fluid/Make/options +++ b/applications/solvers/modules/fluid/fluid/Make/options @@ -5,7 +5,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/modules/fluid/fluid/fluid.C b/applications/solvers/modules/fluid/fluid/fluid.C index ad6030be8f..9305283bf1 100644 --- a/applications/solvers/modules/fluid/fluid/fluid.C +++ b/applications/solvers/modules/fluid/fluid/fluid.C @@ -46,7 +46,7 @@ Foam::solvers::fluid::fluid(fvMesh& mesh) thermophysicalTransport ( - fluidThermophysicalTransportModel::New(turbulence(), thermo) + fluidThermoThermophysicalTransportModel::New(turbulence(), thermo) ) {} diff --git a/applications/solvers/modules/fluid/fluid/fluid.H b/applications/solvers/modules/fluid/fluid/fluid.H index 900b0932e4..f80bfb69e1 100644 --- a/applications/solvers/modules/fluid/fluid/fluid.H +++ b/applications/solvers/modules/fluid/fluid/fluid.H @@ -52,7 +52,7 @@ SourceFiles #define fluid_H #include "isothermalFluid.H" -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -74,7 +74,8 @@ protected: // Thermophysical transport - autoPtr thermophysicalTransport; + autoPtr + thermophysicalTransport; public: diff --git a/applications/solvers/modules/fluid/multicomponentFluid/Make/options b/applications/solvers/modules/fluid/multicomponentFluid/Make/options index 0f1a74e6f7..e1989cfe02 100644 --- a/applications/solvers/modules/fluid/multicomponentFluid/Make/options +++ b/applications/solvers/modules/fluid/multicomponentFluid/Make/options @@ -3,7 +3,8 @@ EXE_INC = \ -I$(FOAM_SOLVERS)/modules/fluid/isothermalFluid/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidMulticomponentThermo/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/applications/solvers/modules/solid/solid/Make/options b/applications/solvers/modules/solid/solid/Make/options index 3279afa2e6..c8f10595e2 100644 --- a/applications/solvers/modules/solid/solid/Make/options +++ b/applications/solvers/modules/solid/solid/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/solidThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/solid/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options index 2351a4d150..cc8504ddcf 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options @@ -10,7 +10,8 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options index 4508f6ef4f..32b7e969b3 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/solidThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/solid/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options index 7090b8cc82..9a0daaef41 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/solidThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/solid/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/src/OpenFOAM/include/listOptions.H b/src/OpenFOAM/include/listOptions.H index 5547fd66e2..41eea1ae7d 100644 --- a/src/OpenFOAM/include/listOptions.H +++ b/src/OpenFOAM/include/listOptions.H @@ -50,7 +50,7 @@ argList::addBoolOption ); #endif -#ifdef fluidThermophysicalTransportModel_H +#ifdef fluidThermoThermophysicalTransportModel_H argList::addBoolOption ( "listThermophysicalTransportModels", diff --git a/src/OpenFOAM/include/listOutput.H b/src/OpenFOAM/include/listOutput.H index da2b2f5b3f..aed5a41c85 100644 --- a/src/OpenFOAM/include/listOutput.H +++ b/src/OpenFOAM/include/listOutput.H @@ -99,27 +99,29 @@ if (args.optionFound("listMomentumTransportModels")) } #endif -#ifdef fluidThermophysicalTransportModel_H +#ifdef fluidThermoThermophysicalTransportModel_H if (args.optionFound("listThermophysicalTransportModels")) { Info<< "Turbulence models" - << fluidThermophysicalTransportModel:: + << fluidThermoThermophysicalTransportModel:: dictionaryConstructorTablePtr_->sortedToc() << endl; Info<< "Laminar models" << laminarThermophysicalTransportModel - :: + :: dictionaryConstructorTablePtr_->sortedToc() << endl; Info<< "RAS models" - << RASThermophysicalTransportModel:: + << RASThermophysicalTransportModel + :: dictionaryConstructorTablePtr_->sortedToc() << endl; Info<< "LES models" - << LESThermophysicalTransportModel:: + << LESThermophysicalTransportModel + :: dictionaryConstructorTablePtr_->sortedToc() << endl; listOptions = true; diff --git a/src/ThermophysicalTransportModels/Allwmake b/src/ThermophysicalTransportModels/Allwmake index 0f32d8f28d..163d1cdee2 100755 --- a/src/ThermophysicalTransportModels/Allwmake +++ b/src/ThermophysicalTransportModels/Allwmake @@ -4,11 +4,14 @@ cd ${0%/*} || exit 1 # Run from this directory # Parse arguments for library compilation . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -wmake $targetType +wmake $targetType thermophysicalTransportModel +wmake $targetType fluid +wmake $targetType solid + +wmake $targetType fluidThermo wmake $targetType fluidMulticomponentThermo wmake $targetType phaseFluidThermo wmake $targetType phaseFluidMulticomponentThermo -wmake $targetType solidThermophysicalTransportModels wmake $targetType coupledThermophysicalTransportModels #------------------------------------------------------------------------------ diff --git a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/Make/options b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/Make/options index 54c2abbb85..65d0a1d4fc 100644 --- a/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/Make/options +++ b/src/ThermophysicalTransportModels/coupledThermophysicalTransportModels/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/solidThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/solid/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ @@ -10,9 +11,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ + -lthermophysicalTransportModel \ -lfluidThermophysicalModels \ -lsolidThermo \ - -lthermophysicalTransportModels \ + -lfluidThermoThermophysicalTransportModels \ -lmomentumTransportModels \ -lsolidThermophysicalTransportModels \ -lfiniteVolume \ diff --git a/src/ThermophysicalTransportModels/Make/files b/src/ThermophysicalTransportModels/fluid/Make/files similarity index 76% rename from src/ThermophysicalTransportModels/Make/files rename to src/ThermophysicalTransportModels/fluid/Make/files index d1c73eb2be..ad431be1ba 100644 --- a/src/ThermophysicalTransportModels/Make/files +++ b/src/ThermophysicalTransportModels/fluid/Make/files @@ -1,4 +1,4 @@ -thermophysicalTransportModel/thermophysicalTransportModel.C +#fluidThermophysicalTransportModel/fluidThermophysicalTransportModel.C BCs = derivedFvPatchFields $(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C @@ -8,6 +8,4 @@ $(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C $(BCs)/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C $(BCs)/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C -fluidThermo/fluidThermophysicalTransportModels.C - -LIB = $(FOAM_LIBBIN)/libthermophysicalTransportModels +LIB = $(FOAM_LIBBIN)/libfluidThermophysicalTransportModel diff --git a/src/ThermophysicalTransportModels/fluid/Make/options b/src/ThermophysicalTransportModels/fluid/Make/options new file mode 100644 index 0000000000..3edb3dbf52 --- /dev/null +++ b/src/ThermophysicalTransportModels/fluid/Make/options @@ -0,0 +1,19 @@ +EXE_INC = \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/physicalProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + +LIB_LIBS = \ + -lthermophysicalTransportModel \ + -lfluidThermophysicalModels \ + -lsolidThermo \ + -lmomentumTransportModels \ + -lspecie \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/ThermophysicalTransportModels/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.C b/src/ThermophysicalTransportModels/fluid/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.C similarity index 97% rename from src/ThermophysicalTransportModels/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.C rename to src/ThermophysicalTransportModels/fluid/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.C index 6abd35c0ac..fb960a6abc 100644 --- a/src/ThermophysicalTransportModels/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.C +++ b/src/ThermophysicalTransportModels/fluid/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluid/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.H similarity index 97% rename from src/ThermophysicalTransportModels/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/fluid/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.H index a94a5c1207..812c6162df 100644 --- a/src/ThermophysicalTransportModels/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/fluid/PhaseThermophysicalTransportModel/PhaseThermophysicalTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.C b/src/ThermophysicalTransportModels/fluid/ThermophysicalTransportModel/ThermophysicalTransportModel.C similarity index 97% rename from src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.C rename to src/ThermophysicalTransportModels/fluid/ThermophysicalTransportModel/ThermophysicalTransportModel.C index 132c8d7cac..ee912aae45 100644 --- a/src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.C +++ b/src/ThermophysicalTransportModels/fluid/ThermophysicalTransportModel/ThermophysicalTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluid/ThermophysicalTransportModel/ThermophysicalTransportModel.H similarity index 100% rename from src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/fluid/ThermophysicalTransportModel/ThermophysicalTransportModel.H diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C similarity index 100% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H similarity index 98% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H index d06423ef48..5e9f4593ad 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C similarity index 98% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index 0c57bf3ae2..7bdcb667b2 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H similarity index 98% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H index 8addb2d634..701e857279 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C similarity index 98% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C index 92f24c0d82..f5f7d5637d 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H similarity index 98% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H index fcf521aa3e..e7584c81f6 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C similarity index 100% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H similarity index 99% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H index ba318cd63b..d3036ac73a 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C similarity index 100% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H similarity index 100% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C similarity index 97% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C index fc48ded1ac..78da6f4e63 100644 --- a/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C +++ b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C similarity index 100% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C diff --git a/src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H similarity index 100% rename from src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H rename to src/ThermophysicalTransportModels/fluid/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H diff --git a/src/ThermophysicalTransportModels/laminar/Fickian/Fickian.C b/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.C similarity index 99% rename from src/ThermophysicalTransportModels/laminar/Fickian/Fickian.C rename to src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.C index c1cead80ae..2bfa8e5a4b 100644 --- a/src/ThermophysicalTransportModels/laminar/Fickian/Fickian.C +++ b/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/laminar/Fickian/Fickian.H b/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.H similarity index 98% rename from src/ThermophysicalTransportModels/laminar/Fickian/Fickian.H rename to src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.H index 2ffc0b9b13..c3127b1a0e 100644 --- a/src/ThermophysicalTransportModels/laminar/Fickian/Fickian.H +++ b/src/ThermophysicalTransportModels/fluid/laminar/Fickian/Fickian.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/laminar/FickianFourier/FickianFourier.C b/src/ThermophysicalTransportModels/fluid/laminar/FickianFourier/FickianFourier.C similarity index 100% rename from src/ThermophysicalTransportModels/laminar/FickianFourier/FickianFourier.C rename to src/ThermophysicalTransportModels/fluid/laminar/FickianFourier/FickianFourier.C diff --git a/src/ThermophysicalTransportModels/laminar/FickianFourier/FickianFourier.H b/src/ThermophysicalTransportModels/fluid/laminar/FickianFourier/FickianFourier.H similarity index 98% rename from src/ThermophysicalTransportModels/laminar/FickianFourier/FickianFourier.H rename to src/ThermophysicalTransportModels/fluid/laminar/FickianFourier/FickianFourier.H index dfbafc8671..f845989ed1 100644 --- a/src/ThermophysicalTransportModels/laminar/FickianFourier/FickianFourier.H +++ b/src/ThermophysicalTransportModels/fluid/laminar/FickianFourier/FickianFourier.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/laminar/Fourier/Fourier.C b/src/ThermophysicalTransportModels/fluid/laminar/Fourier/Fourier.C similarity index 100% rename from src/ThermophysicalTransportModels/laminar/Fourier/Fourier.C rename to src/ThermophysicalTransportModels/fluid/laminar/Fourier/Fourier.C diff --git a/src/ThermophysicalTransportModels/laminar/Fourier/Fourier.H b/src/ThermophysicalTransportModels/fluid/laminar/Fourier/Fourier.H similarity index 98% rename from src/ThermophysicalTransportModels/laminar/Fourier/Fourier.H rename to src/ThermophysicalTransportModels/fluid/laminar/Fourier/Fourier.H index 87b72c6b00..dcd10f1984 100644 --- a/src/ThermophysicalTransportModels/laminar/Fourier/Fourier.H +++ b/src/ThermophysicalTransportModels/fluid/laminar/Fourier/Fourier.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/laminar/MaxwellStefan/MaxwellStefan.C b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.C similarity index 99% rename from src/ThermophysicalTransportModels/laminar/MaxwellStefan/MaxwellStefan.C rename to src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.C index 1651e98ccd..e15bca5f28 100644 --- a/src/ThermophysicalTransportModels/laminar/MaxwellStefan/MaxwellStefan.C +++ b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/laminar/MaxwellStefan/MaxwellStefan.H b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.H similarity index 99% rename from src/ThermophysicalTransportModels/laminar/MaxwellStefan/MaxwellStefan.H rename to src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.H index b760cbd15e..b8e9e6f4ad 100644 --- a/src/ThermophysicalTransportModels/laminar/MaxwellStefan/MaxwellStefan.H +++ b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefan/MaxwellStefan.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/laminar/MaxwellStefanFourier/MaxwellStefanFourier.C b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefanFourier/MaxwellStefanFourier.C similarity index 100% rename from src/ThermophysicalTransportModels/laminar/MaxwellStefanFourier/MaxwellStefanFourier.C rename to src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefanFourier/MaxwellStefanFourier.C diff --git a/src/ThermophysicalTransportModels/laminar/MaxwellStefanFourier/MaxwellStefanFourier.H b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefanFourier/MaxwellStefanFourier.H similarity index 98% rename from src/ThermophysicalTransportModels/laminar/MaxwellStefanFourier/MaxwellStefanFourier.H rename to src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefanFourier/MaxwellStefanFourier.H index 091ccc0141..4c21be14ec 100644 --- a/src/ThermophysicalTransportModels/laminar/MaxwellStefanFourier/MaxwellStefanFourier.H +++ b/src/ThermophysicalTransportModels/fluid/laminar/MaxwellStefanFourier/MaxwellStefanFourier.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.C b/src/ThermophysicalTransportModels/fluid/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.C similarity index 100% rename from src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.C rename to src/ThermophysicalTransportModels/fluid/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.C diff --git a/src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluid/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H similarity index 100% rename from src/ThermophysicalTransportModels/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/fluid/laminar/laminarThermophysicalTransportModel/laminarThermophysicalTransportModel.H diff --git a/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.C b/src/ThermophysicalTransportModels/fluid/laminar/unityLewisFourier/unityLewisFourier.C similarity index 100% rename from src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.C rename to src/ThermophysicalTransportModels/fluid/laminar/unityLewisFourier/unityLewisFourier.C diff --git a/src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.H b/src/ThermophysicalTransportModels/fluid/laminar/unityLewisFourier/unityLewisFourier.H similarity index 100% rename from src/ThermophysicalTransportModels/laminar/unityLewisFourier/unityLewisFourier.H rename to src/ThermophysicalTransportModels/fluid/laminar/unityLewisFourier/unityLewisFourier.H diff --git a/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C b/src/ThermophysicalTransportModels/fluid/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C rename to src/ThermophysicalTransportModels/fluid/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.C diff --git a/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H b/src/ThermophysicalTransportModels/fluid/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H similarity index 98% rename from src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H rename to src/ThermophysicalTransportModels/fluid/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H index f3cd9ec06b..8e7320a805 100644 --- a/src/ThermophysicalTransportModels/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H +++ b/src/ThermophysicalTransportModels/fluid/turbulence/FickianEddyDiffusivity/FickianEddyDiffusivity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.C b/src/ThermophysicalTransportModels/fluid/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.C similarity index 98% rename from src/ThermophysicalTransportModels/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.C rename to src/ThermophysicalTransportModels/fluid/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.C index e9f7d994fc..f4bdc38517 100644 --- a/src/ThermophysicalTransportModels/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.C +++ b/src/ThermophysicalTransportModels/fluid/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluid/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.H similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/fluid/turbulence/LES/LESThermophysicalTransportModel/LESThermophysicalTransportModel.H diff --git a/src/ThermophysicalTransportModels/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.C b/src/ThermophysicalTransportModels/fluid/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.C similarity index 98% rename from src/ThermophysicalTransportModels/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.C rename to src/ThermophysicalTransportModels/fluid/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.C index e00596da93..57d657bf25 100644 --- a/src/ThermophysicalTransportModels/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.C +++ b/src/ThermophysicalTransportModels/fluid/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluid/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.H similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/fluid/turbulence/RAS/RASThermophysicalTransportModel/RASThermophysicalTransportModel.H diff --git a/src/ThermophysicalTransportModels/turbulence/eddyDiffusivity/eddyDiffusivity.C b/src/ThermophysicalTransportModels/fluid/turbulence/eddyDiffusivity/eddyDiffusivity.C similarity index 98% rename from src/ThermophysicalTransportModels/turbulence/eddyDiffusivity/eddyDiffusivity.C rename to src/ThermophysicalTransportModels/fluid/turbulence/eddyDiffusivity/eddyDiffusivity.C index a41bbd8dd3..57824b631d 100644 --- a/src/ThermophysicalTransportModels/turbulence/eddyDiffusivity/eddyDiffusivity.C +++ b/src/ThermophysicalTransportModels/fluid/turbulence/eddyDiffusivity/eddyDiffusivity.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/turbulence/eddyDiffusivity/eddyDiffusivity.H b/src/ThermophysicalTransportModels/fluid/turbulence/eddyDiffusivity/eddyDiffusivity.H similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/eddyDiffusivity/eddyDiffusivity.H rename to src/ThermophysicalTransportModels/fluid/turbulence/eddyDiffusivity/eddyDiffusivity.H diff --git a/src/ThermophysicalTransportModels/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.C b/src/ThermophysicalTransportModels/fluid/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.C similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.C rename to src/ThermophysicalTransportModels/fluid/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.C diff --git a/src/ThermophysicalTransportModels/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.H b/src/ThermophysicalTransportModels/fluid/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.H similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.H rename to src/ThermophysicalTransportModels/fluid/turbulence/nonUnityLewisEddyDiffusivity/nonUnityLewisEddyDiffusivity.H diff --git a/src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.C b/src/ThermophysicalTransportModels/fluid/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.C similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.C rename to src/ThermophysicalTransportModels/fluid/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.C diff --git a/src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H b/src/ThermophysicalTransportModels/fluid/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H similarity index 100% rename from src/ThermophysicalTransportModels/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H rename to src/ThermophysicalTransportModels/fluid/turbulence/unityLewisEddyDiffusivity/unityLewisEddyDiffusivity.H diff --git a/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options index 2352733da1..ffaebbee22 100644 --- a/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options +++ b/src/ThermophysicalTransportModels/fluidMulticomponentThermo/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -10,6 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ + -lfluidThermoThermophysicalTransportModels \ -lfluidThermophysicalModels \ -lmulticomponentThermophysicalModels \ -lmomentumTransportModels \ diff --git a/src/ThermophysicalTransportModels/fluidThermo/Make/files b/src/ThermophysicalTransportModels/fluidThermo/Make/files new file mode 100644 index 0000000000..2a8cf3e095 --- /dev/null +++ b/src/ThermophysicalTransportModels/fluidThermo/Make/files @@ -0,0 +1,3 @@ +fluidThermoThermophysicalTransportModels.C + +LIB = $(FOAM_LIBBIN)/libfluidThermoThermophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/fluidThermo/Make/options b/src/ThermophysicalTransportModels/fluidThermo/Make/options new file mode 100644 index 0000000000..2a3da7768b --- /dev/null +++ b/src/ThermophysicalTransportModels/fluidThermo/Make/options @@ -0,0 +1,20 @@ +EXE_INC = \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/physicalProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + +LIB_LIBS = \ + -lfluidThermophysicalTransportModel \ + -lfluidThermophysicalModels \ + -lsolidThermo \ + -lmomentumTransportModels \ + -lspecie \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModel.H similarity index 84% rename from src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModel.H index 54995fdc8f..6d503b1419 100644 --- a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Typedef - Foam::compressible::thermophysicalTransportModel + Foam::compressible::fluidThermoThermophysicalTransportModel Typedef Foam::compressible::laminarThermophysicalTransportModel @@ -39,8 +39,8 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef fluidThermophysicalTransportModel_H -#define fluidThermophysicalTransportModel_H +#ifndef fluidThermoThermophysicalTransportModel_H +#define fluidThermoThermophysicalTransportModel_H #include "fluidThermo.H" #include "laminarThermophysicalTransportModel.H" @@ -56,21 +56,21 @@ namespace Foam < compressible::momentumTransportModel, fluidThermo - > fluidThermophysicalTransportModel; + > fluidThermoThermophysicalTransportModel; typedef laminarThermophysicalTransportModel < - fluidThermophysicalTransportModel + fluidThermoThermophysicalTransportModel > laminarFluidThermophysicalTransportModel; typedef RASThermophysicalTransportModel < - fluidThermophysicalTransportModel + fluidThermoThermophysicalTransportModel > RASFluidThermophysicalTransportModel; typedef LESThermophysicalTransportModel < - fluidThermophysicalTransportModel + fluidThermoThermophysicalTransportModel > LESFluidThermophysicalTransportModel; } diff --git a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModels.C similarity index 95% rename from src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.C rename to src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModels.C index dffe542ff4..fb337d6cdb 100644 --- a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidThermophysicalTransportModels.H" +#include "fluidThermoThermophysicalTransportModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.H b/src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModels.H similarity index 97% rename from src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.H rename to src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModels.H index 8104b5ba20..96588574b7 100644 --- a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.H +++ b/src/ThermophysicalTransportModels/fluidThermo/fluidThermoThermophysicalTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidThermophysicalTransportModel.H" +#include "fluidThermoThermophysicalTransportModel.H" #include "compressibleMomentumTransportModels.H" #include "makeThermophysicalTransportModel.H" diff --git a/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options index e8d349e1ac..96879cd3c3 100644 --- a/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options +++ b/src/ThermophysicalTransportModels/phaseFluidMulticomponentThermo/Make/options @@ -1,8 +1,9 @@ EXE_INC = \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -11,6 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ + -lfluidThermoThermophysicalTransportModels \ -lfluidThermophysicalModels \ -lmulticomponentThermophysicalModels \ -lmomentumTransportModels \ diff --git a/src/ThermophysicalTransportModels/phaseFluidThermo/Make/options b/src/ThermophysicalTransportModels/phaseFluidThermo/Make/options index 764c15bd9e..26111fa9ba 100644 --- a/src/ThermophysicalTransportModels/phaseFluidThermo/Make/options +++ b/src/ThermophysicalTransportModels/phaseFluidThermo/Make/options @@ -1,8 +1,9 @@ EXE_INC = \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -10,6 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ + -lfluidThermoThermophysicalTransportModels \ -lfluidThermophysicalModels \ -lmomentumTransportModels \ -lspecie \ diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/Make/files b/src/ThermophysicalTransportModels/solid/Make/files similarity index 100% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/Make/files rename to src/ThermophysicalTransportModels/solid/Make/files diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/Make/options b/src/ThermophysicalTransportModels/solid/Make/options similarity index 82% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/Make/options rename to src/ThermophysicalTransportModels/solid/Make/options index 23d5bae59f..2282e4d74d 100644 --- a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/Make/options +++ b/src/ThermophysicalTransportModels/solid/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/anisotropic/anisotropic.C b/src/ThermophysicalTransportModels/solid/anisotropic/anisotropic.C similarity index 100% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/anisotropic/anisotropic.C rename to src/ThermophysicalTransportModels/solid/anisotropic/anisotropic.C diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/anisotropic/anisotropic.H b/src/ThermophysicalTransportModels/solid/anisotropic/anisotropic.H similarity index 100% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/anisotropic/anisotropic.H rename to src/ThermophysicalTransportModels/solid/anisotropic/anisotropic.H diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/isotropic/isotropic.C b/src/ThermophysicalTransportModels/solid/isotropic/isotropic.C similarity index 100% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/isotropic/isotropic.C rename to src/ThermophysicalTransportModels/solid/isotropic/isotropic.C diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/isotropic/isotropic.H b/src/ThermophysicalTransportModels/solid/isotropic/isotropic.H similarity index 100% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/isotropic/isotropic.H rename to src/ThermophysicalTransportModels/solid/isotropic/isotropic.H diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/solidThermophysicalTransportModel/solidThermophysicalTransportModel.C b/src/ThermophysicalTransportModels/solid/solidThermophysicalTransportModel/solidThermophysicalTransportModel.C similarity index 100% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/solidThermophysicalTransportModel/solidThermophysicalTransportModel.C rename to src/ThermophysicalTransportModels/solid/solidThermophysicalTransportModel/solidThermophysicalTransportModel.C diff --git a/src/ThermophysicalTransportModels/solidThermophysicalTransportModels/solidThermophysicalTransportModel/solidThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/solid/solidThermophysicalTransportModel/solidThermophysicalTransportModel.H similarity index 100% rename from src/ThermophysicalTransportModels/solidThermophysicalTransportModels/solidThermophysicalTransportModel/solidThermophysicalTransportModel.H rename to src/ThermophysicalTransportModels/solid/solidThermophysicalTransportModel/solidThermophysicalTransportModel.H diff --git a/src/ThermophysicalTransportModels/thermophysicalTransportModel/Make/files b/src/ThermophysicalTransportModels/thermophysicalTransportModel/Make/files new file mode 100644 index 0000000000..3ba1c622ba --- /dev/null +++ b/src/ThermophysicalTransportModels/thermophysicalTransportModel/Make/files @@ -0,0 +1,3 @@ +thermophysicalTransportModel.C + +LIB = $(FOAM_LIBBIN)/libthermophysicalTransportModel diff --git a/src/ThermophysicalTransportModels/Make/options b/src/ThermophysicalTransportModels/thermophysicalTransportModel/Make/options similarity index 96% rename from src/ThermophysicalTransportModels/Make/options rename to src/ThermophysicalTransportModels/thermophysicalTransportModel/Make/options index baa718db17..ffbd0da0dd 100644 --- a/src/ThermophysicalTransportModels/Make/options +++ b/src/ThermophysicalTransportModels/thermophysicalTransportModel/Make/options @@ -10,7 +10,6 @@ EXE_INC = \ LIB_LIBS = \ -lfluidThermophysicalModels \ - -lsolidThermo \ -lmomentumTransportModels \ -lspecie \ -lfiniteVolume \ diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options index c3b96e52ca..a400da0420 100644 --- a/src/functionObjects/field/Make/options +++ b/src/functionObjects/field/Make/options @@ -12,8 +12,9 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/solidThermophysicalTransportModels/lnInclude + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/solid/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -23,7 +24,7 @@ LIB_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels \ + -lfluidThermoThermophysicalTransportModels \ -lsolidThermophysicalTransportModels \ -lmeshTools \ -lsurfMesh \ diff --git a/src/fvConstraints/Make/options b/src/fvConstraints/Make/options index 2aa0018d56..7f29dea317 100644 --- a/src/fvConstraints/Make/options +++ b/src/fvConstraints/Make/options @@ -8,7 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -16,4 +17,4 @@ LIB_LIBS = \ -lmeshTools \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels + -lfluidThermoThermophysicalTransportModels diff --git a/src/fvModels/Make/options b/src/fvModels/Make/options index 2aa0018d56..7f29dea317 100644 --- a/src/fvModels/Make/options +++ b/src/fvModels/Make/options @@ -8,7 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -16,4 +17,4 @@ LIB_LIBS = \ -lmeshTools \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels + -lfluidThermoThermophysicalTransportModels diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options index b0d92ce028..8eeca04b82 100644 --- a/src/regionModels/surfaceFilmModels/Make/options +++ b/src/regionModels/surfaceFilmModels/Make/options @@ -7,7 +7,8 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -20,7 +21,7 @@ LIB_LIBS = \ -ldistributionModels \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels \ + -lfluidThermoThermophysicalTransportModels \ -lregionModels \ -lfiniteVolume \ -lmeshTools diff --git a/src/regionModels/thermalBaffle/Make/options b/src/regionModels/thermalBaffle/Make/options index ef905fc528..b4e70826a2 100644 --- a/src/regionModels/thermalBaffle/Make/options +++ b/src/regionModels/thermalBaffle/Make/options @@ -5,8 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/solidThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/solid/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/coupledThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/src/specieTransfer/Make/options b/src/specieTransfer/Make/options index 22401caa46..6c3c59383a 100644 --- a/src/specieTransfer/Make/options +++ b/src/specieTransfer/Make/options @@ -7,7 +7,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude + -I$(LIB_SRC)/ThermophysicalTransportModels/thermophysicalTransportModel/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/fluid/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -17,4 +18,4 @@ LIB_LIBS = \ -lmulticomponentThermophysicalModels \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels + -lfluidThermoThermophysicalTransportModels diff --git a/tutorials/modules/multicomponentFluid/aachenBomb/system/fvSchemes b/tutorials/modules/multicomponentFluid/aachenBomb/system/fvSchemes index ab5ec0055c..beb922270d 100644 --- a/tutorials/modules/multicomponentFluid/aachenBomb/system/fvSchemes +++ b/tutorials/modules/multicomponentFluid/aachenBomb/system/fvSchemes @@ -16,7 +16,7 @@ FoamFile ddtSchemes { - default Euler; + default backward; } gradSchemes