:Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/spns/SolverLab

[tools/solverlab.git] / CoreFlows / Models / inc / ProblemFluid.hxx

diff --git a/CoreFlows/Models/inc/ProblemFluid.hxx b/CoreFlows/Models/inc/ProblemFluid.hxx
index 3f8fea88e1ac1642c9fa17f3455b9502f38bef8b..00e92cae6cb68b02be282914224f20cf2c2b44b0 100755 (executable)
--- a/CoreFlows/Models/inc/ProblemFluid.hxx
+++ b/CoreFlows/Models/inc/ProblemFluid.hxx
@@ -240,7 +240,7 @@ public :
         * @param void
         * @return the number of phases considered in the model
         * */
-       int getNumberOfPhases(){
+       int getNumberOfPhases() const {
                return _nbPhases;
        };
 
@@ -327,7 +327,7 @@ public :
         * \brief returns the value of the latent heat
         * @param double L, the value of the latent heat
         * */
-       double getLatentHeat(){
+       double getLatentHeat() const{
                return _latentHeat;
        }
 
@@ -343,7 +343,7 @@ public :
         * \brief sets the saturation temperature
         * @param  Tsat double corresponds to saturation temperature
         * */
-       double getSatTemp(){
+       double getSatTemp() const {
                return _Tsat;
        }
 
@@ -369,7 +369,7 @@ public :
         * \brief returns the porosity field;
         * @param
         * */
-       Field getPorosityField(){
+       Field getPorosityField() const {
                return _porosityField;
        }
 
@@ -443,7 +443,7 @@ public :
         * \param [in] void
         * \param [out] enum NonLinearFormulation
         *  */
-       NonLinearFormulation getNonLinearFormulation(){
+       NonLinearFormulation getNonLinearFormulation() const{
                return _nonLinearFormulation;
        }
 
@@ -460,7 +460,7 @@ public :
         * \param [in] void
         * \param [out] enum SpaceScheme(upwind, centred, pressureCorrection, pressureCorrection, staggered)
         *  */
-       SpaceScheme getSpaceScheme();
+       SpaceScheme getSpaceScheme() const;
 
        /** \fn setNumericalScheme
         * \brief sets the numerical method (upwind vs centered and explicit vs implicit)
@@ -480,6 +480,9 @@ public :
        virtual Field& getOutputField(const string& nameField )=0;//Renvoie un champs pour le postraitement
         */
 
+       Field getConservativeField() const ;
+       Field getPrimitiveField() const;
+
 protected :
        /** Number of phases in the fluid **/
        int _nbPhases;