Merge pull request #524 from maorz1998/master

fix energy name

applications/solvers/df0DFoam/createFields.H

@@ -2,12 +2,11 @@
 
 Info<< "Reading thermophysical properties\n" << endl;
 
+CanteraMixture::setEnergyName("ha");
 // fluidThermo* pThermo = new hePsiThermo<psiThermo, CanteraMixture>(mesh, word::null);
 fluidThermo* pThermo = new heRhoThermo<rhoThermo, CanteraMixture>(mesh, word::null);
 fluidThermo& thermo = *pThermo;
 
-// thermo.validate(args.executable(), "ha");
-
 volScalarField& p = thermo.p();
 
 IOdictionary CanteraTorchProperties
@@ -94,7 +93,6 @@ dfChemistryModel<basicThermo> chemistry(thermo);
 PtrList<volScalarField>& Y = chemistry.Y();
 const word inertSpecie(chemistry.lookup("inertSpecie"));
 const label inertIndex(chemistry.species()[inertSpecie]);
-chemistry.setEnergyName("ha");
 chemistry.updateEnergy();
 
 forAll(Y, i)

applications/solvers/dfHighSpeedFoam/createFields.H

@@ -53,6 +53,7 @@ if((ddtSchemes != "RK2SSP") && (ddtSchemes != "RK3SSP"))
 
 Info<< "Reading thermophysical properties\n" << endl;
 
+CanteraMixture::setEnergyName("ea");
 // psiThermo* pThermo = new hePsiThermo<psiThermo, CanteraMixture>(mesh, word::null);
 // psiThermo& thermo = *pThermo;
 rhoThermo* pThermo = new heRhoThermo<rhoThermo, CanteraMixture>(mesh, word::null);
@@ -234,7 +235,6 @@ dfChemistryModel<basicThermo>* chemistry = combustion->chemistry();
 PtrList<volScalarField>& Y = chemistry->Y();
 const word inertSpecie(chemistry->lookup("inertSpecie"));
 const label inertIndex(chemistry->species()[inertSpecie]);
-chemistry->setEnergyName("ea");
 chemistry->updateEnergy();
 
 volScalarField& ea = thermo.he();

applications/solvers/dfLowMachFoam/createFields.H

@@ -3,11 +3,11 @@
 
 Info<< "Reading thermophysical properties\n" << endl;
 
+CanteraMixture::setEnergyName("ha");
 // fluidThermo* pThermo = new hePsiThermo<psiThermo, CanteraMixture>(mesh, word::null);
 fluidThermo* pThermo = new heRhoThermo<rhoThermo, CanteraMixture>(mesh, word::null);
 fluidThermo& thermo = *pThermo;
-// thermo.validate(args.executable(), "ha");
-
+Info<< "Readed thermophysical properties\n" << endl;
 SLGThermo slgThermo(mesh, thermo);
 
 const volScalarField& psi = thermo.psi();
@@ -100,7 +100,6 @@ forAll(Y, i)
 }
 const word inertSpecie(chemistry->lookup("inertSpecie"));
 const label inertIndex(chemistry->species()[inertSpecie]);
-chemistry->setEnergyName("ha");
 chemistry->updateEnergy();
 
 

applications/solvers/dfSprayFoam/createFields.H

@@ -1,10 +1,11 @@
 #include "readGravitationalAcceleration.H"
 
 Info<< "Reading thermophysical properties\n" << endl;
+
+CanteraMixture::setEnergyName("ha");
 // fluidThermo* pThermo = new hePsiThermo<psiThermo, CanteraMixture>(mesh, word::null);
 fluidThermo* pThermo = new heRhoThermo<rhoThermo, CanteraMixture>(mesh, word::null);
 fluidThermo& thermo = *pThermo;
-// thermo.validate(args.executable(), "ha");
 
 SLGThermo slgThermo(mesh, thermo);
 
