From 80139f6116f3b101d4d159a05465377098cfd079 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 28 Apr 2021 11:29:35 +0100
Subject: [PATCH] compileTemplate: Improved the handling of
 backward-compatibility renaming of classes

---
 .../dynamicCode/basicChemistryModel           |  4 ++--
 .../dynamicCode/fluidReactionThermo           |  4 ++--
 .../compileTemplate/compileTemplate.C         | 24 +++++--------------
 .../compileTemplate/compileTemplate.H         |  8 -------
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/etc/codeTemplates/dynamicCode/basicChemistryModel b/etc/codeTemplates/dynamicCode/basicChemistryModel
index a2b7146d35..cc2c2ff45c 100644
--- a/etc/codeTemplates/dynamicCode/basicChemistryModel
+++ b/etc/codeTemplates/dynamicCode/basicChemistryModel
@@ -18,7 +18,7 @@ solver
 (
     EulerImplicit
     ode
-    noChemistrySolver
+    none
 );
 
 solverRenamed
@@ -28,7 +28,7 @@ solverRenamed
 
 method
 (
-    Standard
+    standard
     TDAC
 );
 
diff --git a/etc/codeTemplates/dynamicCode/fluidReactionThermo b/etc/codeTemplates/dynamicCode/fluidReactionThermo
index 8d0c2e1c61..4b68e2d1b2 100644
--- a/etc/codeTemplates/dynamicCode/fluidReactionThermo
+++ b/etc/codeTemplates/dynamicCode/fluidReactionThermo
@@ -36,8 +36,8 @@ energy
 
 mixture
 (
-    singleComponentMixture
-    coefficientMultiComponentMixture
+    pureMixture
+    multiComponentMixture
     valueMultiComponentMixture
     coefficientWilkeMultiComponentMixture
 );
diff --git a/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C b/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C
index f673e8f813..db1bf86cfd 100644
--- a/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C
+++ b/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.C
@@ -69,10 +69,13 @@ void Foam::compileTemplate::setFilterVariable
 (
     dynamicCode& dynCode,
     const dynamicCodeContext& context,
-    const word& name,
-    const word& type
+    const Pair<word>& substitution
 ) const
 {
+    const word& name(substitution.first());
+    word type(substitution.second());
+    const word typeRenameMapName(name + "Renamed");
+
     if (context.dict().found(name))
     {
         const HashSet<word> types(context.dict().lookup(name));
@@ -85,21 +88,6 @@ void Foam::compileTemplate::setFilterVariable
         }
     }
 
-    dynCode.setFilterVariable(name, type);
-}
-
-
-void Foam::compileTemplate::setFilterVariable
-(
-    dynamicCode& dynCode,
-    const dynamicCodeContext& context,
-    const Pair<word>& substitution
-) const
-{
-    const word& name(substitution.first());
-    word type(substitution.second());
-    const word typeRenameMapName(name + "Renamed");
-
     if (context.dict().found(typeRenameMapName))
     {
         const HashTable<word> renameMap
@@ -113,7 +101,7 @@ void Foam::compileTemplate::setFilterVariable
         }
     }
 
-    setFilterVariable(dynCode, context, name, type);
+    dynCode.setFilterVariable(name, type);
 
     const word typeBase(name + "Base");
     if (context.dict().found(typeBase))
diff --git a/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.H b/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.H
index b9b1203ffc..547ab32a30 100644
--- a/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.H
+++ b/src/OpenFOAM/db/dynamicLibrary/compileTemplate/compileTemplate.H
@@ -59,14 +59,6 @@ class compileTemplate
             const word& instantiatedName
         ) const;
 
-        void setFilterVariable
-        (
-            dynamicCode& dynCode,
-            const dynamicCodeContext& context,
-            const word& name,
-            const word& type
-        ) const;
-
         void setFilterVariable
         (
             dynamicCode& dynCode,