zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dynamicLibrary::compileTemplate: Standardised naming convention for the dynamic compilation template files

Browse Source 
which now all have Template.H or Template.C appended to differentiate them from
standard OpenFOAM library files.
This commit is contained in:
Henry Weller
2021-05-20 10:52:57 +01:00
parent 811abdfc4b
commit 4064161331
16 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/compressible/rhoSimpleFoam/Make/options
View File

@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \

0
etc/codeTemplates/dynamicCode/basicChemistryModel.C → etc/codeTemplates/dynamicCode/basicChemistryModelTemplate.C
View File

0
etc/codeTemplates/dynamicCode/fluidReactionThermo.C → etc/codeTemplates/dynamicCode/fluidReactionThermoTemplate.C
View File

0
etc/codeTemplates/dynamicCode/fluidThermo.C → etc/codeTemplates/dynamicCode/fluidThermoTemplate.C
View File

1
etc/codeTemplates/dynamicCode/psiThermo.C
View File

@ -1 +0,0 @@
fluidThermo.C

1
etc/codeTemplates/dynamicCode/psiThermoTemplate.C Symbolic link
View File

@ -0,0 +1 @@
fluidThermoTemplate.C

0
etc/codeTemplates/dynamicCode/psiuReactionThermo.C → etc/codeTemplates/dynamicCode/psiuReactionThermoTemplate.C
View File

1
etc/codeTemplates/dynamicCode/rhoReactionThermo.C
View File

@ -1 +0,0 @@
fluidReactionThermo.C

1
etc/codeTemplates/dynamicCode/rhoReactionThermoTemplate.C Symbolic link
View File

@ -0,0 +1 @@
fluidReactionThermoTemplate.C

1
etc/codeTemplates/dynamicCode/rhoThermo.C
View File

@ -1 +0,0 @@
fluidThermo.C

1
etc/codeTemplates/dynamicCode/rhoThermoTemplate.C Symbolic link
View File

@ -0,0 +1 @@
fluidThermoTemplate.C

2
src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C
View File

@ -123,7 +123,7 @@ void Foam::compileTemplate::prepare
} }
// Compile filtered C template // Compile filtered C template
dynCode.addCompileFile(templateName_ + ".C"); dynCode.addCompileFile(codeTemplateC(templateName_));
// Define Make/options // Define Make/options
dynCode.setMakeOptions(context.options() + "\n\n" + context.libs()); dynCode.setMakeOptions(context.options() + "\n\n" + context.libs());

7
src/thermophysicalModels/basic/basicThermo/basicThermoTemplates.C
View File

@ -76,7 +76,9 @@ typename Table::iterator Foam::basicThermo::lookupCstrIter
<< "Compilation and linkage of " << "Compilation and linkage of "
<< Thermo::typeName << " type " << nl << Thermo::typeName << " type " << nl
<< "thermoType" << thermoTypeDict << nl << nl << "thermoType" << thermoTypeDict << nl << nl
<< "failed." << exit(FatalError); << "failed." << nl << nl
<< "Valid " << Thermo::typeName << " types are:"
<< nl << nl;
} }
} }
else else
@ -87,7 +89,10 @@ typename Table::iterator Foam::basicThermo::lookupCstrIter
<< "thermoType" << thermoTypeDict << nl << nl << "thermoType" << thermoTypeDict << nl << nl
<< "Valid " << Thermo::typeName << " types are:" << "Valid " << Thermo::typeName << " types are:"
<< nl << nl; << nl << nl;
}
if (cstrIter == tablePtr->end())
{
// Get the list of all the suitable thermo packages available // Get the list of all the suitable thermo packages available
wordList validThermoTypeNames(tablePtr->sortedToc()); wordList validThermoTypeNames(tablePtr->sortedToc());

4
src/thermophysicalModels/basic/psiThermo/psiThermos.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -34,7 +34,7 @@ License
namespace Foam namespace Foam
{ {
forGases(makeThermos, psiThermo, hePsiThermo, pureMixture); forGases(makeThermo, psiThermo, hePsiThermo, pureMixture);
} }
// ************************************************************************* // // ************************************************************************* //

6
src/thermophysicalModels/basic/rhoThermo/rhoThermos.C
View File

@ -36,9 +36,9 @@ License
namespace Foam namespace Foam
{ {
forGases(makeThermos, rhoThermo, heRhoThermo, pureMixture); forGases(makeThermo, rhoThermo, heRhoThermo, pureMixture);
forLiquids(makeThermos, rhoThermo, heRhoThermo, pureMixture); forLiquids(makeThermo, rhoThermo, heRhoThermo, pureMixture);
forTabulated(makeThermos, rhoThermo, heRhoThermo, pureMixture); forTabulated(makeThermo, rhoThermo, heRhoThermo, pureMixture);
} }
// ************************************************************************* // // ************************************************************************* //

9
src/thermophysicalModels/specie/include/makeThermo.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2020 OpenFOAM Foundation \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -72,13 +72,6 @@ Description
\ \
defineThermo(BaseThermo, CThermo, Mixture, ThermoPhys); \ defineThermo(BaseThermo, CThermo, Mixture, ThermoPhys); \
\ \
addThermo(BaseThermo, CThermo, Mixture, ThermoPhys)
#define makeThermos(BaseThermo, CThermo, Mixture, ThermoPhys) \
\
defineThermo(BaseThermo, CThermo, Mixture, ThermoPhys); \
\
addThermo(basicThermo, CThermo, Mixture, ThermoPhys); \ addThermo(basicThermo, CThermo, Mixture, ThermoPhys); \
addThermo(fluidThermo, CThermo, Mixture, ThermoPhys); \ addThermo(fluidThermo, CThermo, Mixture, ThermoPhys); \
addThermo(BaseThermo, CThermo, Mixture, ThermoPhys) addThermo(BaseThermo, CThermo, Mixture, ThermoPhys)