diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options index c5989a9bc9..27bbeafd0b 100644 --- a/src/lagrangian/dieselSpray/Make/options +++ b/src/lagrangian/dieselSpray/Make/options @@ -15,8 +15,8 @@ EXE_INC = \ LIB_LIBS = \ -llagrangian \ -lfiniteVolume \ - -lcompressibleRASmodels \ - -lcompressibleLESmodels \ + -lcompressibleRASModels \ + -lcompressibleLESModels \ -lLESdeltas \ -lliquids \ -lliquidMixture \ diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C index 9f055016a8..b873d7b4e0 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C @@ -47,9 +47,9 @@ dispersionLESModel::dispersionLESModel dispersionModel(dict, sm), turbulence_ ( - sm.mesh().lookupObject + sm.mesh().lookupObject ( - "turbulenceProperties" + "LESProperties" ) ) {} diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H index 4379ad3c3c..33c55cd9b4 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H +++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.H @@ -34,7 +34,7 @@ Description #define dispersionLESModel_H #include "dispersionModel.H" -#include "LESmodel.H" +#include "LESModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ class dispersionLESModel { // Private data - const compressible::LESmodel& turbulence_; + const compressible::LESModel& turbulence_; public: @@ -77,7 +77,7 @@ public: // Member Functions - const compressible::LESmodel& turbulence() const + const compressible::LESModel& turbulence() const { return turbulence_; } diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C index a314ea8841..63841f21ad 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C @@ -47,9 +47,9 @@ dispersionRASModel::dispersionRASModel dispersionModel(dict, sm), turbulence_ ( - sm.mesh().lookupObject + sm.mesh().lookupObject ( - "turbulenceProperties" + "RASProperties" ) ) {} diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H index fe40c028a8..c8ee9a5fd8 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H +++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.H @@ -34,7 +34,7 @@ Description #define dispersionRASModel_H #include "dispersionModel.H" -#include "RASmodel.H" +#include "RASModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,7 +52,7 @@ class dispersionRASModel { // Private data - const compressible::RASmodel& turbulence_; + const compressible::RASModel& turbulence_; public: @@ -78,7 +78,7 @@ public: // Member Functions - const compressible::RASmodel& turbulence() const + const compressible::RASModel& turbulence() const { return turbulence_; } diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index f1ee6e0b4b..3ba9665f2f 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -23,4 +23,4 @@ LIB_LIBS = \ -lspecie \ -lbasicThermophysicalModels \ -lcombustionThermophysicalModels \ - -lcompressibleRASmodels + -lcompressibleRASModels diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C index e115414044..1c5b0b38b7 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C @@ -40,9 +40,9 @@ Foam::DispersionRASModel::DispersionRASModel DispersionModel(dict, owner), turbulence_ ( - owner.mesh().objectRegistry::lookupObject + owner.mesh().objectRegistry::lookupObject ( - "turbulenceProperties" + "RASProperties" ) ) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H index 79bcbb6ae9..7865abdd8d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H @@ -33,7 +33,7 @@ Description #define DispersionRASModel_H #include "DispersionModel.H" -#include "RASmodel.H" +#include "RASModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ class DispersionRASModel // Private data //- Reference to the compressible turbulence model - const compressible::RASmodel& turbulence_; + const compressible::RASModel& turbulence_; public: @@ -81,7 +81,7 @@ public: // Member Functions //- Return const access to the turbulence model - const compressible::RASmodel& turbulence() const + const compressible::RASModel& turbulence() const { return turbulence_; } diff --git a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options index 882657bf9f..2a417f9549 100644 --- a/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options +++ b/tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options @@ -4,6 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels EXE_LIBS = \ - -lincompressibleRASmodels \ + -lincompressibleRASModels \ -lincompressibleTransportModels \ -lfiniteVolume diff --git a/tutorials/MRFSimpleFoam/mixerVessel2D/Allrun b/tutorials/MRFSimpleFoam/mixerVessel2D/Allrun old mode 100644 new mode 100755 diff --git a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties b/tutorials/engineFoam/kivaTest/constant/RASProperties similarity index 98% rename from tutorials/engineFoam/kivaTest/constant/turbulenceProperties rename to tutorials/engineFoam/kivaTest/constant/RASProperties index 66ebdb5c81..eba64ba039 100644 --- a/tutorials/engineFoam/kivaTest/constant/turbulenceProperties +++ b/tutorials/engineFoam/kivaTest/constant/RASProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASmodel kEpsilon; +RASModel kEpsilon; turbulence on; diff --git a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options index a551b9c721..4c9cff9d95 100644 --- a/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options +++ b/tutorials/rhoTurbTwinParcelFoam/rhoTurbTwinParcelFoam/Make/options @@ -18,4 +18,4 @@ EXE_LIBS = \ -lcombustionThermophysicalModels \ -lspecie \ -lradiation \ - -lcompressibleRASmodels + -lcompressibleRASModels diff --git a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options index 54831153fa..8a31f7e5ab 100644 --- a/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options +++ b/tutorials/simpleSRFFoam/simpleSRFFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels EXE_LIBS = \ - -lincompressibleRASmodels \ + -lincompressibleRASModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/tutorials/turbFoam/cavity/constant/RASProperties b/tutorials/turbFoam/cavity/constant/RASProperties index 5fb5580547..effbe070e4 100644 --- a/tutorials/turbFoam/cavity/constant/RASProperties +++ b/tutorials/turbFoam/cavity/constant/RASProperties @@ -22,7 +22,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -RASmodel kEpsilon; +RASModel kEpsilon; turbulence on;