From 8875f90f07aa3cbfdbe5abed5c17d585f5faa666 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 10 Jun 2011 12:16:46 +0100
Subject: [PATCH] lagrangian: Avoid the generation of duplicate symbols in the
 coalCombustion

also remove unused macros
---
 .../coalParcel/makeCoalParcelSubmodels.C      | 39 -------------------
 .../makeCoalParcelSurfaceReactionModels.H     |  2 -
 .../parcels/Templates/DsmcParcel/DsmcParcel.H | 11 ------
 .../parcels/derived/dsmcParcel/dsmcParcel.C   |  1 -
 .../KinematicParcel/KinematicParcel.H         | 11 ------
 5 files changed, 64 deletions(-)

diff --git a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
index ee17dd7e3c..eee987f560 100644
--- a/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
+++ b/src/lagrangian/coalCombustion/coalParcel/makeCoalParcelSubmodels.C
@@ -24,51 +24,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "coalCloud.H"
-
-#include "makeParcelCloudFunctionObjects.H"
-
-// Kinematic
-#include "makeThermoParcelForces.H" // thermo variant
-#include "makeParcelDispersionModels.H"
-#include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
-#include "makeParcelPatchInteractionModels.H"
-
-// Thermodynamic
-#include "makeParcelHeatTransferModels.H"
-
-// Reacting
-#include "makeReactingMultiphaseParcelCompositionModels.H" // MP variant
-#include "makeReactingParcelPhaseChangeModels.H"
-#include "makeReactingParcelSurfaceFilmModels.H"
-
-// Reacting multiphase
-#include "makeReactingMultiphaseParcelDevolatilisationModels.H"
-
-// Coal specific
 #include "makeCoalParcelSurfaceReactionModels.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makeParcelCloudFunctionObjects(coalCloud);
-
-    // Kinematic sub-models
-    makeThermoParcelForces(coalCloud);
-    makeParcelDispersionModels(coalCloud);
-    makeReactingMultiphaseParcelInjectionModels(coalCloud);
-    makeParcelPatchInteractionModels(coalCloud);
-
-    // Thermo sub-models
-    makeParcelHeatTransferModels(coalCloud);
-
-    // Reacting sub-models
-    makeReactingMultiphaseParcelCompositionModels(coalCloud);
-    makeReactingParcelPhaseChangeModels(coalCloud);
-
-    // Reacting multiphase sub-models
-    makeReactingMultiphaseParcelDevolatilisationModels(coalCloud);
-    makeReactingParcelSurfaceFilmModels(coalCloud);
     makeCoalParcelSurfaceReactionModels(coalCloud);
 }
 
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
index 781f0c6d47..cfdf74b5b0 100644
--- a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -37,8 +37,6 @@ License
 
 #define makeCoalParcelSurfaceReactionModels(CloudType)                        \
                                                                               \
-    makeSurfaceReactionModel(CloudType);                                      \
-    makeSurfaceReactionModelType(NoSurfaceReaction, CloudType);               \
     makeSurfaceReactionModelType(COxidationDiffusionLimitedRate, CloudType);  \
     makeSurfaceReactionModelType                                              \
     (                                                                         \
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
index 54dc027235..71c88a37b4 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
@@ -327,17 +327,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define defineParcelTypeNameAndDebug(Type, DebugSwitch)                       \
-    template<>                                                                \
-    const Foam::word DsmcParcel<Type>::typeName(#Type);                       \
-    template<>                                                                \
-    int DsmcParcel<Type>::debug                                               \
-    (                                                                         \
-        Foam::debug::debugSwitch(#Type, DebugSwitch)                          \
-    );
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #ifdef NoRepository
     #include "DsmcParcel.C"
 #endif
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
index c05fb93aed..704541f4f0 100644
--- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
@@ -31,7 +31,6 @@ namespace Foam
 {
 //    defineTypeNameAndDebug(dsmcParcel, 0);
 //    defineParticleTypeNameAndDebug(dsmcParcel, 0);
-//    defineParcelTypeNameAndDebug(dsmcParcel, 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 7e3785ded3..7b2f8268f4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -687,17 +687,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define defineParcelTypeNameAndDebug(Type, DebugSwitch)                       \
-    template<>                                                                \
-    const Foam::word KinematicParcel<Type>::typeName(#Type);                  \
-    template<>                                                                \
-    int KinematicParcel<Type>::debug                                          \
-    (                                                                         \
-        Foam::debug::debugSwitch(#Type, DebugSwitch)                          \
-    );
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #ifdef NoRepository
     #include "KinematicParcel.C"
 #endif