From db45df2e6e7c57d4903bd30f978485edfb537b22 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 20 Jan 2022 15:38:04 +0000 Subject: [PATCH] solidSpecie: Moved into solidThermo Resolved bug-report https://bugs.openfoam.org/view.php?id=3787 --- etc/codeTemplates/dynamicCode/solidThermo | 1 - src/ThermophysicalTransportModels/Make/options | 1 - src/thermophysicalModels/solidThermo/Make/options | 1 - .../{ => solidThermo}/solidSpecie/include/forSolids.H | 2 +- .../solidSpecie/transport/const/constAnIsoSolidTransport.C | 2 +- .../solidSpecie/transport/const/constAnIsoSolidTransport.H | 2 +- .../solidSpecie/transport/const/constAnIsoSolidTransportI.H | 2 +- .../solidSpecie/transport/const/constIsoSolidTransport.C | 2 +- .../solidSpecie/transport/const/constIsoSolidTransport.H | 2 +- .../solidSpecie/transport/const/constIsoSolidTransportI.H | 2 +- .../transport/exponential/exponentialSolidTransport.C | 2 +- .../transport/exponential/exponentialSolidTransport.H | 2 +- .../transport/exponential/exponentialSolidTransportI.H | 2 +- .../solidSpecie/transport/polynomial/polynomialSolidTransport.C | 2 +- .../solidSpecie/transport/polynomial/polynomialSolidTransport.H | 2 +- .../transport/polynomial/polynomialSolidTransportI.H | 2 +- .../solidSpecie/transport/tabulated/tabulatedSolidTransport.C | 2 +- .../solidSpecie/transport/tabulated/tabulatedSolidTransport.H | 2 +- .../solidSpecie/transport/tabulated/tabulatedSolidTransportI.H | 2 +- 19 files changed, 16 insertions(+), 19 deletions(-) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/include/forSolids.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/const/constAnIsoSolidTransport.C (97%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/const/constAnIsoSolidTransport.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/const/constAnIsoSolidTransportI.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/const/constIsoSolidTransport.C (97%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/const/constIsoSolidTransport.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/const/constIsoSolidTransportI.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/exponential/exponentialSolidTransport.C (97%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/exponential/exponentialSolidTransport.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/exponential/exponentialSolidTransportI.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/polynomial/polynomialSolidTransport.C (97%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/polynomial/polynomialSolidTransport.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/polynomial/polynomialSolidTransportI.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/tabulated/tabulatedSolidTransport.C (96%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/tabulated/tabulatedSolidTransport.H (98%) rename src/thermophysicalModels/{ => solidThermo}/solidSpecie/transport/tabulated/tabulatedSolidTransportI.H (97%) diff --git a/etc/codeTemplates/dynamicCode/solidThermo b/etc/codeTemplates/dynamicCode/solidThermo index 45ce4db55f..1b6a505211 100644 --- a/etc/codeTemplates/dynamicCode/solidThermo +++ b/etc/codeTemplates/dynamicCode/solidThermo @@ -65,7 +65,6 @@ codeOptions EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ diff --git a/src/ThermophysicalTransportModels/Make/options b/src/ThermophysicalTransportModels/Make/options index c9172f5058..baa718db17 100644 --- a/src/ThermophysicalTransportModels/Make/options +++ b/src/ThermophysicalTransportModels/Make/options @@ -5,7 +5,6 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/src/thermophysicalModels/solidThermo/Make/options b/src/thermophysicalModels/solidThermo/Make/options index d2ea534588..7471724330 100644 --- a/src/thermophysicalModels/solidThermo/Make/options +++ b/src/thermophysicalModels/solidThermo/Make/options @@ -4,7 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/physicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/solidSpecie/include/forSolids.H b/src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/include/forSolids.H rename to src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H index 4d9021f19c..8f44aa085f 100644 --- a/src/thermophysicalModels/solidSpecie/include/forSolids.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/include/forSolids.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.C similarity index 97% rename from src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.C index abe3ab3c39..0a90bba1e7 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.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/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.H index e75100e172..34f7e50a39 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransport.H @@ -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/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransportI.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransportI.H index 44a50a37b6..334f789efe 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransportI.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constAnIsoSolidTransportI.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/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.C similarity index 97% rename from src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.C index 4fc908a873..f4798301bb 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.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/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.H index d69688511e..cb27f011f2 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransport.H @@ -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/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransportI.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransportI.H index 7d288e0052..7bc08be78a 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransportI.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/const/constIsoSolidTransportI.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/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.C similarity index 97% rename from src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.C index 9a25602226..ec321619e9 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.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/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.H index 5653579f87..0f898a98ef 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransport.H @@ -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/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransportI.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransportI.H index c91b9ea3e9..fd76490d64 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/exponential/exponentialSolidTransportI.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/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.C similarity index 97% rename from src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.C index c0512d34d0..1cfa91fa1c 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.H index 104b20a56a..d7e1456a41 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransport.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2022 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransportI.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransportI.H index 6fb5f595a3..77ab7b2dd7 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransportI.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/polynomial/polynomialSolidTransportI.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/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransport.C b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.C similarity index 96% rename from src/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransport.C rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.C index d5289983b8..a79e827bb4 100644 --- a/src/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransport.C +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.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/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransport.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.H similarity index 98% rename from src/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransport.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.H index 1dbede4c73..d018cb0360 100644 --- a/src/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransport.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransport.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/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransportI.H b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransportI.H similarity index 97% rename from src/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransportI.H rename to src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransportI.H index cc889825ee..fd3ec3f275 100644 --- a/src/thermophysicalModels/solidSpecie/transport/tabulated/tabulatedSolidTransportI.H +++ b/src/thermophysicalModels/solidThermo/solidSpecie/transport/tabulated/tabulatedSolidTransportI.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