@@ -107,7 +108,6 @@ dfChemistryModel<basicThermo>* chemistry = combustion->chemistry();
 PtrList<volScalarField>& Y = chemistry->Y();
 const word inertSpecie(chemistry->lookup("inertSpecie"));
 const label inertIndex(chemistry->species()[inertSpecie]);
-chemistry->setEnergyName("ha");
 chemistry->updateEnergy();
 
 if(combModelName!="ESF" && combModelName!="flareFGM"  && combModelName!="DeePFGM" && combModelName!="FSD")

src/TurbulenceModels/compressible/Make/files

@@ -1,4 +1,4 @@
-workDir = $(SRC_ORIG)/TurbulenceModels/compressible/
+workDir = $(SRC_ORIG)/TurbulenceModels/compressible
 
 $(workDir)/compressibleTurbulenceModel.C
 $(workDir)/turbulentFluidThermoModels/turbulentFluidThermoModels.C
@@ -7,14 +7,14 @@ BCs = $(workDir)/turbulentFluidThermoModels/derivedFvPatchFields
 /*$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C*/
 /*$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C*/
 /*$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C*/
-/*$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C*/
+$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
 /*$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C*/
 /*$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C*/
-/*$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C*/
+$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
 /*$(BCs)/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C*/
-/*$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C*/
+$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
 
-$(workDir)turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
-/*turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C*/
+$(BCs)/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+$(BCs)//wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
 
 LIB = $(DF_LIBBIN)/libdfCompressibleTurbulenceModels

src/dfCanteraMixture/CanteraMixture.C

@@ -26,6 +26,8 @@ License
 #include "CanteraMixture.H"
 #include "fvMesh.H"
 
+Foam::word Foam::CanteraMixture::energyName_ = "InvalidEnergyName";
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::CanteraMixture::CanteraMixture
@@ -49,8 +51,7 @@ Foam::CanteraMixture::CanteraMixture
     CanteraMechanismFile_(fileName(CanteraTorchProperties_.lookup("CanteraMechanismFile")).expand()),
     transportModelName_(CanteraTorchProperties_.lookup("transportModel")),
     Tref_(mesh.objectRegistry::lookupObject<volScalarField>("T")),
-    pref_(mesh.objectRegistry::lookupObject<volScalarField>("p")),
-    energyName_("energy")
+    pref_(mesh.objectRegistry::lookupObject<volScalarField>("p"))
 {
     if(!isFile(CanteraMechanismFile_))
     {

src/dfCanteraMixture/CanteraMixture.H

@@ -75,7 +75,7 @@ class CanteraMixture
         const volScalarField& Tref_;
         const volScalarField& pref_;
         mutable scalarList yTemp_;
-        word energyName_;
+        static word energyName_;
 
         //- Construct as copy (not implemented)
         CanteraMixture(const CanteraMixture&);
@@ -346,7 +346,7 @@ public:
     //- Read dictionary
     void read(const dictionary&);
 
-    void setEnergyName(word name){energyName_=name;}
+    static void setEnergyName(word name){energyName_=name;}
 };
 
 

src/dfChemistryModel/dfChemistryModel.H

@@ -108,7 +108,7 @@ public IOdictionary
         // species absolute enthalpy, [J/kg]
         PtrList<volScalarField> hai_;
         // species chemistry enthalpy, [J/kg]
-        scalarList hc_;         
+        scalarList hc_;
         // temp mass fraction
         mutable scalarList yTemp_;
         // temp mass diffusion coefficients
@@ -313,7 +313,7 @@ public:
         const volScalarField& rhoD(const label i) const {return rhoD_[i];}
 
         const volScalarField& hai(const label i) {return hai_[i];}
-        
+
         const scalar & hci(const label i) {return hc_[i];}
 
         // update T, psi, mu, alpha, rhoD, hai (if needed)
@@ -323,9 +323,6 @@ public:
 
         const CanteraMixture& mixture() {return mixture_;}
 
-        void setEnergyName(word name){
-            mixture_.setEnergyName(name);
-        }
         void updateEnergy()
         {
             scalarField& heCells = thermo_.he().primitiveFieldRef();